Unverified Commit 169ab49f authored by Fernando Rodrigues's avatar Fernando Rodrigues Committed by GitHub
Browse files

various: fix pname misuse and switch to finalAttrs pattern (#487638)

parents ac9dd686 626f23ce
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
  pkg-config,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "2048-in-terminal";
  version = "0-unstable-2022-06-13";

@@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
  installFlags = [ "PREFIX=$(out)" ];

  meta = {
    inherit (src.meta) homepage;
    inherit (finalAttrs.src.meta) homepage;
    description = "Animated console version of the 2048 game";
    mainProgram = "2048-in-terminal";
    license = lib.licenses.mit;
    platforms = lib.platforms.unix;
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
  android-tools,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "adbfs-rootless";
  version = "0-unstable-2023-03-21";

@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Mount Android phones on Linux with adb, no root required";
    mainProgram = "adbfs";
    inherit (src.meta) homepage;
    inherit (finalAttrs.src.meta) homepage;
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ aleksana ];
    platforms = lib.platforms.unix;
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@
  aeolus-stops,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "aeolus";
  version = "0.10.4";

  src = fetchurl {
    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/aeolus-${version}.tar.bz2";
    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/aeolus-${finalAttrs.version}.tar.bz2";
    sha256 = "sha256-J9xrd/N4LrvGgi89Yj4ob4ZPUAEchrXJJQ+YVJ29Qhk=";
  };

@@ -68,4 +68,4 @@ stdenv.mkDerivation rec {
    ];
    mainProgram = "aeolus";
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@
let
  stdenv = gccStdenv;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "aewan";
  version = "1.0.01";

  src = fetchurl {
    url = "mirror://sourceforge/aewan/aewan-${version}.tar.gz";
    url = "mirror://sourceforge/aewan/aewan-${finalAttrs.version}.tar.gz";
    sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
  };

@@ -53,4 +53,4 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl2Plus;
    platforms = lib.platforms.unix;
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@
  cmake,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "aften";
  version = "0.0.8";
  src = fetchurl {
    url = "mirror://sourceforge/aften/aften-${version}.tar.bz2";
    url = "mirror://sourceforge/aften/aften-${finalAttrs.version}.tar.bz2";
    sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
  };

@@ -38,4 +38,4 @@ stdenv.mkDerivation rec {
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [ emilytrau ];
  };
}
})
Loading