diff options
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/afio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/fsarchiver/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/runzip/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/s-tar/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/unarj/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/undmg/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/unp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/unshield/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/wimlib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/xarchive/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/xarchiver/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/zpaq/default.nix | 2 |
15 files changed, 20 insertions, 19 deletions
diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 0014febf40e4..13da95a28b5d 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.5.2"; - name = "afio-${version}"; + pname = "afio"; src = fetchurl { - url = "http://members.chello.nl/~k.holtman/${name}.tgz"; + url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz"; sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; }; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index cb73233dcb46..3f958f7f958d 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -6,7 +6,8 @@ let version = "0.8.5"; in stdenv.mkDerivation { - name = "fsarchiver-${version}"; + pname = "fsarchiver"; + inherit version; src = fetchFromGitHub { owner = "fdupoux"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index c2e7f75fc7fc..caf507670f4f 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, acl }: stdenv.mkDerivation rec { - name = "gnutar-${version}"; + pname = "gnutar"; version = "1.32"; src = fetchurl { diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3b212b186aac..465bc474a9e5 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "p7zip-${version}"; + pname = "p7zip"; version = "16.02"; src = fetchurl { diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix index f99ee963dbe6..b9eaf3dba65e 100644 --- a/pkgs/tools/archivers/runzip/default.nix +++ b/pkgs/tools/archivers/runzip/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4"; - name = "runzip-${version}"; + pname = "runzip"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libzip ]; diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix index d53499007569..48e5cc6c4361 100644 --- a/pkgs/tools/archivers/s-tar/default.nix +++ b/pkgs/tools/archivers/s-tar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "s-tar-${version}"; + pname = "s-tar"; version = "1.6"; src = fetchurl { url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2"; diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 217a8ab35a9e..61e60996e759 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "unarj-${version}"; + pname = "unarj"; version = "2.65"; src = fetchurl { sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz"; }; preInstall = '' diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 89bb816aa579..9d072c9bb192 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "undmg-${version}"; + pname = "undmg"; src = fetchFromGitHub { owner = "matthewbauer"; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index b9c549d670bf..e1cac4fc61f7 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -8,7 +8,7 @@ let runtime_bins = [ file unzip gzip ] ++ extraBackends; in stdenv.mkDerivation rec { - name = "unp-${version}"; + pname = "unp"; version = "2.0-pre7"; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 2a51e4d7bc90..07f62fa02ad4 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "unrar-${version}"; + pname = "unrar"; version = "5.7.5"; src = fetchurl { diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index 3febb557bf8b..cfab2443032b 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib, openssl }: stdenv.mkDerivation rec { - name = "unshield-${version}"; + pname = "unshield"; version = "1.4.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 3c52e1944d8f..9d58bf5c2f89 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { version = "1.13.1"; - name = "wimlib-${version}"; + pname = "wimlib"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl fuse libxml2 ntfs3g ]; src = fetchurl { - url = "https://wimlib.net/downloads/${name}.tar.gz"; + url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27"; }; diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 07e76ea7f62a..ff98e96655fa 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.2.8-6"; - name = "xarchive-${version}"; + pname = "xarchive"; src = fetchurl { - url = "mirror://sourceforge/xarchive/${name}.tar.gz"; + url = "mirror://sourceforge/xarchive/${pname}-${version}.tar.gz"; sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4"; }; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 9860c2b34bd4..07684155a7e8 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.5.4.14"; - name = "xarchiver-${version}"; + pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index c99221b36ba1..09c4e914bd88 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl, unzip }: stdenv.mkDerivation rec { - name = "zpaq-${version}"; + pname = "zpaq"; version = "7.15"; src = fetchFromGitHub { |