diff options
author | Francesco Gazzetta <fgaz@fgaz.me> | 2024-03-05 11:05:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-05 11:05:28 +0100 |
commit | 6ffb3618ea014c0a8d72c648a1f8b3b0674441f2 (patch) | |
tree | b53662ee679f1c144a7f5b87c50ee23602bc959a /pkgs/applications/graphics | |
parent | b3fc4549045c91e9ae14da4569706b2b8c820e9e (diff) | |
parent | 0a6d9c157b7e65c5ef64604d2cdf6872fd2780de (diff) | |
download | nixlib-6ffb3618ea014c0a8d72c648a1f8b3b0674441f2.tar nixlib-6ffb3618ea014c0a8d72c648a1f8b3b0674441f2.tar.gz nixlib-6ffb3618ea014c0a8d72c648a1f8b3b0674441f2.tar.bz2 nixlib-6ffb3618ea014c0a8d72c648a1f8b3b0674441f2.tar.lz nixlib-6ffb3618ea014c0a8d72c648a1f8b3b0674441f2.tar.xz nixlib-6ffb3618ea014c0a8d72c648a1f8b3b0674441f2.tar.zst nixlib-6ffb3618ea014c0a8d72c648a1f8b3b0674441f2.zip |
Merge pull request #289980 from fgaz/treewide/fgaz-finalAttrs
treewide: use finalAttrs in packages maintained by @fgaz
Diffstat (limited to 'pkgs/applications/graphics')
4 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 49611f1709b7..8e6d8328a3cb 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -12,14 +12,14 @@ , impy }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evilpixie"; version = "0.3.1"; src = fetchFromGitHub { owner = "bcampbell"; repo = "evilpixie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+DdAN+xDOYxLgLHUlr75piTEPrWpuOyXvxckhBEl7yU="; }; @@ -51,5 +51,4 @@ stdenv.mkDerivation rec { # https://github.com/bcampbell/evilpixie/issues/28 stdenv.isAarch64; }; -} - +}) diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 3ea22fff3dc1..49499f7d7322 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -18,7 +18,7 @@ , Foundation }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-obfuscate"; version = "0.0.9"; @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "Obfuscate"; - rev = version; + rev = finalAttrs.version; hash = "sha256-aUhzact437V/bSsG2Ddu2mC03LbyXFg+hJiuGy5NQfQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit (finalAttrs) src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-HUQvdCmzjdmuJGDLtC/86yzbRimLzx+XbW29f+Ua48w="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { mainProgram = "obfuscate"; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 968794ccec66..0b10cda884c7 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook , glfw3, gtk3, libpng12 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goxel"; version = "0.14.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ueA0YW2n/DXd9AytDzfPtvtXbvuUm4VDwcdvHWObKxc="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ tilpner fgaz ]; }; -} +}) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 23b6f5009ce4..771ae49e220d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -27,14 +27,14 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; version = "0.0.28"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) |