Unverified Commit 75f80442 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

treewide: use finalAttrs.finalPackage in testers.testVersion (#342431)

parents 991d0147 a4f7690f

pkgs/applications/graphics/komorebi/default.nix

+4 −5
Original line number Diff line number Diff line
@@ -13,17 +13,16 @@ 
, ninja

, wrapGAppsHook3

, testers

, komorebi

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "komorebi";

  version = "2.2.1";



  src = fetchFromGitHub {

    owner = "Komorebi-Fork";

    repo = "komorebi";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk=";

  };
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec { 
    clutter-gst

  ];



  passthru.tests.version = testers.testVersion { package = komorebi; };

  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };



  meta = with lib; {

    description = "Beautiful and customizable wallpaper manager for Linux";
@@ -53,4 +52,4 @@ stdenv.mkDerivation rec { 
    maintainers = with maintainers; [ kranzes ];

    platforms = platforms.linux;

  };

}
 
})

pkgs/applications/networking/mailreaders/notmuch/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, pkg-config, gnupg

, xapian, gmime3, sfsexp, talloc, zlib

, doxygen, perl, texinfo

, notmuch

, pythonPackages

, emacs

, ruby
@@ -157,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: { 
      paths = with ruby.gems; [ mail ];

      pathsToLink = [ "/lib" "/nix-support" ];

    };

    tests.version = testers.testVersion { package = notmuch; };

    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };



    updateScript = gitUpdater {

      url = "https://git.notmuchmail.org/git/notmuch";

pkgs/by-name/al/alephone/package.nix

+4 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
  unzip,

  zlib,

  zziplib,

  alephone,

  testers,

}:
@@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru.tests.version =

    # test that the version is correct

    testers.testVersion { package = alephone; };

    testers.testVersion { package = finalAttrs.finalPackage; };



  meta = {

    description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
@@ -112,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { 
      version,

      zip,

      meta,

      icon ? alephone.icons + "/alephone.png",

      icon ? finalAttrs.finalPackage.icons + "/alephone.png",

      ...

    }@extraArgs:

    stdenv.mkDerivation (
@@ -142,14 +141,14 @@ stdenv.mkDerivation (finalAttrs: { 
          mkdir -p $out/bin $out/data/$pname $out/share/applications

          cp -a * $out/data/$pname

          cp $desktopItem/share/applications/* $out/share/applications

          makeWrapper ${alephone}/bin/alephone $out/bin/$pname \

          makeWrapper ${finalAttrs.finalPackage}/bin/alephone $out/bin/$pname \

            --add-flags $out/data/$pname

        '';

      }

      // extraArgs

      // {

        meta =

          alephone.meta

          finalAttrs.finalPackage.meta

          // {

            license = lib.licenses.free;

            mainProgram = pname;

pkgs/by-name/du/dunst/package.nix

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
, xorgproto

, librsvg

, testers

, dunst

, withX11 ? true

, withWayland ? true

}:
@@ -89,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { 
      --replace-fail "jq" "${lib.getExe jq}"

  '';



  passthru.tests.version = testers.testVersion { package = dunst; };

  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };



  meta = with lib; {

    description = "Lightweight and customizable notification daemon";

pkgs/by-name/io/ios-webkit-debug-proxy/package.nix

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
  libusb1,

  openssl,



  ios-webkit-debug-proxy,

  nix-update-script,

  testers,

}:
@@ -61,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru = {

    updateScript = nix-update-script { };

    tests.version = testers.testVersion { package = ios-webkit-debug-proxy; };

    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };

  };



  meta = with lib; {