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/tools | |
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/tools')
-rw-r--r-- | pkgs/tools/X11/xprintidle/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/cd-dvd/dvd-vr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/compression/heatshrink/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/filesystems/davfs2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/tkman/default.nix | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix index 4a0d371a7fd6..33782f6ed6c6 100644 --- a/pkgs/tools/X11/xprintidle/default.nix +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -7,14 +7,14 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xprintidle"; version = "0.2.5"; src = fetchFromGitHub { owner = "g0hl1n"; repo = "xprintidle"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "xprintidle"; }; -} +}) diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 88703b28b582..43aaa534c041 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dvd-vr"; version = "0.9.7"; src = fetchurl { - url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz"; + url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${finalAttrs.version}.tar.gz"; sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { mainProgram = "dvd-vr"; }; } - +) diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/tools/compression/heatshrink/default.nix index b5cfb92247af..d18f82ef21fa 100644 --- a/pkgs/tools/compression/heatshrink/default.nix +++ b/pkgs/tools/compression/heatshrink/default.nix @@ -5,14 +5,14 @@ , fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "heatshrink"; version = "0.4.1"; src = fetchFromGitHub { owner = "atomicobject"; repo = "heatshrink"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Nm9/+JFMDXY1N90hmNFGh755V2sXSRQ4VBN9f8TcsGk="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "heatshrink"; }; -} +}) diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index a64812e96b9c..529d963af304 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -8,12 +8,12 @@ , wrapperDir ? "/run/wrappers/bin" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "davfs2"; version = "1.7.0"; src = fetchurl { - url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; + url = "mirror://savannah/davfs2/davfs2-${finalAttrs.version}.tar.gz"; sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/tools/misc/tkman/default.nix index e178e173108a..4df680fb6b8c 100644 --- a/pkgs/tools/misc/tkman/default.nix +++ b/pkgs/tools/misc/tkman/default.nix @@ -10,12 +10,12 @@ , rman }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tkman"; version = "2.2"; src = fetchzip { - url = "mirror://sourceforge/tkman/tkman-${version}.tar.gz"; + url = "mirror://sourceforge/tkman/tkman-${finalAttrs.version}.tar.gz"; hash = "sha256-S4ffz+7zmVy9+isz/8q+FV4wF5Rw2iL1ftY8RsJjRLs="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ fgaz ]; }; -} +}) |