From 55bbc807eb0d8d1ac00168eda0e760333327d91e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 24 Jul 2019 19:55:25 -0500 Subject: [PATCH 01/92] dhcpcd: 7.2.3 -> 8.0.1 https://roy.marples.name/blog/dhcpcd-8-0-0-released https://roy.marples.name/blog/dhcpcd-8-0-1-released --- pkgs/tools/networking/dhcpcd/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 6d14789e7f4..18682e3bd76 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.2.3"; + pname = "dhcpcd"; + version = "8.0.1"; src = fetchurl { - url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl"; + url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0cd9vcyc9bisxzb56z2yrpiy7678bgzl7hzy2i3v8hddynz4y7q3"; }; nativeBuildInputs = [ pkgconfig ]; @@ -27,14 +28,14 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - makeFlags = "PREFIX=\${out}"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; # Hack to make installation succeed. dhcpcd will still use /var/db # at runtime. - installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; + installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]"; + postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; -- GitLab From a8e9dc728b4afdb0b8d74b652bee0b563673a1cc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 30 Jul 2019 17:30:15 -0500 Subject: [PATCH 02/92] dhcpcd: 8.0.1 -> 8.0.2 https://roy.marples.name/blog/dhcpcd-8-0-2-released > I don't anticipate any more releases for a while as this is looking really good now! --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 18682e3bd76..f0ae7e014be 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0cd9vcyc9bisxzb56z2yrpiy7678bgzl7hzy2i3v8hddynz4y7q3"; + sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik"; }; nativeBuildInputs = [ pkgconfig ]; -- GitLab From 9fe10288f01984963faf47e21bf1bae4d7d37962 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 20 Jun 2019 17:15:33 +0000 Subject: [PATCH 03/92] openssh: use ssh-keysign from PATH ssh-keysign is used for host-based authentication, and is designed to be used as SUID-root program. OpenSSH defaults to referencing it from libexec, which cannot be made SUID in Nix. --- pkgs/tools/networking/openssh/default.nix | 2 ++ .../networking/openssh/ssh-keysign.patch | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/openssh/ssh-keysign.patch diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 6ce574b9cdc..24adb554bc1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch; sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds"; }) + + ./ssh-keysign.patch ] ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); diff --git a/pkgs/tools/networking/openssh/ssh-keysign.patch b/pkgs/tools/networking/openssh/ssh-keysign.patch new file mode 100644 index 00000000000..7258f4a4db1 --- /dev/null +++ b/pkgs/tools/networking/openssh/ssh-keysign.patch @@ -0,0 +1,29 @@ +diff --git a/pathnames.h b/pathnames.h +index cb44caa4..354fdf05 100644 +--- a/pathnames.h ++++ b/pathnames.h +@@ -124,7 +124,7 @@ + + /* Location of ssh-keysign for hostbased authentication */ + #ifndef _PATH_SSH_KEY_SIGN +-#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" ++#define _PATH_SSH_KEY_SIGN "ssh-keysign" + #endif + + /* Location of ssh-pkcs11-helper to support keys in tokens */ +diff --git a/sshconnect2.c b/sshconnect2.c +index dffee90b..e9a86e59 100644 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -1879,7 +1879,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp, + closefrom(sock + 1); + debug3("%s: [child] pid=%ld, exec %s", + __func__, (long)getpid(), _PATH_SSH_KEY_SIGN); +- execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); ++ execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); + fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN, + strerror(errno)); + } +-- +2.22.0 + -- GitLab From 396e3a6b3cf11578b1005fd6ad0513d6edaba46b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Aug 2019 11:16:32 +0100 Subject: [PATCH 04/92] libdrm: cross-compile fix --- .../libdrm/cross-build-nm-path.patch | 48 +++++++++++++++++++ pkgs/development/libraries/libdrm/default.nix | 6 ++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libdrm/cross-build-nm-path.patch diff --git a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch new file mode 100644 index 00000000000..478534e65e5 --- /dev/null +++ b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch @@ -0,0 +1,48 @@ +From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Fri, 2 Aug 2019 10:26:37 +0100 +Subject: [PATCH] meson: support for custom nm path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When cross-compiling target toolchains i.e. binutils are often +prefixed by its target architecture. This patch gives the user +to option to specify the nm used during the build process. + +Signed-off-by: Jörg Thalheim +--- + meson.build | 2 +- + meson_options.txt | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e292554a..64607139 100644 +--- a/meson.build ++++ b/meson.build +@@ -327,7 +327,7 @@ pkg.generate( + ) + + env_test = environment() +-env_test.set('NM', find_program('nm').path()) ++env_test.set('NM', find_program(get_option('nm-path')).path()) + + if with_libkms + subdir('libkms') +diff --git a/meson_options.txt b/meson_options.txt +index 8af33f1c..b4f46a52 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -141,3 +141,9 @@ option( + value : false, + description : 'Enable support for using udev instead of mknod.', + ) ++option( ++ 'nm-path', ++ type : 'string', ++ description : 'path to nm', ++ value : 'nm' ++) +-- +2.22.0 + diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index bdc191fe8a3..29d59659f90 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja ]; buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; + patches = [ ./cross-build-nm-path.patch ]; + postPatch = '' for a in */*-symbol-check ; do patchShebangs $a @@ -21,7 +23,9 @@ stdenv.mkDerivation rec { ''; mesonFlags = - [ "-Dinstall-test-programs=true" ] + [ + "-Dnm-path=${stdenv.cc.targetPrefix}nm" + "-Dinstall-test-programs=true" ] ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "-Dtegra=true" "-Detnaviv=true" ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false" -- GitLab From 8a604d2dbcceaac27654e3b1573f53ed47c3345f Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Sat, 3 Aug 2019 08:27:50 +0200 Subject: [PATCH 05/92] fribidi: fix cross compilation (#64655) --- pkgs/development/libraries/fribidi/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index b60f4be245e..9798347eadd 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , fetchpatch - , meson , ninja , pkgconfig @@ -10,7 +9,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fribidi"; version = "1.0.5"; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; }; @@ -33,10 +31,11 @@ stdenv.mkDerivation rec { patchShebangs test ''; - nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - checkInptus = [ python3 ]; + doCheck = true; + checkInputs = [ python3 ]; meta = with stdenv.lib; { homepage = https://github.com/fribidi/fribidi; -- GitLab From 5c0cdcfad269487d063a7dccd597781174c0b8a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Aug 2019 20:19:16 -0700 Subject: [PATCH 06/92] cmakeWithGui: 3.14.5 -> 3.15.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cmake-cursesui-qt5ui/versions --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 4761d8dc5b1..5bad0100a03 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.14.5"; + version = "3.15.1"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; + sha256 = "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq"; }; patches = [ -- GitLab From f2d6a195a1360e50b05ab896a641115d78ef9c3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Aug 2019 05:01:58 -0700 Subject: [PATCH 07/92] glib: 2.60.4 -> 2.60.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/glib/versions --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ecbcbea1394..1363fcabdc3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -46,7 +46,7 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.60.4"; + version = "2.60.6"; in stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b"; + sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch -- GitLab From 93d6d032f2067deafbf168dbcfbb380bbec032a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Aug 2019 06:31:31 -0700 Subject: [PATCH 08/92] jsoncpp: 1.9.0 -> 1.9.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jsoncpp/versions --- pkgs/development/libraries/jsoncpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index fa2b45ae948..c62f1e2de3f 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9"; + sha256 = "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj"; }; /* During darwin bootstrap, we have a cp that doesn't understand the -- GitLab From 403d64a705300180517241691266bcb68beb8748 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Aug 2019 23:30:44 -0700 Subject: [PATCH 09/92] libsForQt5.phonon: 4.10.2 -> 4.10.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/phonon-qt5/versions --- pkgs/development/libraries/phonon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 4d68d3718c0..2dd0cc10c94 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -6,7 +6,7 @@ with lib; let - v = "4.10.2"; + v = "4.10.3"; soname = if withQt5 then "phonon4qt5" else "phonon"; buildsystemdir = "share/cmake/${soname}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; - sha256 = "02c8fyyvg5qb0lxwxmnxc5grkg6p3halakjf02vmwmvqaycb3v9l"; + sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf"; }; buildInputs = -- GitLab From 27a71a19ed6748177c073fe8dfad95849e9f5058 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 3 Aug 2019 11:09:41 -0400 Subject: [PATCH 10/92] gtk3: defines for debugging, disable cast checks Because we're using plain buildtype these have to be passed manually. See: https://gitlab.gnome.org/GNOME/gtk/blob/3.24.10/meson.build#L59 With autotools the mapping for the the options to the defines was: yes: G_ENABLE_DEBUG G_ENABLE_CONSISTENCY_CHECKS minimum: G_ENABLE_DEBUG G_DISABLE_CAST_CHECKS no: G_DISABLE_CAST_CHECKS G_DISABLE_ASSERT G_DISABLE_CHECKS So we're passing the exact ones that would've been used for minimum. Additionally it isn't a good idea to pass the equivalents used for "no" as it eliminates G_ENABLE_DEBUG which disables pre-condition checks and assertions. The actual option only existed to serve people who needed a specific build of GTK for very specific environments. And now they are much better served with meson's plain buildtype and figuring out what to pass themselves. --- pkgs/development/libraries/gtk+/3.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 94b745794f1..40be17fcac7 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -77,6 +77,13 @@ stdenv.mkDerivation rec { "-Dtests=false" ]; + # These are the defines that'd you'd get with --enable-debug=minimum (default). + # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options + NIX_CFLAGS_COMPILE = [ + "-DG_ENABLE_DEBUG" + "-DG_DISABLE_CAST_CHECKS" + ]; + postPatch = '' files=( build-aux/meson/post-install.py -- GitLab From 60266eb504938631d2162a1fba3044eaa0d62d91 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 3 Aug 2019 11:10:41 -0400 Subject: [PATCH 11/92] glib: add cflag G_DISABLE_CAST_CHECKS This is what would have been passed before with the release buildtype. See: https://gitlab.gnome.org/GNOME/glib/blob/2.60.4/meson.build#L208 --- pkgs/development/libraries/glib/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ecbcbea1394..ed7c66946fa 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -98,8 +98,12 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP") - ++ [ "-Wno-error=nonnull" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=nonnull" + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ] ++ optional stdenv.isSunOS "-DBSD_COMP"; postPatch = '' # substitute fix-gio-launch-desktop-path.patch -- GitLab From c7c727fa9382e4f4cc69b63642585f96890add83 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 5 Aug 2019 06:13:01 -0400 Subject: [PATCH 12/92] gnome3.gnome-settings-daemon: add cflag G_DISABLE_CAST_CHECKS This is what would have been passed before with the release buildtype. See: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/blob/GNOME_SETTINGS_DAEMON_3_32_1/meson.build#L73 --- .../desktops/gnome-3/core/gnome-settings-daemon/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 6929f821e37..b9f33ce73a8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -95,6 +95,12 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + NIX_CFLAGS_COMPILE = [ + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; + # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper postFixup = '' mkdir -p $out/bin/gnome-settings-daemon -- GitLab From 3b085b45b903bd00d37be4fd8e28e4346aa0fd92 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 4 Aug 2019 09:50:13 -0400 Subject: [PATCH 13/92] pantheon.elementary-settings-daemon: add cflag G_DISABLE_CAST_CHECKS Mirror c7c727fa9382e4f4cc69b63642585f96890add83. --- .../services/elementary-settings-daemon/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d8514c51f4f..b4391b2e1b0 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -150,6 +150,12 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + NIX_CFLAGS_COMPILE = [ + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; + passthru = { updateScript = gnome3.updateScript { packageName = projectName; -- GitLab From f2eddec042da1d6bf38106565f0ee5c33c23c062 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 5 Aug 2019 06:19:44 -0400 Subject: [PATCH 14/92] glib: drop define BSD_COMP I fail to see where or for what it is useful for. --- pkgs/development/libraries/glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ed7c66946fa..7b226f9fc80 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { # Default for release buildtype but passed manually because # we're using plain "-DG_DISABLE_CAST_CHECKS" - ] ++ optional stdenv.isSunOS "-DBSD_COMP"; + ]; postPatch = '' # substitute fix-gio-launch-desktop-path.patch -- GitLab From 3c72fa7dda961613ea48fa3ebaf23fa18e3be8e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Jul 2019 04:59:35 -0700 Subject: [PATCH 15/92] enchant: 2.2.3 -> 2.2.4 Clean up the expression and prepare for tests. Unfortunately, I could not get them pass. --- pkgs/development/libraries/enchant/2.x.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 8b559bd03c8..3f46390c12b 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: +{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell, unittest-cpp }: -let - version = "2.2.3"; +stdenv.mkDerivation rec { pname = "enchant"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "2.2.4"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b"; + url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib hunspell ]; + checkInputs = [ unittest-cpp ]; propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file - doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory" + enableParallelBuilding = true; + + doCheck = false; # https://github.com/AbiWord/enchant/issues/219 meta = with stdenv.lib; { description = "Generic spell checking library"; -- GitLab From 6039f911b27aa1ec0a8e114bb09872f6b5e087d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 6 Aug 2019 04:03:00 -0700 Subject: [PATCH 16/92] gnome3.vala: 0.44.5 -> 0.44.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vala/versions --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 353963007d4..b77e6442362 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -129,8 +129,8 @@ in rec { }; vala_0_44 = generic { - version = "0.44.5"; - sha256 = "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv"; + version = "0.44.6"; + sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb"; }; vala = vala_0_44; -- GitLab From 6d1a5723d2c9e9e4d2a4632b1ba7566a1a894b61 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 6 Aug 2019 11:00:19 -0400 Subject: [PATCH 17/92] vala_0_40: 0.40.15 -> 0.40.16 https://gitlab.gnome.org/GNOME/vala/raw/0.40.16/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 353963007d4..497f2316cb0 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -119,8 +119,8 @@ in rec { }; vala_0_40 = generic { - version = "0.40.15"; - sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19"; + version = "0.40.16"; + sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b"; }; vala_0_42 = generic { -- GitLab From 469d17a3f0d8089cd14435b87d3886f1eeac27ec Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 6 Aug 2019 14:42:51 -0500 Subject: [PATCH 18/92] Revert "Revert "qt 5.12.0 -> 5.12.3"" This reverts commit bf39fc17d46b48e3883dd646bc0ecc0ccfb67df4. --- .../libraries/qt-5/5.12/default.nix | 1 - pkgs/development/libraries/qt-5/5.12/fetch.sh | 2 +- .../libraries/qt-5/5.12/qtbase.patch | 49 +-- .../qt-5/5.12/qtwebengine-CVE-2019-5786.patch | 26 -- pkgs/development/libraries/qt-5/5.12/srcs.nix | 320 +++++++++--------- .../libraries/qt-5/modules/qtbase.nix | 31 +- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 216 insertions(+), 215 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 1bc63d0e2b9..7b4addd9161 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -59,7 +59,6 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch - ./qtwebengine-CVE-2019-5786.patch ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index aa3a0fe9489..a4d2fc82ff2 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch index aa987acbe92..a3b4e438fe8 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -2,7 +2,7 @@ diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 61bea952b2..9909dae726 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ +@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ QMAKE_FIX_RPATH = install_name_tool -id @@ -90,7 +90,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { +@@ -318,7 +293,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -263,15 +263,14 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul index 99f68b78f5..dde69cb7c2 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -63,199 +63,3 @@ qt { - } +@@ -64,202 +64,6 @@ } } -- + -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { -- QMAKE_RPATHDIR += @executable_path/Frameworks +- QMAKE_RPATHDIR += @executable_path/../Frameworks - equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks -} - @@ -463,6 +462,10 @@ index 99f68b78f5..dde69cb7c2 100644 - xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) + generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index e3534561a5..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf @@ -532,7 +535,7 @@ diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 8360dd8b38..8b13789179 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ +@@ -1,54 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -568,10 +571,6 @@ index 8360dd8b38..8b13789179 100644 -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) - --sysrootified = --for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val --QMAKE_INCDIR_OPENGL = $$sysrootified -- -QMAKESPEC_NAME = $$basename(QMAKESPEC) - -# Resolve SDK version of various tools @@ -595,24 +594,24 @@ diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index 65212b2abf..accd4c07f0 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf -@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_ - # Tools need qmldir and plugins.qmltypes always installed on the file system - qmldir.files = $$qmldir_file $$fq_aux_qml_files +@@ -54,7 +54,7 @@ + + qmldir.files = $$qmldir_file install_qml_files: qmldir.files += $$fq_qml_files --qmldir.path = $$instbase/$$TARGETPATH +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += qmldir - !debug_and_release|!build_all|CONFIG(release, debug|release) { + qmlfiles.base = $$_PRO_FILE_PWD_ diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index cd6377dcc6..e98bf98151 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf -@@ -56,7 +56,7 @@ qml1_target { - instbase = $$[QT_INSTALL_QML] - } +@@ -50,7 +50,7 @@ + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH --target.path = $$instbase/$$TARGETPATH +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += target @@ -746,7 +745,7 @@ index 8f98987b99..21b3bb8b32 100644 !static: target.CONFIG = no_dll INSTALLS += target } -@@ -29,33 +23,33 @@ +@@ -29,35 +23,35 @@ #headers qt_install_headers { gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES @@ -762,6 +761,8 @@ index 8f98987b99..21b3bb8b32 100644 private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + generated_privates: \ + private_headers.CONFIG += no_check_exist INSTALLS += private_headers qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES @@ -876,7 +877,7 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea index 463e30e1c3..0e1ab669e4 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths() +@@ -2668,6 +2668,15 @@ QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -889,9 +890,9 @@ index 463e30e1c3..0e1ab669e4 100644 + } + } + - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); + QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp index bed62a02bd..73158993f7 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch deleted file mode 100644 index ec9a432ea70..00000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -@@ -135,14 +135,16 @@ - if (!raw_data_ || error_code_) - return nullptr; - -- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -- if (finished_loading_) { -- array_buffer_result_ = result; -- AdjustReportedMemoryUsageToV8( -- -1 * static_cast(raw_data_->ByteLength())); -- raw_data_.reset(); -+ if (!finished_loading_) { -+ return DOMArrayBuffer::Create( -+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength())); - } -- return result; -+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -+ AdjustReportedMemoryUsageToV8(-1 * -+ static_cast(raw_data_->ByteLength())); -+ -+ raw_data_.reset(); -+ return array_buffer_result_; - } - - String FileReaderLoader::StringResult() { diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix index d83edc97e94..ce567c3a2bc 100644 --- a/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1"; - name = "qt3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d"; + name = "qt3d-everywhere-src-5.12.3.tar.xz"; }; }; qtactiveqt = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52"; - name = "qtactiveqt-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz"; + sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f"; + name = "qtactiveqt-everywhere-src-5.12.3.tar.xz"; }; }; qtandroidextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm"; - name = "qtandroidextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f"; + name = "qtandroidextras-everywhere-src-5.12.3.tar.xz"; }; }; qtbase = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz"; - sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy"; - name = "qtbase-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz"; + sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701"; + name = "qtbase-everywhere-src-5.12.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj"; - name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea"; + name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz"; }; }; qtcharts = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz"; - sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww"; - name = "qtcharts-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz"; + sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9"; + name = "qtcharts-everywhere-src-5.12.3.tar.xz"; }; }; qtconnectivity = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz"; - sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f"; - name = "qtconnectivity-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz"; + sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661"; + name = "qtconnectivity-everywhere-src-5.12.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf"; - name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313"; + name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz"; }; }; qtdeclarative = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz"; - sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag"; - name = "qtdeclarative-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz"; + sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7"; + name = "qtdeclarative-everywhere-src-5.12.3.tar.xz"; }; }; qtdoc = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz"; - sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h"; - name = "qtdoc-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz"; + sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f"; + name = "qtdoc-everywhere-src-5.12.3.tar.xz"; }; }; qtgamepad = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz"; - sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac"; - name = "qtgamepad-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz"; + sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642"; + name = "qtgamepad-everywhere-src-5.12.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1"; - name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; + sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73"; + name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; }; }; qtimageformats = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z"; - name = "qtimageformats-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz"; + sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2"; + name = "qtimageformats-everywhere-src-5.12.3.tar.xz"; }; }; qtlocation = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz"; - sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh"; - name = "qtlocation-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz"; + sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6"; + name = "qtlocation-everywhere-src-5.12.3.tar.xz"; }; }; qtmacextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr"; - name = "qtmacextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed"; + name = "qtmacextras-everywhere-src-5.12.3.tar.xz"; }; }; qtmultimedia = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw"; - name = "qtmultimedia-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz"; + sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301"; + name = "qtmultimedia-everywhere-src-5.12.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz"; - sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1"; - name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz"; + sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332"; + name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz"; }; }; qtpurchasing = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr"; - name = "qtpurchasing-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz"; + sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e"; + name = "qtpurchasing-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz"; - sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb"; - name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz"; + sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46"; + name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; - sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9"; - name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; + sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a"; + name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09"; - name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz"; + sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42"; + name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz"; }; }; qtscript = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp"; - name = "qtscript-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz"; + sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e"; + name = "qtscript-everywhere-src-5.12.3.tar.xz"; }; }; qtscxml = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz"; - sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw"; - name = "qtscxml-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz"; + sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19"; + name = "qtscxml-everywhere-src-5.12.3.tar.xz"; }; }; qtsensors = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz"; - sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5"; - name = "qtsensors-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz"; + sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc"; + name = "qtsensors-everywhere-src-5.12.3.tar.xz"; }; }; qtserialbus = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz"; - sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb"; - name = "qtserialbus-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz"; + sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d"; + name = "qtserialbus-everywhere-src-5.12.3.tar.xz"; }; }; qtserialport = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz"; - sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r"; - name = "qtserialport-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz"; + sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51"; + name = "qtserialport-everywhere-src-5.12.3.tar.xz"; }; }; qtspeech = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz"; - sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r"; - name = "qtspeech-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz"; + sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5"; + name = "qtspeech-everywhere-src-5.12.3.tar.xz"; }; }; qtsvg = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz"; - sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb"; - name = "qtsvg-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz"; + sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2"; + name = "qtsvg-everywhere-src-5.12.3.tar.xz"; }; }; qttools = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz"; - sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p"; - name = "qttools-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz"; + sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8"; + name = "qttools-everywhere-src-5.12.3.tar.xz"; }; }; qttranslations = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz"; - sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv"; - name = "qttranslations-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz"; + sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca"; + name = "qttranslations-everywhere-src-5.12.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv"; - name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; + sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22"; + name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; }; }; qtwayland = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz"; - sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m"; - name = "qtwayland-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz"; + sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff"; + name = "qtwayland-everywhere-src-5.12.3.tar.xz"; }; }; qtwebchannel = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz"; - sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5"; - name = "qtwebchannel-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz"; + sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a"; + name = "qtwebchannel-everywhere-src-5.12.3.tar.xz"; }; }; qtwebengine = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz"; - sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x"; - name = "qtwebengine-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz"; + sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317"; + name = "qtwebengine-everywhere-src-5.12.3.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5"; - name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz"; + sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3"; + name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz"; }; }; qtwebsockets = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4"; - name = "qtwebsockets-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz"; + sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577"; + name = "qtwebsockets-everywhere-src-5.12.3.tar.xz"; }; }; qtwebview = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz"; - sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p"; - name = "qtwebview-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz"; + sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5"; + name = "qtwebview-everywhere-src-5.12.3.tar.xz"; }; }; qtwinextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6"; - name = "qtwinextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b"; + name = "qtwinextras-everywhere-src-5.12.3.tar.xz"; }; }; qtx11extras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz"; - sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06"; - name = "qtx11extras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz"; + sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613"; + name = "qtx11extras-everywhere-src-5.12.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; - sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk"; - name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; + sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61"; + name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 458946b803d..8506a80ddf3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -229,6 +229,8 @@ stdenv.mkDerivation { "-widgets" "-opengl desktop" "-icu" + "-L" "${icu.out}/lib" + "-I" "${icu.dev}/include" "-pch" ] ++ lib.optionals (compareVersion "5.11.0" < 0) @@ -265,10 +267,18 @@ stdenv.mkDerivation { ++ [ "-system-zlib" + "-L" "${zlib.out}/lib" + "-I" "${zlib.dev}/include" "-system-libjpeg" + "-L" "${libjpeg.out}/lib" + "-I" "${libjpeg.dev}/include" "-system-harfbuzz" + "-L" "${harfbuzz.out}/lib" + "-I" "${harfbuzz.dev}/include" "-system-pcre" "-openssl-linked" + "-L" "${openssl.out}/lib" + "-I" "${openssl.dev}/include" "-system-sqlite" ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' @@ -297,10 +307,14 @@ stdenv.mkDerivation { "-system-xcb" "-xcb" "-qpa xcb" + "-L" "${libX11.out}/lib" + "-I" "${libX11.out}/include" + "-L" "${libXext.out}/lib" + "-I" "${libXext.out}/include" + "-L" "${libXrender.out}/lib" + "-I" "${libXrender.out}/include" - "-system-xkbcommon" "-libinput" - "-xkbcommon-evdev" "-no-eglfs" "-no-gbm" @@ -321,6 +335,19 @@ stdenv.mkDerivation { "-no-feature-renameat2" "-no-feature-getentropy" ] + ++ lib.optionals (compareVersion "5.12.1" < 0) [ + # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 + "-system-xkbcommon" + "-xkbcommon-evdev" + ] + ++ lib.optionals (cups != null) [ + "-L" "${cups.lib}/lib" + "-I" "${cups.dev}/include" + ] + ++ lib.optionals (mysql != null) [ + "-L" "${mysql.out}/lib" + "-I" "${mysql.out}/include" + ] ); enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1eb600bd42..a352a56ed31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12960,7 +12960,7 @@ in inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - harfbuzz = harfbuzzFull; + inherit harfbuzz; inherit libGL; inherit perl; inherit gtk3; -- GitLab From 3a2a980787c464cdcf6835ccb54c273bd56fe0f1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 6 Aug 2019 14:43:04 -0500 Subject: [PATCH 19/92] Revert "Revert "qt512: Update qtbase.patch"" This reverts commit c220e00d7a4524f59e19d7337aa3d47e9a678e64. --- .../libraries/qt-5/5.12/qtbase.patch | 405 ++++++++---------- 1 file changed, 182 insertions(+), 223 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch index a3b4e438fe8..118ffaa511e 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -1,8 +1,7 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf 2019-07-10 09:35:08.917628566 -0500 +@@ -24,7 +24,7 @@ QMAKE_FIX_RPATH = install_name_tool -id @@ -11,11 +10,10 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ed708e085..05e60ff45f 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -21,7 +21,7 @@ # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644 contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -51,45 +51,20 @@ split_incpath { +@@ -51,45 +51,20 @@ $$cmake_extra_source_includes.output } @@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -318,7 +293,7 @@ exists($$cmake_macros_file.input) { +@@ -318,7 +293,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..4c7c8da21a 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-10 09:35:08.917628566 -0500 +@@ -3,30 +3,6 @@ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -134,7 +131,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() +@@ -52,11 +28,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -146,7 +143,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -69,11 +41,7 @@ ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -158,7 +155,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -89,24 +57,13 @@ !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -187,7 +184,7 @@ index 3ed6dd5889..4c7c8da21a 100644 ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -122,7 +79,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -195,7 +192,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -272,25 +228,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -221,7 +218,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -309,25 +253,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -247,7 +244,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -346,11 +278,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -259,10 +256,9 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 99f68b78f5..dde69cb7c2 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf 2019-07-10 09:35:08.917628566 -0500 @@ -64,202 +64,6 @@ } } @@ -466,10 +462,9 @@ index 99f68b78f5..dde69cb7c2 100644 !macx-xcode { generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf 2019-07-10 09:35:08.917628566 -0500 @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -531,10 +526,9 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 8360dd8b38..8b13789179 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf 2019-07-10 09:35:08.917628566 -0500 @@ -1,54 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ @@ -590,10 +584,9 @@ index 8360dd8b38..8b13789179 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 65212b2abf..accd4c07f0 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf 2019-07-10 09:35:08.917628566 -0500 @@ -54,7 +54,7 @@ qmldir.files = $$qmldir_file @@ -603,10 +596,9 @@ index 65212b2abf..accd4c07f0 100644 INSTALLS += qmldir qmlfiles.base = $$_PRO_FILE_PWD_ -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index cd6377dcc6..e98bf98151 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf 2019-07-10 09:35:08.918628595 -0500 @@ -50,7 +50,7 @@ DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH @@ -616,11 +608,10 @@ index cd6377dcc6..e98bf98151 100644 INSTALLS += target # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -30,7 +30,7 @@ target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -629,11 +620,10 @@ index 8354f30eea..62028fef8e 100644 CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 3bb3823a8e..655b7b7db8 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -24,6 +24,6 @@ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -642,11 +632,10 @@ index 3bb3823a8e..655b7b7db8 100644 + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 4ad9946ae0..6d66f29c26 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -34,8 +34,8 @@ qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -657,11 +646,10 @@ index 4ad9946ae0..6d66f29c26 100644 } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3139c443c6..1b4f2fddd8 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -45,7 +45,7 @@ QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -670,7 +658,7 @@ index 3139c443c6..1b4f2fddd8 100644 PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = +@@ -64,8 +64,8 @@ DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -681,7 +669,7 @@ index 3139c443c6..1b4f2fddd8 100644 } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { +@@ -88,12 +88,12 @@ qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -696,11 +684,10 @@ index 3139c443c6..1b4f2fddd8 100644 inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -709,11 +696,10 @@ index 43b58817fe..e635b8f67a 100644 INSTALLS += sources check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -69,7 +69,7 @@ defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -722,10 +708,9 @@ index 1903e509c8..ae7b585989 100644 exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 8f98987b99..21b3bb8b32 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf 2019-07-10 09:35:08.918628595 -0500 @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -787,11 +772,10 @@ index 8f98987b99..21b3bb8b32 100644 privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 40528a65e2..903f795284 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ } } @@ -800,11 +784,63 @@ index 40528a65e2..903f795284 100644 INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e0652fdcf9..450b2a2d28 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -2668,6 +2668,15 @@ + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h 2019-07-10 09:35:08.920628655 -0500 +@@ -212,7 +212,7 @@ + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include +@@ -290,7 +290,19 @@ + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-07-10 09:35:08.918628595 -0500 +@@ -3,7 +3,7 @@ add_executable(Qt5::qmake IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -813,7 +849,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) +@@ -18,7 +18,7 @@ add_executable(Qt5::moc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -822,7 +858,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) +@@ -35,7 +35,7 @@ add_executable(Qt5::rcc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -831,7 +867,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -116,7 +116,7 @@ !!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -840,7 +876,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -130,7 +130,7 @@ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -849,10 +885,9 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-07-10 09:35:08.918628595 -0500 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) @@ -861,10 +896,9 @@ index c357237d0e..6f0c75de3c 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-07-10 09:35:08.918628595 -0500 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) @@ -873,31 +907,10 @@ index 706304cf34..546420f6ad 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 463e30e1c3..0e1ab669e4 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2668,6 +2668,15 @@ - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ - QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index bed62a02bd..73158993f7 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -910,7 +923,7 @@ index bed62a02bd..73158993f7 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -644,12 +648,16 @@ if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -932,10 +945,9 @@ index bed62a02bd..73158993f7 100644 } } -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -949,7 +961,7 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() +@@ -17,11 +13,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -962,10 +974,9 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -975,7 +986,7 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO +@@ -17,13 +17,13 @@ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -991,11 +1002,10 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -265,12 +265,9 @@ m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1009,11 +1019,10 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 57629ac03a..8a7f219a98 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -317,10 +317,10 @@ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1026,10 +1035,10 @@ index 57629ac03a..8a7f219a98 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp +Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp 2019-07-10 09:35:08.919628625 -0500 @@ -39,6 +39,7 @@ #include @@ -1038,7 +1047,7 @@ index fb1c425d8e..bb8bab9795 100644 QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ public: +@@ -54,8 +55,22 @@ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1062,10 +1071,21 @@ index fb1c425d8e..bb8bab9795 100644 return 0; } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp 2019-07-10 09:35:08.920628655 -0500 +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h 2019-07-10 09:35:08.919628625 -0500 @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1082,11 +1102,10 @@ index 6498ea84ef..d821ced7fc 100644 QT_END_NAMESPACE -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) +diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 +@@ -3,7 +3,7 @@ add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -1095,63 +1114,3 @@ index 99d87e2e46..a4eab2aa72 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ENDIF -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index b14a494296..779c4eda95 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -211,7 +211,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include -@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index 2c1005ad80..244147ea7d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index 1268730cc6..a50e9b0764 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - #endif - } - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Logger that also feeds messages to AUL. It needs to wrap the existing - // logger, as it needs to be able to short circuit the existing logger - // in case AUL prints to stderr. -- GitLab From a1dba15dd54323d4fc4c3f9acf60ed6513cea25d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 9 Aug 2019 13:22:12 +0000 Subject: [PATCH 20/92] perl: 5.28.2 -> 5.30.0 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e9eb55dbab..1a07676a347 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14251,8 +14251,8 @@ in perl530Packages = recurseIntoAttrs perl530.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl528; - perlPackages = perl528Packages; + perl = perl530; + perlPackages = perl530Packages; ack = perlPackages.ack; -- GitLab From 63ad67cbbbd712f10e8e523bb9b004b9c8afd003 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 10 Aug 2019 13:48:02 +0200 Subject: [PATCH 21/92] scons: 3.1.0 -> 3.1.1 Announcement: https://scons.org/scons-311-is-available.html Changelog: https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.1/src/CHANGES.txt --- pkgs/development/tools/build-managers/scons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 08644def517..1655c154d4e 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.1.0"; - sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; + version = "3.1.1"; + sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc"; }; } -- GitLab From 791bc4762bf87af5a7cab881b0df01534d34678a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 5 Aug 2019 22:32:51 -0700 Subject: [PATCH 22/92] srt: 1.3.2 -> 1.3.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/srt/versions --- pkgs/development/libraries/srt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index bb66174c884..5edb2d92b55 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4"; + sha256 = "1dwz7qrkdrbmsbh66rbdx36b60r8whkz0wvf47jfckzsj37d2w22"; }; nativeBuildInputs = [ cmake ]; -- GitLab From a316d71f59c17b29a52255f1709d9ca283bcfe3a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 12 Aug 2019 18:09:30 -0400 Subject: [PATCH 23/92] mesa: add surfaceless egl platform --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 7b1b5a3cfa9..7610b15296e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] -, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light }: -- GitLab From 3147cb1a8ad60d9b8d13f1188af40c8ba9f7f2fc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 8 Aug 2019 18:56:53 -0700 Subject: [PATCH 24/92] pythonPackages.sqlalchemy: 1.2.14 -> 1.3.6 --- .../python-modules/sqlalchemy/default.nix | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index c7ff2e56f02..480ee6a67a0 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,43 +1,25 @@ -{ lib -, fetchPypi -, fetchpatch -, buildPythonPackage -, pytest +{ lib, fetchPypi, buildPythonPackage, isPy3k , mock -, isPy3k , pysqlite +, pytest +, pytest_xdist }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.2.14"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04"; + sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1"; }; - patches = [ - # fix for failing doc tests - # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail - (fetchpatch { - name = "doc-test-fixes.patch"; - url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw; - sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri"; - }) - ]; - checkInputs = [ pytest mock -# Disable pytest_xdist tests for now, because our version seems to be too new. -# pytest_xdist + pytest_xdist ] ++ lib.optional (!isPy3k) pysqlite; - checkPhase = '' - py.test -k "not test_round_trip_direct_type_affinity" - ''; - meta = with lib; { homepage = http://www.sqlalchemy.org/; description = "A Python SQL toolkit and Object Relational Mapper"; -- GitLab From af4e271db9e3469ebce7a6eae142a943e240ffa2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 13 Aug 2019 18:23:40 +0200 Subject: [PATCH 25/92] =?UTF-8?q?libgudev:=20232=20=E2=86=92=20233?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/gnome/sources/folks/0.13/folks-0.13.1.news --- .../libraries/libgudev/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index d3dea766cbb..b52a2b1e0fa 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }: +{ stdenv +, fetchurl +, pkgconfig +, udev +, glib +, gobject-introspection +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "libgudev"; -in stdenv.mkDerivation rec { - name = "libgudev-${version}"; - version = "232"; + version = "233"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q"; }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; -- GitLab From ce1b77231a8427dba9299ee749a7ea7b2b40b473 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 13 Aug 2019 12:51:45 -0400 Subject: [PATCH 26/92] git: 2.22.0 -> 2.22.1 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 4c78963d7fa..87059634752 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.22.0"; + version = "2.22.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm"; + sha256 = "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac"; }; outputs = [ "out" ]; -- GitLab From 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 15 Aug 2019 12:41:18 +0000 Subject: [PATCH 27/92] treewide: name -> pname (easy cases) (#66585) treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname --- nixos/modules/hardware/raid/hpsa.nix | 4 ++-- nixos/tests/common/letsencrypt/default.nix | 4 ++-- pkgs/applications/altcoins/clightning.nix | 2 +- pkgs/applications/altcoins/dashpay.nix | 2 +- pkgs/applications/altcoins/dcrd.nix | 2 +- pkgs/applications/altcoins/dcrwallet.nix | 2 +- pkgs/applications/altcoins/dero.nix | 2 +- pkgs/applications/altcoins/freicoin.nix | 2 +- .../altcoins/go-ethereum-classic/default.nix | 2 +- pkgs/applications/altcoins/masari.nix | 2 +- .../applications/altcoins/monero-gui/default.nix | 2 +- pkgs/applications/altcoins/monero/default.nix | 2 +- .../altcoins/nano-wallet/default.nix | 2 +- pkgs/applications/altcoins/parity-ui/default.nix | 4 ++-- .../altcoins/particl/particl-core.nix | 2 +- pkgs/applications/altcoins/pivx.nix | 2 +- pkgs/applications/altcoins/sumokoin.nix | 2 +- pkgs/applications/altcoins/wownero.nix | 2 +- pkgs/applications/audio/AMB-plugins/default.nix | 4 ++-- pkgs/applications/audio/FIL-plugins/default.nix | 4 ++-- pkgs/applications/audio/MMA/default.nix | 2 +- pkgs/applications/audio/a2jmidid/default.nix | 2 +- pkgs/applications/audio/aeolus/default.nix | 4 ++-- pkgs/applications/audio/ams-lv2/default.nix | 2 +- pkgs/applications/audio/ario/default.nix | 4 ++-- pkgs/applications/audio/artyFX/default.nix | 2 +- pkgs/applications/audio/asunder/default.nix | 4 ++-- pkgs/applications/audio/audacious/default.nix | 2 +- pkgs/applications/audio/audacity/default.nix | 2 +- .../audio/audio-recorder/default.nix | 4 ++-- pkgs/applications/audio/avldrums-lv2/default.nix | 1 - pkgs/applications/audio/axoloti/default.nix | 2 +- pkgs/applications/audio/axoloti/dfu-util.nix | 4 ++-- pkgs/applications/audio/baudline/default.nix | 2 +- pkgs/applications/audio/bitmeter/default.nix | 4 ++-- .../audio/bitwig-studio/bitwig-studio1.nix | 2 +- pkgs/applications/audio/bristol/default.nix | 4 ++-- pkgs/applications/audio/bs1770gain/default.nix | 4 ++-- pkgs/applications/audio/calf/default.nix | 4 ++-- pkgs/applications/audio/caps/default.nix | 2 +- pkgs/applications/audio/cava/default.nix | 2 +- pkgs/applications/audio/cd-discid/default.nix | 4 ++-- pkgs/applications/audio/chuck/default.nix | 2 +- pkgs/applications/audio/cmus/default.nix | 2 +- pkgs/applications/audio/cmusfm/default.nix | 2 +- pkgs/applications/audio/csa/default.nix | 4 ++-- .../audio/csound/csound-qt/default.nix | 2 +- pkgs/applications/audio/csound/default.nix | 2 +- .../audio/deadbeef/plugins/headerbar-gtk3.nix | 2 +- .../audio/deadbeef/plugins/infobar.nix | 2 +- .../audio/deadbeef/plugins/mpris2.nix | 4 ++-- pkgs/applications/audio/denemo/default.nix | 2 +- pkgs/applications/audio/dfasma/default.nix | 2 +- pkgs/applications/audio/distrho/default.nix | 2 +- pkgs/applications/audio/drumgizmo/default.nix | 4 ++-- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- pkgs/applications/audio/ecasound/default.nix | 2 +- pkgs/applications/audio/eflite/default.nix | 4 ++-- pkgs/applications/audio/eq10q/default.nix | 4 ++-- pkgs/applications/audio/espeak-ng/default.nix | 2 +- pkgs/applications/audio/eteroj.lv2/default.nix | 1 - pkgs/applications/audio/faust/faustlive.nix | 2 +- pkgs/applications/audio/flac123/default.nix | 4 ++-- pkgs/applications/audio/flacon/default.nix | 2 +- pkgs/applications/audio/fmit/default.nix | 2 +- pkgs/applications/audio/fmsynth/default.nix | 2 +- pkgs/applications/audio/fomp/default.nix | 4 ++-- pkgs/applications/audio/foo-yc20/default.nix | 2 +- pkgs/applications/audio/freewheeling/default.nix | 2 +- .../audio/game-music-emu/default.nix | 4 ++-- pkgs/applications/audio/gigedit/default.nix | 4 ++-- pkgs/applications/audio/gmpc/default.nix | 2 +- .../audio/gnome-podcasts/default.nix | 2 +- pkgs/applications/audio/greg/default.nix | 1 - pkgs/applications/audio/gtkpod/default.nix | 4 ++-- pkgs/applications/audio/guitarix/default.nix | 2 +- .../applications/audio/gxplugins-lv2/default.nix | 1 - pkgs/applications/audio/helm/default.nix | 2 +- pkgs/applications/audio/hydrogen/default.nix | 2 +- pkgs/applications/audio/i-score/default.nix | 2 +- pkgs/applications/audio/iannix/default.nix | 2 +- pkgs/applications/audio/id3v2/default.nix | 4 ++-- .../audio/infamousPlugins/default.nix | 2 +- pkgs/applications/audio/ir.lv2/default.nix | 2 +- pkgs/applications/audio/jaaa/default.nix | 4 ++-- pkgs/applications/audio/jack-capture/default.nix | 4 ++-- .../audio/jack-oscrolloscope/default.nix | 4 ++-- pkgs/applications/audio/jalv/default.nix | 4 ++-- pkgs/applications/audio/japa/default.nix | 4 ++-- .../applications/audio/keyfinder-cli/default.nix | 2 +- pkgs/applications/audio/keyfinder/default.nix | 2 +- pkgs/applications/audio/kid3/default.nix | 4 ++-- pkgs/applications/audio/klick/default.nix | 4 ++-- .../audio/ladspa-plugins/default.nix | 2 +- pkgs/applications/audio/ladspa-sdk/default.nix | 2 +- pkgs/applications/audio/ladspa-sdk/ladspah.nix | 2 +- pkgs/applications/audio/lash/default.nix | 4 ++-- pkgs/applications/audio/linuxband/default.nix | 4 ++-- pkgs/applications/audio/linuxsampler/default.nix | 4 ++-- pkgs/applications/audio/lmms/default.nix | 2 +- pkgs/applications/audio/lsp-plugins/default.nix | 3 +-- pkgs/applications/audio/ltc-tools/default.nix | 2 +- pkgs/applications/audio/lv2bm/default.nix | 2 +- .../CharacterCompressor/default.nix | 2 +- .../audio/magnetophonDSP/CompBus/default.nix | 2 +- .../ConstantDetuneChorus/default.nix | 2 +- .../audio/magnetophonDSP/LazyLimiter/default.nix | 2 +- .../magnetophonDSP/MBdistortion/default.nix | 2 +- .../audio/magnetophonDSP/RhythmDelay/default.nix | 2 +- .../magnetophonDSP/VoiceOfFaust/default.nix | 2 +- .../audio/magnetophonDSP/pluginUtils/default.nix | 2 +- .../magnetophonDSP/shelfMultiBand/default.nix | 2 +- pkgs/applications/audio/mda-lv2/default.nix | 4 ++-- pkgs/applications/audio/meterbridge/default.nix | 4 ++-- pkgs/applications/audio/mhwaveedit/default.nix | 2 +- pkgs/applications/audio/milkytracker/default.nix | 2 +- pkgs/applications/audio/mimic/default.nix | 2 +- pkgs/applications/audio/mixxx/default.nix | 2 +- pkgs/applications/audio/moc/default.nix | 2 +- .../audio/mod-distortion/default.nix | 2 +- .../applications/audio/monkeys-audio/default.nix | 1 - pkgs/applications/audio/mp3blaster/default.nix | 2 +- pkgs/applications/audio/mp3splt/default.nix | 3 +-- pkgs/applications/audio/mp3val/default.nix | 4 ++-- pkgs/applications/audio/mpc/default.nix | 2 +- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/audio/muse/default.nix | 2 +- pkgs/applications/audio/musescore/darwin.nix | 2 +- pkgs/applications/audio/musescore/default.nix | 2 +- pkgs/applications/audio/ncmpc/default.nix | 2 +- pkgs/applications/audio/ncmpcpp/default.nix | 4 ++-- pkgs/applications/audio/ncpamixer/default.nix | 2 +- pkgs/applications/audio/non/default.nix | 2 +- pkgs/applications/audio/normalize/default.nix | 4 ++-- pkgs/applications/audio/nova-filters/default.nix | 2 +- pkgs/applications/audio/padthv1/default.nix | 4 ++-- pkgs/applications/audio/pamix/default.nix | 2 +- pkgs/applications/audio/pamixer/default.nix | 2 +- pkgs/applications/audio/patchage/default.nix | 2 +- .../audio/pd-plugins/cyclone/default.nix | 2 +- .../audio/pd-plugins/maxlib/default.nix | 2 +- .../audio/pd-plugins/mrpeach/default.nix | 2 +- .../audio/pd-plugins/puremapping/default.nix | 2 +- .../audio/pd-plugins/timbreid/default.nix | 2 +- .../audio/pd-plugins/zexy/default.nix | 4 ++-- pkgs/applications/audio/petrifoo/default.nix | 4 ++-- pkgs/applications/audio/pianobooster/default.nix | 2 +- pkgs/applications/audio/playbar2/default.nix | 2 +- .../audio/plugin-torture/default.nix | 2 +- pkgs/applications/audio/ponymix/default.nix | 2 +- pkgs/applications/audio/praat/default.nix | 2 +- .../audio/pulseaudio-modules-bt/default.nix | 2 +- pkgs/applications/audio/puredata/default.nix | 2 +- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- pkgs/applications/audio/qmidiroute/default.nix | 4 ++-- pkgs/applications/audio/qsampler/default.nix | 4 ++-- pkgs/applications/audio/qsynth/default.nix | 4 ++-- pkgs/applications/audio/qtscrobbler/default.nix | 2 +- pkgs/applications/audio/rakarrack/default.nix | 4 ++-- pkgs/applications/audio/reaper/default.nix | 2 +- pkgs/applications/audio/redoflacs/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/audio/rosegarden/default.nix | 4 ++-- pkgs/applications/audio/rubyripper/default.nix | 2 +- pkgs/applications/audio/samplv1/default.nix | 4 ++-- .../applications/audio/schismtracker/default.nix | 4 ++-- pkgs/applications/audio/seq24/default.nix | 4 ++-- pkgs/applications/audio/setbfree/default.nix | 2 +- pkgs/applications/audio/sfxr-qt/default.nix | 2 +- pkgs/applications/audio/shntool/default.nix | 2 +- pkgs/applications/audio/sidplayfp/default.nix | 4 ++-- pkgs/applications/audio/snapcast/default.nix | 2 +- pkgs/applications/audio/sonic-pi/default.nix | 2 +- .../audio/sonic-visualiser/default.nix | 4 ++-- pkgs/applications/audio/sooperlooper/default.nix | 2 +- pkgs/applications/audio/sorcer/default.nix | 2 +- .../audio/soundscape-renderer/default.nix | 2 +- pkgs/applications/audio/spectmorph/default.nix | 4 ++-- pkgs/applications/audio/spectrojack/default.nix | 4 ++-- pkgs/applications/audio/spek/default.nix | 4 ++-- pkgs/applications/audio/split2flac/default.nix | 2 +- pkgs/applications/audio/spotifywm/default.nix | 2 +- pkgs/applications/audio/ssrc/default.nix | 1 - pkgs/applications/audio/streamripper/default.nix | 4 ++-- pkgs/applications/audio/sunvox/default.nix | 2 +- pkgs/applications/audio/svox/default.nix | 2 +- pkgs/applications/audio/swh-lv2/default.nix | 2 +- pkgs/applications/audio/synthv1/default.nix | 4 ++-- pkgs/applications/audio/tambura/default.nix | 1 - pkgs/applications/audio/tetraproc/default.nix | 4 ++-- pkgs/applications/audio/tomahawk/default.nix | 4 ++-- pkgs/applications/audio/transcribe/default.nix | 2 +- pkgs/applications/audio/traverso/default.nix | 2 +- pkgs/applications/audio/vcv-rack/default.nix | 2 +- pkgs/applications/audio/vimpc/default.nix | 2 +- pkgs/applications/audio/vkeybd/default.nix | 4 ++-- pkgs/applications/audio/wolf-shaper/default.nix | 2 +- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- pkgs/applications/audio/xsynth-dssi/default.nix | 4 ++-- pkgs/applications/audio/yasr/default.nix | 4 ++-- pkgs/applications/audio/ympd/default.nix | 2 +- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- pkgs/applications/audio/zam-plugins/default.nix | 2 +- .../applications/audio/zita-njbridge/default.nix | 4 ++-- pkgs/applications/audio/zynaddsubfx/default.nix | 2 +- pkgs/applications/backup/vdmfec/default.nix | 4 ++-- .../lightdm-enso-os-greeter/default.nix | 2 +- .../lightdm-mini-greeter/default.nix | 2 +- .../applications/display-managers/ly/default.nix | 2 +- pkgs/applications/editors/aewan/default.nix | 4 ++-- pkgs/applications/editors/aseprite/default.nix | 2 +- pkgs/applications/editors/bonzomatic/default.nix | 1 - pkgs/applications/editors/brackets/default.nix | 4 ++-- pkgs/applications/editors/bvi/default.nix | 4 ++-- pkgs/applications/editors/bviplus/default.nix | 2 +- .../editors/deadpixi-sam/default.nix | 2 +- pkgs/applications/editors/dhex/default.nix | 2 +- pkgs/applications/editors/dit/default.nix | 4 ++-- pkgs/applications/editors/edbrowse/default.nix | 2 +- pkgs/applications/editors/edit/default.nix | 2 +- .../editors/emacs-modes/cask/default.nix | 2 +- .../editors/emacs-modes/cedille/default.nix | 2 +- .../editors/emacs-modes/cryptol/default.nix | 2 +- .../editors/emacs-modes/hol_light/default.nix | 2 +- .../editors/emacs-modes/icicles/default.nix | 4 ++-- .../editors/emacs-modes/idris/default.nix | 1 - .../editors/emacs-modes/jabber/default.nix | 3 +-- .../editors/emacs-modes/proofgeneral/4.4.nix | 2 +- .../editors/emacs-modes/proofgeneral/HEAD.nix | 2 +- pkgs/applications/editors/featherpad/default.nix | 2 +- pkgs/applications/editors/flpsed/default.nix | 4 ++-- .../applications/editors/focuswriter/default.nix | 2 +- pkgs/applications/editors/hecate/default.nix | 2 +- pkgs/applications/editors/heme/default.nix | 2 +- pkgs/applications/editors/hexcurse/default.nix | 2 +- pkgs/applications/editors/hexedit/default.nix | 4 ++-- pkgs/applications/editors/howl/default.nix | 2 +- pkgs/applications/editors/ht/default.nix | 2 +- pkgs/applications/editors/joe/default.nix | 4 ++-- pkgs/applications/editors/jucipp/default.nix | 2 +- pkgs/applications/editors/jupp/default.nix | 2 +- pkgs/applications/editors/leafpad/default.nix | 4 ++-- pkgs/applications/editors/leo-editor/default.nix | 2 +- pkgs/applications/editors/lighttable/default.nix | 6 +++--- pkgs/applications/editors/mg/default.nix | 4 ++-- pkgs/applications/editors/micro/default.nix | 2 +- pkgs/applications/editors/mindforger/default.nix | 2 +- pkgs/applications/editors/moe/default.nix | 4 ++-- .../applications/editors/monodevelop/default.nix | 4 ++-- .../editors/music/tuxguitar/default.nix | 4 ++-- pkgs/applications/editors/nano/default.nix | 4 ++-- .../applications/editors/nano/nanorc/default.nix | 2 +- pkgs/applications/editors/ne/default.nix | 2 +- pkgs/applications/editors/nedit/default.nix | 4 ++-- pkgs/applications/editors/neovim/default.nix | 2 +- pkgs/applications/editors/okteta/default.nix | 4 ++-- pkgs/applications/editors/scite/default.nix | 2 +- pkgs/applications/editors/sigil/default.nix | 2 +- .../editors/supertux-editor/default.nix | 2 +- pkgs/applications/editors/tecoc/default.nix | 6 +++--- pkgs/applications/editors/texmaker/default.nix | 3 +-- pkgs/applications/editors/texstudio/default.nix | 1 - pkgs/applications/editors/textadept/default.nix | 2 +- pkgs/applications/editors/texworks/default.nix | 2 +- pkgs/applications/editors/tweak/default.nix | 4 ++-- pkgs/applications/editors/uemacs/default.nix | 2 +- pkgs/applications/editors/vbindiff/default.nix | 4 ++-- pkgs/applications/editors/vim/configurable.nix | 2 +- pkgs/applications/editors/vim/default.nix | 2 +- pkgs/applications/editors/vim/macvim.nix | 2 +- pkgs/applications/editors/vis/default.nix | 2 +- pkgs/applications/editors/wily/default.nix | 4 ++-- .../applications/editors/wxhexeditor/default.nix | 2 +- .../editors/xmlcopyeditor/default.nix | 6 +++--- pkgs/applications/editors/yi/wrapper.nix | 2 +- .../gis/openorienteering-mapper/default.nix | 2 +- pkgs/applications/gis/saga/default.nix | 1 - pkgs/applications/graphics/ImageMagick/7.0.nix | 2 +- .../graphics/ImageMagick/default.nix | 2 +- .../graphics/PythonMagick/default.nix | 2 +- pkgs/applications/graphics/ahoviewer/default.nix | 2 +- pkgs/applications/graphics/alchemy/default.nix | 2 +- pkgs/applications/graphics/animbar/default.nix | 3 +-- pkgs/applications/graphics/antimony/default.nix | 2 +- pkgs/applications/graphics/apitrace/default.nix | 2 +- pkgs/applications/graphics/autotrace/default.nix | 4 ++-- pkgs/applications/graphics/avocode/default.nix | 2 +- pkgs/applications/graphics/c3d/default.nix | 1 - pkgs/applications/graphics/darktable/default.nix | 2 +- pkgs/applications/graphics/deskew/default.nix | 2 +- pkgs/applications/graphics/dia/default.nix | 2 +- pkgs/applications/graphics/djview/default.nix | 4 ++-- pkgs/applications/graphics/drawpile/default.nix | 2 +- pkgs/applications/graphics/exrtools/default.nix | 4 ++-- pkgs/applications/graphics/feh/default.nix | 4 ++-- .../applications/graphics/fontmatrix/default.nix | 2 +- pkgs/applications/graphics/freecad/default.nix | 2 +- pkgs/applications/graphics/fstl/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 4 ++-- pkgs/applications/graphics/giv/default.nix | 2 +- pkgs/applications/graphics/gnuclad/default.nix | 4 ++-- pkgs/applications/graphics/goxel/default.nix | 2 +- pkgs/applications/graphics/grafx2/default.nix | 4 ++-- .../graphics/graphicsmagick/compat.nix | 2 +- .../graphics/graphicsmagick/default.nix | 2 +- pkgs/applications/graphics/imagej/default.nix | 2 +- .../graphics/imlibsetroot/default.nix | 2 +- pkgs/applications/graphics/imv/default.nix | 2 +- pkgs/applications/graphics/jbrout/default.nix | 2 +- .../graphics/jpeg-archive/default.nix | 2 +- pkgs/applications/graphics/jpeginfo/default.nix | 4 ++-- pkgs/applications/graphics/jpegoptim/default.nix | 4 ++-- pkgs/applications/graphics/k3d/default.nix | 4 ++-- .../graphics/kgraphviewer/default.nix | 4 ++-- pkgs/applications/graphics/leocad/default.nix | 2 +- pkgs/applications/graphics/meme/default.nix | 2 +- pkgs/applications/graphics/mirage/default.nix | 4 ++-- pkgs/applications/graphics/mozjpeg/default.nix | 2 +- pkgs/applications/graphics/mypaint/default.nix | 2 +- pkgs/applications/graphics/nomacs/default.nix | 2 +- pkgs/applications/graphics/paraview/default.nix | 2 +- pkgs/applications/graphics/pbrt/default.nix | 2 +- pkgs/applications/graphics/pencil/default.nix | 2 +- .../applications/graphics/phototonic/default.nix | 2 +- pkgs/applications/graphics/potrace/default.nix | 2 +- pkgs/applications/graphics/pqiv/default.nix | 2 +- .../graphics/processing3/default.nix | 12 ++++++------ .../applications/graphics/qcomicbook/default.nix | 2 +- pkgs/applications/graphics/qiv/default.nix | 4 ++-- pkgs/applications/graphics/rapcad/default.nix | 2 +- pkgs/applications/graphics/renderdoc/default.nix | 2 +- .../graphics/sane/backends/dsseries/default.nix | 6 +++--- pkgs/applications/graphics/sane/frontends.nix | 4 ++-- .../graphics/scantailor/advanced.nix | 2 +- .../graphics/screencloud/default.nix | 2 +- pkgs/applications/graphics/swingsane/default.nix | 2 +- .../graphics/tesseract/tesseract3.nix | 2 +- .../graphics/tesseract/tesseract4.nix | 2 +- .../graphics/timelapse-deflicker/default.nix | 2 +- pkgs/applications/graphics/viewnior/default.nix | 4 ++-- .../graphics/write_stylus/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 4 ++-- pkgs/applications/graphics/xfractint/default.nix | 1 - pkgs/applications/graphics/xournalpp/default.nix | 2 +- pkgs/applications/graphics/xzgv/default.nix | 2 +- pkgs/applications/graphics/yacreader/default.nix | 4 ++-- pkgs/applications/graphics/yed/default.nix | 4 ++-- pkgs/applications/graphics/zgrviewer/default.nix | 3 +-- pkgs/applications/graphics/zgv/default.nix | 4 ++-- pkgs/applications/misc/airtame/default.nix | 1 - pkgs/applications/misc/aminal/default.nix | 2 +- pkgs/applications/misc/ape/clex.nix | 2 +- pkgs/applications/misc/apvlv/default.nix | 2 +- pkgs/applications/misc/artha/default.nix | 2 +- pkgs/applications/misc/autospotting/default.nix | 2 +- pkgs/applications/misc/batti/default.nix | 4 ++-- pkgs/applications/misc/bb/default.nix | 4 ++-- pkgs/applications/misc/bibletime/default.nix | 4 ++-- pkgs/applications/misc/calcurse/default.nix | 4 ++-- pkgs/applications/misc/calibre/default.nix | 4 ++-- pkgs/applications/misc/candle/default.nix | 2 +- pkgs/applications/misc/cataract/build.nix | 2 +- pkgs/applications/misc/cdrtools/default.nix | 4 ++-- pkgs/applications/misc/cgminer/default.nix | 2 +- pkgs/applications/misc/cheat/default.nix | 1 - pkgs/applications/misc/cherrytree/default.nix | 4 ++-- .../applications/misc/cli-visualizer/default.nix | 2 +- pkgs/applications/misc/clipit/default.nix | 4 ++-- pkgs/applications/misc/clipmenu/default.nix | 2 +- .../misc/cool-retro-term/default.nix | 2 +- pkgs/applications/misc/copyq/default.nix | 2 +- pkgs/applications/misc/cpp-ethereum/default.nix | 2 +- pkgs/applications/misc/ctodo/default.nix | 2 +- .../misc/cura/lulzbot/curaengine.nix | 2 +- pkgs/applications/misc/curabydagoma/default.nix | 2 +- pkgs/applications/misc/curaengine/default.nix | 2 +- pkgs/applications/misc/dbeaver/default.nix | 2 +- pkgs/applications/misc/ddgr/default.nix | 2 +- pkgs/applications/misc/deco/default.nix | 1 - pkgs/applications/misc/devilspie2/default.nix | 2 +- pkgs/applications/misc/diff-pdf/default.nix | 2 +- pkgs/applications/misc/diffpdf/default.nix | 10 +++++----- pkgs/applications/misc/digitalbitbox/default.nix | 2 +- pkgs/applications/misc/direwolf/default.nix | 2 +- pkgs/applications/misc/doomseeker/default.nix | 2 +- pkgs/applications/misc/dotfiles/default.nix | 1 - pkgs/applications/misc/dozenal/default.nix | 2 +- pkgs/applications/misc/eaglemode/default.nix | 4 ++-- pkgs/applications/misc/emem/default.nix | 1 - pkgs/applications/misc/epdfview/default.nix | 2 +- pkgs/applications/misc/et/default.nix | 2 +- pkgs/applications/misc/eterm/default.nix | 2 +- pkgs/applications/misc/eureka-editor/default.nix | 2 +- pkgs/applications/misc/evilvte/default.nix | 2 +- pkgs/applications/misc/exercism/default.nix | 2 +- pkgs/applications/misc/extract_url/default.nix | 2 +- pkgs/applications/misc/flamerobin/default.nix | 2 +- pkgs/applications/misc/fme/default.nix | 2 +- pkgs/applications/misc/freemind/default.nix | 2 +- pkgs/applications/misc/gImageReader/default.nix | 2 +- pkgs/applications/misc/galculator/default.nix | 2 +- pkgs/applications/misc/gammu/default.nix | 2 +- .../misc/ganttproject-bin/default.nix | 2 +- pkgs/applications/misc/gcal/default.nix | 4 ++-- pkgs/applications/misc/getxbook/default.nix | 4 ++-- pkgs/applications/misc/gksu/default.nix | 3 +-- pkgs/applications/misc/glava/default.nix | 2 +- pkgs/applications/misc/go-jira/default.nix | 2 +- .../applications/misc/golden-cheetah/default.nix | 4 ++-- pkgs/applications/misc/gollum/default.nix | 3 +-- pkgs/applications/misc/googler/default.nix | 2 +- pkgs/applications/misc/gphoto2/gphotofs.nix | 2 +- pkgs/applications/misc/gpsbabel/default.nix | 2 +- pkgs/applications/misc/gpsprune/default.nix | 2 +- pkgs/applications/misc/gpx-viewer/default.nix | 4 ++-- pkgs/applications/misc/gpx/default.nix | 2 +- pkgs/applications/misc/gramps/default.nix | 4 ++-- .../misc/green-pdfviewer/default.nix | 2 +- .../misc/gremlin-console/default.nix | 2 +- pkgs/applications/misc/gsimplecal/default.nix | 2 +- pkgs/applications/misc/gtk2fontsel/default.nix | 4 ++-- pkgs/applications/misc/gummi/default.nix | 2 +- pkgs/applications/misc/gxmessage/default.nix | 4 ++-- pkgs/applications/misc/hdate/default.nix | 2 +- pkgs/applications/misc/hello-unfree/default.nix | 2 +- pkgs/applications/misc/hello/default.nix | 4 ++-- pkgs/applications/misc/hivemind/default.nix | 2 +- pkgs/applications/misc/houdini/runtime.nix | 2 +- pkgs/applications/misc/hr/default.nix | 2 +- pkgs/applications/misc/hstr/default.nix | 2 +- pkgs/applications/misc/hugo/default.nix | 2 +- pkgs/applications/misc/hyper/default.nix | 2 +- pkgs/applications/misc/icesl/default.nix | 2 +- pkgs/applications/misc/ipmicfg/default.nix | 2 +- pkgs/applications/misc/ipmiview/default.nix | 2 +- pkgs/applications/misc/iterm2/default.nix | 2 +- pkgs/applications/misc/jbidwatcher/default.nix | 2 -- pkgs/applications/misc/josm/default.nix | 2 +- pkgs/applications/misc/jp2a/default.nix | 2 +- pkgs/applications/misc/k2pdfopt/default.nix | 2 +- pkgs/applications/misc/kanboard/default.nix | 2 +- pkgs/applications/misc/kdbplus/default.nix | 4 ++-- pkgs/applications/misc/keepassx/2.0.nix | 2 +- pkgs/applications/misc/keepassx/community.nix | 2 +- pkgs/applications/misc/keepassx/default.nix | 4 ++-- pkgs/applications/misc/khard/default.nix | 2 +- pkgs/applications/misc/kiwix/default.nix | 10 +++++----- pkgs/applications/misc/latte-dock/default.nix | 5 ++--- pkgs/applications/misc/lenmus/default.nix | 2 +- pkgs/applications/misc/libosmocore/default.nix | 2 +- pkgs/applications/misc/librecad/default.nix | 4 ++-- pkgs/applications/misc/lilyterm/default.nix | 2 +- pkgs/applications/misc/llpp/default.nix | 2 +- pkgs/applications/misc/ltwheelconf/default.nix | 1 - pkgs/applications/misc/lutris/default.nix | 2 +- pkgs/applications/misc/lyx/default.nix | 4 ++-- pkgs/applications/misc/madonctl/default.nix | 2 +- pkgs/applications/misc/makeself/default.nix | 10 +++++----- pkgs/applications/misc/mdp/default.nix | 2 +- pkgs/applications/misc/mediainfo-gui/default.nix | 2 +- pkgs/applications/misc/mediainfo/default.nix | 2 +- pkgs/applications/misc/megasync/default.nix | 2 +- pkgs/applications/misc/memo/default.nix | 2 +- pkgs/applications/misc/menumaker/default.nix | 4 ++-- pkgs/applications/misc/merkaartor/default.nix | 2 +- pkgs/applications/misc/metamorphose2/default.nix | 2 +- pkgs/applications/misc/milu/default.nix | 2 +- pkgs/applications/misc/minergate-cli/default.nix | 2 +- pkgs/applications/misc/minergate/default.nix | 2 +- pkgs/applications/misc/mlterm/default.nix | 4 ++-- .../misc/moonlight-embedded/default.nix | 2 +- pkgs/applications/misc/mop/default.nix | 2 +- pkgs/applications/misc/mqtt-bench/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 4 ++-- pkgs/applications/misc/mwic/default.nix | 4 ++-- .../misc/mysql-workbench/default.nix | 1 - pkgs/applications/misc/mystem/default.nix | 4 ++-- pkgs/applications/misc/nanoblogger/default.nix | 4 ++-- pkgs/applications/misc/navit/default.nix | 2 +- pkgs/applications/misc/neap/default.nix | 2 +- .../misc/netsurf/browser/default.nix | 2 +- .../misc/netsurf/buildsystem/default.nix | 2 +- .../misc/netsurf/nsgenbind/default.nix | 2 +- pkgs/applications/misc/nix-tour/default.nix | 2 +- pkgs/applications/misc/nixnote2/default.nix | 2 +- pkgs/applications/misc/noice/default.nix | 2 +- .../misc/notify-osd-customizable/default.nix | 2 +- pkgs/applications/misc/notify-osd/default.nix | 2 +- pkgs/applications/misc/ola/default.nix | 2 +- pkgs/applications/misc/oneko/default.nix | 2 +- pkgs/applications/misc/openbox-menu/default.nix | 4 ++-- pkgs/applications/misc/opencpn/default.nix | 2 +- pkgs/applications/misc/orpie/default.nix | 4 ++-- pkgs/applications/misc/osm2xmap/default.nix | 2 +- pkgs/applications/misc/osmctools/default.nix | 2 +- pkgs/applications/misc/osmium-tool/default.nix | 2 +- pkgs/applications/misc/pcmanx-gtk2/default.nix | 2 +- pkgs/applications/misc/pdf-quench/default.nix | 2 +- pkgs/applications/misc/pell/default.nix | 1 - pkgs/applications/misc/pgadmin/default.nix | 2 +- pkgs/applications/misc/pgmanage/default.nix | 2 +- pkgs/applications/misc/phwmon/default.nix | 2 +- .../plasma-applet-volumewin7mixer/default.nix | 2 +- pkgs/applications/misc/plover/default.nix | 4 ++-- pkgs/applications/misc/pmenu/default.nix | 2 +- .../misc/polar-bookshelf/default.nix | 2 +- pkgs/applications/misc/projectlibre/default.nix | 2 +- pkgs/applications/misc/prusa-slicer/default.nix | 2 +- pkgs/applications/misc/qlandkartegt/default.nix | 4 ++-- .../applications/misc/qlandkartegt/garmindev.nix | 4 ++-- pkgs/applications/misc/qlcplus/default.nix | 2 +- pkgs/applications/misc/qmapshack/default.nix | 4 ++-- pkgs/applications/misc/qolibri/default.nix | 2 +- .../applications/misc/qsyncthingtray/default.nix | 2 +- pkgs/applications/misc/quicksynergy/default.nix | 2 +- .../misc/redis-desktop-manager/default.nix | 2 +- pkgs/applications/misc/redshift/default.nix | 2 +- pkgs/applications/misc/regextester/default.nix | 2 +- pkgs/applications/misc/robo3t/default.nix | 2 +- pkgs/applications/misc/robomongo/default.nix | 2 +- pkgs/applications/misc/rxvt/default.nix | 4 ++-- .../default.nix | 2 +- .../rxvt_unicode-plugins/urxvt-perls/default.nix | 2 +- .../urxvt-tabbedex/default.nix | 2 +- pkgs/applications/misc/safeeyes/default.nix | 1 - pkgs/applications/misc/sakura/default.nix | 4 ++-- pkgs/applications/misc/sc-im/default.nix | 2 +- pkgs/applications/misc/sdcv/default.nix | 2 +- pkgs/applications/misc/sequelpro/default.nix | 2 +- pkgs/applications/misc/slade/default.nix | 2 +- pkgs/applications/misc/slic3r/default.nix | 2 +- pkgs/applications/misc/slstatus/default.nix | 2 +- pkgs/applications/misc/spacefm/default.nix | 2 +- pkgs/applications/misc/sqliteman/default.nix | 2 +- pkgs/applications/misc/ssocr/default.nix | 2 +- pkgs/applications/misc/stog/default.nix | 2 +- pkgs/applications/misc/styx/default.nix | 2 +- pkgs/applications/misc/subsurface/default.nix | 2 +- .../applications/misc/syncthing-tray/default.nix | 2 +- pkgs/applications/misc/synergy/default.nix | 2 +- pkgs/applications/misc/tabula/default.nix | 2 +- pkgs/applications/misc/tasknc/default.nix | 2 +- pkgs/applications/misc/tasksh/default.nix | 4 ++-- pkgs/applications/misc/taskwarrior/default.nix | 2 +- pkgs/applications/misc/termdown/default.nix | 2 +- .../misc/terminal-notifier/default.nix | 2 +- .../misc/terminal-parrot/default.nix | 2 +- pkgs/applications/misc/terminus/default.nix | 2 +- pkgs/applications/misc/termite/default.nix | 2 +- pkgs/applications/misc/tilda/default.nix | 4 ++-- pkgs/applications/misc/timewarrior/default.nix | 2 +- pkgs/applications/misc/tint2/default.nix | 2 +- pkgs/applications/misc/tnef/default.nix | 2 +- pkgs/applications/misc/todoist/default.nix | 2 +- pkgs/applications/misc/todolist/default.nix | 2 +- pkgs/applications/misc/toggldesktop/default.nix | 6 +++--- pkgs/applications/misc/topydo/default.nix | 1 - pkgs/applications/misc/tpmmanager/default.nix | 2 +- pkgs/applications/misc/tthsum/default.nix | 2 +- pkgs/applications/misc/usync/default.nix | 1 - pkgs/applications/misc/valentina/default.nix | 2 +- pkgs/applications/misc/vcal/default.nix | 2 +- pkgs/applications/misc/veracrypt/default.nix | 1 - pkgs/applications/misc/verbiste/default.nix | 4 ++-- pkgs/applications/misc/viking/default.nix | 2 +- pkgs/applications/misc/visidata/default.nix | 1 - pkgs/applications/misc/volnoti/default.nix | 2 +- pkgs/applications/misc/vp/default.nix | 2 +- pkgs/applications/misc/vue/default.nix | 2 +- pkgs/applications/misc/vym/default.nix | 4 ++-- pkgs/applications/misc/wcalc/default.nix | 4 ++-- pkgs/applications/misc/weather/default.nix | 4 ++-- pkgs/applications/misc/wego/default.nix | 2 +- pkgs/applications/misc/wikicurses/default.nix | 2 +- pkgs/applications/misc/wordnet/default.nix | 2 +- pkgs/applications/misc/worker/default.nix | 4 ++-- pkgs/applications/misc/workrave/default.nix | 2 +- pkgs/applications/misc/xautoclick/default.nix | 2 +- pkgs/applications/misc/xca/default.nix | 2 +- pkgs/applications/misc/xdgmenumaker/default.nix | 2 +- pkgs/applications/misc/xiphos/default.nix | 2 +- pkgs/applications/misc/xkbd/default.nix | 4 ++-- .../misc/xkblayout-state/default.nix | 1 - pkgs/applications/misc/xkbmon/default.nix | 2 +- pkgs/applications/misc/xmind/default.nix | 4 ++-- pkgs/applications/misc/xmrig/default.nix | 2 +- pkgs/applications/misc/xmrig/proxy.nix | 2 +- pkgs/applications/misc/xneur/default.nix | 2 +- pkgs/applications/misc/xpad/default.nix | 2 +- .../misc/xrandr-invert-colors/default.nix | 2 +- pkgs/applications/misc/xscope/default.nix | 3 +-- pkgs/applications/misc/xsuspender/default.nix | 2 +- pkgs/applications/misc/xsw/default.nix | 2 +- pkgs/applications/misc/xteddy/default.nix | 2 +- pkgs/applications/misc/xtermcontrol/default.nix | 2 +- pkgs/applications/misc/yaft/default.nix | 2 +- pkgs/applications/misc/yakuake/default.nix | 3 +-- pkgs/applications/misc/yarssr/default.nix | 2 +- pkgs/applications/misc/yate/default.nix | 4 ++-- pkgs/applications/misc/zathura/cb/default.nix | 4 ++-- pkgs/applications/misc/zathura/core/default.nix | 2 +- .../misc/zathura/pdf-mupdf/default.nix | 2 +- .../misc/zathura/pdf-poppler/default.nix | 4 ++-- .../apache-directory-studio/default.nix | 2 +- pkgs/applications/networking/brig/default.nix | 2 +- .../networking/browsers/arora/default.nix | 2 +- .../networking/browsers/browsh/default.nix | 2 +- .../networking/browsers/chromium/plugins.nix | 2 +- .../networking/browsers/dillo/default.nix | 4 ++-- .../networking/browsers/falkon/default.nix | 2 +- .../networking/browsers/links2/default.nix | 2 +- .../networking/browsers/lynx/default.nix | 2 +- .../mozilla-plugins/bluejeans/default.nix | 2 +- .../esteidfirefoxplugin/default.nix | 2 +- .../mozilla-plugins/flashplayer/default.nix | 2 +- .../mozilla-plugins/flashplayer/standalone.nix | 2 +- .../browsers/mozilla-plugins/fribid/default.nix | 4 ++-- .../google-talk-plugin/default.nix | 2 +- .../mozilla-plugins/mozplugger/default.nix | 6 +++--- .../networking/browsers/qtchan/default.nix | 2 +- .../networking/browsers/surf/default.nix | 2 +- .../browsers/tor-browser-bundle-bin/default.nix | 2 +- .../browsers/tor-browser-bundle/default.nix | 2 +- .../browsers/tor-browser-bundle/extensions.nix | 8 ++++---- .../networking/browsers/uzbl/default.nix | 2 +- .../networking/browsers/vimb/default.nix | 2 +- .../networking/browsers/vimprobable2/default.nix | 2 +- pkgs/applications/networking/c14/default.nix | 2 +- pkgs/applications/networking/charles/default.nix | 2 +- .../networking/cloudflared/default.nix | 2 +- .../networking/cluster/argo/default.nix | 2 +- .../networking/cluster/chronos/default.nix | 6 +++--- .../cluster/docker-machine/default.nix | 2 +- .../networking/cluster/docker-machine/kvm.nix | 2 +- .../networking/cluster/docker-machine/kvm2.nix | 1 - .../networking/cluster/docker-machine/xhyve.nix | 2 +- .../networking/cluster/helm/default.nix | 2 +- .../networking/cluster/heptio-ark/default.nix | 2 +- .../networking/cluster/hetzner-kube/default.nix | 2 +- .../networking/cluster/kanif/default.nix | 4 ++-- .../networking/cluster/kompose/default.nix | 2 +- .../networking/cluster/kontemplate/default.nix | 2 +- .../networking/cluster/kubernetes/default.nix | 2 +- .../networking/cluster/kubetail/default.nix | 2 +- .../networking/cluster/kubeval/default.nix | 2 +- .../networking/cluster/marathon/default.nix | 6 +++--- .../networking/cluster/mesos/default.nix | 4 ++-- .../networking/cluster/minishift/default.nix | 2 +- .../networking/cluster/nomad/default.nix | 2 +- .../networking/cluster/openshift/default.nix | 2 +- .../networking/cluster/pachyderm/default.nix | 2 +- .../networking/cluster/ssm-agent/default.nix | 1 - .../networking/cluster/stern/default.nix | 2 +- .../networking/cluster/taktuk/default.nix | 4 ++-- .../cluster/terraform-docs/default.nix | 1 - .../cluster/terraform-inventory/default.nix | 2 +- .../terraform-providers/ansible/default.nix | 2 +- .../elasticsearch/default.nix | 2 +- .../terraform-providers/gandi/default.nix | 2 +- .../cluster/terraform-providers/ibm/default.nix | 2 +- .../terraform-providers/libvirt/default.nix | 2 +- .../networking/cluster/terragrunt/default.nix | 2 +- .../applications/networking/corebird/default.nix | 2 +- pkgs/applications/networking/drive/default.nix | 2 +- pkgs/applications/networking/droopy/default.nix | 2 +- pkgs/applications/networking/errbot/default.nix | 4 ++-- .../networking/feedreaders/rss2email/default.nix | 3 +-- .../networking/feedreaders/rssguard/default.nix | 1 - .../networking/feedreaders/rsstail/default.nix | 2 +- pkgs/applications/networking/firehol/default.nix | 2 +- pkgs/applications/networking/firehol/iprange.nix | 2 +- .../applications/networking/ftp/taxi/default.nix | 2 -- pkgs/applications/networking/gdrive/default.nix | 2 +- .../google-drive-ocamlfuse/default.nix | 2 +- .../networking/gopher/gopher/default.nix | 2 +- .../networking/gopher/gopherclient/default.nix | 2 +- .../networking/ids/snort/default.nix | 6 +++--- .../instant-messengers/SkypeExport/default.nix | 2 +- .../instant-messengers/baresip/default.nix | 2 +- .../bitlbee-discord/default.nix | 2 +- .../bitlbee-facebook/default.nix | 2 +- .../instant-messengers/bitlbee-steam/default.nix | 2 +- .../instant-messengers/blink/default.nix | 2 +- .../instant-messengers/bluejeans/default.nix | 2 +- .../instant-messengers/centerim/default.nix | 4 ++-- .../instant-messengers/coyim/default.nix | 2 +- .../instant-messengers/freetalk/default.nix | 2 +- .../instant-messengers/gitter/default.nix | 1 - .../instant-messengers/jackline/default.nix | 2 +- .../instant-messengers/jitsi/default.nix | 2 +- .../mattermost-desktop/default.nix | 6 +++--- .../instant-messengers/mcabber/default.nix | 2 +- .../instant-messengers/mikutter/default.nix | 2 +- .../networking/instant-messengers/mm/default.nix | 2 +- .../instant-messengers/nheko/default.nix | 2 +- .../instant-messengers/oysttyer/default.nix | 2 +- .../pidgin-plugins/carbons/default.nix | 2 +- .../pidgin-opensteamworks/default.nix | 2 +- .../pidgin-plugins/pidgin-skypeweb/default.nix | 2 +- .../pidgin-plugins/purple-discord/default.nix | 2 +- .../pidgin-plugins/purple-hangouts/default.nix | 2 +- .../pidgin-plugins/purple-lurch/default.nix | 2 +- .../pidgin-plugins/tox-prpl/default.nix | 2 +- .../pidgin-plugins/window-merge/default.nix | 2 +- .../instant-messengers/pidgin/default.nix | 4 ++-- .../instant-messengers/pond/default.nix | 2 +- .../instant-messengers/profanity/default.nix | 2 +- .../instant-messengers/psi-plus/default.nix | 2 +- .../instant-messengers/rambox/bare.nix | 2 +- .../instant-messengers/rambox/sencha/bare.nix | 2 +- .../instant-messengers/ricochet/default.nix | 2 +- .../instant-messengers/ring-daemon/default.nix | 2 +- .../instant-messengers/ring-daemon/restbed.nix | 2 +- .../instant-messengers/riot/riot-web.nix | 2 +- .../instant-messengers/signal-cli/default.nix | 2 +- .../signal-desktop/default.nix | 2 +- .../instant-messengers/sky/default.nix | 2 +- .../instant-messengers/slack-term/default.nix | 2 +- .../instant-messengers/slack/dark-theme.nix | 2 +- .../instant-messengers/stride/default.nix | 2 +- .../instant-messengers/swift-im/default.nix | 2 +- .../instant-messengers/teamspeak/client.nix | 2 +- .../telegram/tdesktop/default.nix | 2 +- .../telepathy/idle/default.nix | 3 +-- .../instant-messengers/tensor/default.nix | 2 +- .../instant-messengers/torchat/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- .../instant-messengers/utox/default.nix | 2 +- .../instant-messengers/vacuum/default.nix | 2 +- .../instant-messengers/viber/default.nix | 2 +- .../instant-messengers/xmpp-client/default.nix | 2 +- pkgs/applications/networking/insync/default.nix | 4 ++-- .../networking/ipfs-cluster/default.nix | 4 ++-- .../networking/ipfs-migrator/default.nix | 2 +- pkgs/applications/networking/ipget/default.nix | 4 ++-- .../networking/iptraf-ng/default.nix | 4 ++-- pkgs/applications/networking/irc/bip/default.nix | 2 +- .../networking/irc/communi/default.nix | 2 +- .../networking/irc/epic5/default.nix | 4 ++-- .../networking/irc/glowing-bear/default.nix | 2 +- .../networking/irc/hexchat/default.nix | 2 +- .../networking/irc/irssi/default.nix | 4 ++-- .../networking/irc/irssi/otr/default.nix | 2 +- pkgs/applications/networking/irc/sic/default.nix | 2 +- .../networking/irc/weechat/default.nix | 2 +- .../irc/weechat/scripts/wee-slack/default.nix | 2 +- .../networking/irc/wraith/default.nix | 2 +- pkgs/applications/networking/jmeter/default.nix | 4 ++-- pkgs/applications/networking/jnetmap/default.nix | 2 +- pkgs/applications/networking/linssid/default.nix | 2 +- .../networking/mailreaders/alpine/default.nix | 4 ++-- .../networking/mailreaders/balsa/default.nix | 4 ++-- .../mailreaders/claws-mail/default.nix | 2 +- .../networking/mailreaders/imapfilter.nix | 2 +- .../networking/mailreaders/inboxer/default.nix | 2 +- .../networking/mailreaders/mailcheck/default.nix | 2 +- .../networking/mailreaders/mailnag/default.nix | 2 +- .../networking/mailreaders/mblaze/default.nix | 2 +- .../networking/mailreaders/mutt/default.nix | 4 ++-- .../networking/mailreaders/neomutt/default.nix | 2 +- .../networking/mailreaders/notbit/default.nix | 2 +- .../mailreaders/notmuch-bower/default.nix | 2 +- .../networking/mailreaders/notmuch/default.nix | 6 +++--- .../networking/mailreaders/notmuch/muchsync.nix | 4 ++-- .../networking/mailreaders/notmuch/mutt.nix | 2 +- .../networking/mailreaders/sylpheed/default.nix | 4 ++-- .../mailreaders/thunderbird/default.nix | 2 +- .../networking/mailreaders/trojita/default.nix | 4 ++-- .../networking/modem-manager-gui/default.nix | 2 +- pkgs/applications/networking/ndppd/default.nix | 2 +- pkgs/applications/networking/netperf/default.nix | 2 +- .../networking/newsreaders/quiterss/default.nix | 2 +- .../networking/nextcloud-client/default.nix | 2 +- pkgs/applications/networking/nload/default.nix | 4 ++-- .../networking/nntp-proxy/default.nix | 2 +- pkgs/applications/networking/omping/default.nix | 2 +- .../applications/networking/ostinato/default.nix | 2 +- pkgs/applications/networking/owamp/default.nix | 2 +- .../networking/owncloud-client/default.nix | 2 +- .../networking/p2p/deluge/default.nix | 4 ++-- .../networking/p2p/eiskaltdcpp/default.nix | 2 +- .../networking/p2p/frostwire/frostwire-bin.nix | 2 +- .../networking/p2p/ktorrent/default.nix | 4 ++-- .../applications/networking/p2p/ncdc/default.nix | 2 +- .../networking/p2p/qbittorrent/default.nix | 2 +- .../networking/p2p/retroshare/default.nix | 2 +- .../networking/p2p/soulseekqt/default.nix | 2 +- .../networking/p2p/tixati/default.nix | 2 +- .../p2p/transmission-remote-cli/default.nix | 2 +- .../p2p/transmission-remote-gtk/default.nix | 2 +- .../networking/p2p/tribler/default.nix | 2 +- .../networking/p2p/twister/default.nix | 2 +- .../applications/networking/p2p/vuze/default.nix | 2 +- pkgs/applications/networking/pjsip/default.nix | 6 +++--- .../networking/ps2client/default.nix | 2 +- .../networking/remote/anydesk/default.nix | 4 ++-- .../remote/citrix-receiver/default.nix | 2 +- .../remote/citrix-workspace/default.nix | 2 +- .../networking/remote/freerdp/default.nix | 2 +- .../networking/remote/putty/default.nix | 6 +++--- .../networking/remote/rdesktop/default.nix | 1 - .../networking/remote/ssvnc/default.nix | 4 ++-- .../networking/remote/teamviewer/default.nix | 2 +- .../networking/remote/xrdp/default.nix | 4 ++-- .../networking/resilio-sync/default.nix | 2 +- .../networking/seafile-client/default.nix | 2 +- .../networking/sieve-connect/default.nix | 2 +- .../networking/sniffers/ettercap/default.nix | 2 +- .../networking/sniffers/kismet/default.nix | 4 ++-- .../applications/networking/sniproxy/default.nix | 2 +- pkgs/applications/networking/soapui/default.nix | 2 +- .../networking/ssb/patchwork-classic/default.nix | 2 +- .../networking/sync/acd_cli/default.nix | 1 - .../networking/sync/backintime/common.nix | 2 +- .../networking/sync/backintime/qt4.nix | 2 +- .../networking/sync/casync/default.nix | 2 +- .../networking/sync/desync/default.nix | 2 +- .../networking/sync/lsyncd/default.nix | 2 +- .../networking/sync/rclone/browser.nix | 2 +- .../networking/sync/unison/default.nix | 2 +- .../applications/networking/syncplay/default.nix | 2 +- .../networking/syncthing-gtk/default.nix | 2 +- pkgs/applications/networking/tsung/default.nix | 2 +- pkgs/applications/networking/umurmur/default.nix | 2 +- pkgs/applications/networking/znc/default.nix | 4 ++-- pkgs/applications/office/abiword/default.nix | 4 ++-- .../office/atlassian-cli/default.nix | 4 ++-- pkgs/applications/office/calligra/default.nix | 3 +-- pkgs/applications/office/cb2bib/default.nix | 3 +-- pkgs/applications/office/gnucash/default.nix | 6 +++--- pkgs/applications/office/grisbi/default.nix | 4 ++-- .../office/ib/controller/default.nix | 2 +- pkgs/applications/office/ib/tws/default.nix | 2 +- pkgs/applications/office/jabref/default.nix | 2 +- pkgs/applications/office/kexi/default.nix | 3 +-- pkgs/applications/office/kmymoney/default.nix | 4 ++-- pkgs/applications/office/ledger/default.nix | 2 +- pkgs/applications/office/marp/default.nix | 2 +- pkgs/applications/office/moneyplex/default.nix | 2 +- pkgs/applications/office/osmo/default.nix | 4 ++-- pkgs/applications/office/paperless/default.nix | 2 +- pkgs/applications/office/pinpoint/default.nix | 4 ++-- pkgs/applications/office/skrooge/default.nix | 4 ++-- pkgs/applications/office/todoman/default.nix | 1 - pkgs/applications/office/treesheets/default.nix | 2 +- pkgs/applications/office/trilium/default.nix | 2 +- pkgs/applications/office/tudu/default.nix | 4 ++-- pkgs/applications/office/wordgrinder/default.nix | 2 +- pkgs/applications/office/zanshin/default.nix | 1 - pkgs/applications/office/zotero/default.nix | 2 +- pkgs/applications/radio/cubicsdr/default.nix | 2 +- pkgs/applications/radio/dmrconfig/default.nix | 2 +- pkgs/applications/radio/fllog/default.nix | 3 +-- pkgs/applications/radio/flwrap/default.nix | 3 +-- pkgs/applications/radio/gnss-sdr/default.nix | 2 +- pkgs/applications/radio/gnuradio/ais.nix | 2 +- pkgs/applications/radio/gnuradio/default.nix | 2 +- pkgs/applications/radio/gnuradio/gsm.nix | 2 +- pkgs/applications/radio/gnuradio/nacl.nix | 2 +- pkgs/applications/radio/gnuradio/osmosdr.nix | 2 +- pkgs/applications/radio/gnuradio/rds.nix | 2 +- pkgs/applications/radio/gqrx/default.nix | 2 +- pkgs/applications/radio/hackrf/default.nix | 2 +- pkgs/applications/radio/minimodem/default.nix | 1 - pkgs/applications/radio/qsstv/default.nix | 2 +- pkgs/applications/radio/rtl-sdr/default.nix | 2 +- pkgs/applications/radio/rtl_433/default.nix | 2 +- pkgs/applications/radio/unixcw/default.nix | 2 +- pkgs/applications/radio/wsjtx/default.nix | 2 +- .../astronomy/astrolabe-generator/default.nix | 2 +- .../science/astronomy/gildas/default.nix | 2 +- .../science/astronomy/openspace/default.nix | 2 +- .../science/astronomy/stellarium/default.nix | 2 +- .../science/astronomy/xearth/default.nix | 4 ++-- .../science/biology/bcftools/default.nix | 3 +-- .../science/biology/bedtools/default.nix | 2 +- .../science/biology/bftools/default.nix | 2 +- .../science/biology/bowtie2/default.nix | 1 - .../applications/science/biology/bwa/default.nix | 4 ++-- .../science/biology/clustal-omega/default.nix | 4 ++-- .../science/biology/dcm2niix/default.nix | 2 +- .../science/biology/freebayes/default.nix | 2 +- .../science/biology/hisat2/default.nix | 2 +- .../science/biology/hmmer/default.nix | 4 ++-- .../applications/science/biology/igv/default.nix | 2 +- .../science/biology/itsx/default.nix | 2 +- .../science/biology/kallisto/default.nix | 2 +- .../science/biology/messer-slim/default.nix | 2 +- .../science/biology/minimap2/default.nix | 1 - .../science/biology/mosdepth/default.nix | 2 +- .../science/biology/neuron/default.nix | 2 +- .../science/biology/niftyreg/default.nix | 1 - .../science/biology/niftyseg/default.nix | 1 - .../science/biology/octopus/default.nix | 1 - .../science/biology/paml/default.nix | 2 +- .../science/biology/picard-tools/default.nix | 2 +- .../science/biology/platypus/default.nix | 2 +- .../science/biology/plink-ng/default.nix | 2 +- .../science/biology/poretools/default.nix | 1 - .../science/biology/raxml/default.nix | 1 - .../science/biology/samtools/default.nix | 3 +-- .../science/biology/samtools/samtools_0_1_19.nix | 3 +-- .../science/biology/seaview/default.nix | 2 +- .../science/biology/snpeff/default.nix | 2 +- .../science/biology/somatic-sniper/default.nix | 2 +- .../science/biology/strelka/default.nix | 2 +- .../science/biology/varscan/default.nix | 2 +- .../science/biology/vcftools/default.nix | 1 - .../science/chemistry/marvin/default.nix | 1 - .../science/chemistry/molden/default.nix | 2 +- .../chemistry/quantum-espresso/default.nix | 2 +- .../science/chemistry/siesta/default.nix | 2 +- .../science/electronics/adms/default.nix | 2 +- .../science/electronics/alliance/default.nix | 4 ++-- .../science/electronics/caneda/default.nix | 2 +- .../science/electronics/dsview/default.nix | 2 +- .../science/electronics/dsview/libsigrok4dsl.nix | 2 +- .../electronics/dsview/libsigrokdecode4dsl.nix | 2 +- .../science/electronics/eagle/eagle.nix | 2 +- .../science/electronics/eagle/eagle7.nix | 2 +- .../science/electronics/fped/default.nix | 2 +- .../science/electronics/fritzing/default.nix | 2 +- .../science/electronics/geda/default.nix | 2 +- .../science/electronics/gerbv/default.nix | 2 +- .../science/electronics/gtkwave/default.nix | 4 ++-- .../science/electronics/kicad/default.nix | 2 +- .../science/electronics/kicad/unstable.nix | 2 +- .../science/electronics/librepcb/default.nix | 2 +- .../science/electronics/ngspice/default.nix | 2 +- .../science/electronics/pcb/default.nix | 4 ++-- .../science/electronics/qucs/default.nix | 2 +- .../science/electronics/verilator/default.nix | 4 ++-- .../science/geometry/drgeo/default.nix | 4 ++-- pkgs/applications/science/logic/abc/default.nix | 2 +- .../science/logic/abella/default.nix | 4 ++-- .../applications/science/logic/aiger/default.nix | 4 ++-- .../science/logic/alt-ergo/default.nix | 6 +++--- pkgs/applications/science/logic/avy/default.nix | 2 +- .../science/logic/boolector/default.nix | 2 +- .../science/logic/btor2tools/default.nix | 2 +- .../science/logic/clprover/clprover.nix | 2 +- .../science/logic/cryptominisat/default.nix | 2 +- .../science/logic/cryptoverif/default.nix | 2 +- .../science/logic/cubicle/default.nix | 2 +- pkgs/applications/science/logic/cvc3/default.nix | 4 ++-- pkgs/applications/science/logic/cvc4/default.nix | 2 +- .../science/logic/eprover/default.nix | 2 +- .../science/logic/glucose/default.nix | 6 +++--- .../applications/science/logic/glucose/syrup.nix | 6 +++--- .../science/logic/iprover/default.nix | 6 +++--- .../science/logic/jonprl/default.nix | 2 +- pkgs/applications/science/logic/lci/default.nix | 4 ++-- pkgs/applications/science/logic/lean/default.nix | 2 +- .../applications/science/logic/lean2/default.nix | 2 +- pkgs/applications/science/logic/leo2/default.nix | 2 +- .../science/logic/lingeling/default.nix | 2 +- .../science/logic/ltl2ba/default.nix | 4 ++-- .../applications/science/logic/mcrl2/default.nix | 2 +- .../science/logic/metis-prover/default.nix | 2 +- .../science/logic/minisat/default.nix | 4 ++-- .../science/logic/opensmt/default.nix | 2 +- pkgs/applications/science/logic/ott/default.nix | 2 +- .../science/logic/picosat/default.nix | 4 ++-- pkgs/applications/science/logic/poly/default.nix | 1 - .../science/logic/potassco/clingo.nix | 1 - .../science/logic/prooftree/default.nix | 2 +- .../science/logic/proverif/default.nix | 2 +- .../science/logic/satallax/default.nix | 4 ++-- .../science/logic/saw-tools/default.nix | 2 +- .../applications/science/logic/spass/default.nix | 2 +- .../science/logic/statverif/default.nix | 2 +- pkgs/applications/science/logic/stp/default.nix | 2 +- .../science/logic/symbiyosys/default.nix | 2 +- .../science/logic/tlaplus/default.nix | 2 +- .../applications/science/logic/tlaplus/tlaps.nix | 2 +- pkgs/applications/science/logic/tptp/default.nix | 2 +- .../applications/science/logic/twelf/default.nix | 2 +- .../science/logic/vampire/default.nix | 2 +- .../science/logic/verifast/default.nix | 4 ++-- .../applications/science/logic/verit/default.nix | 2 +- pkgs/applications/science/logic/why3/default.nix | 2 +- .../science/logic/workcraft/default.nix | 2 +- .../applications/science/logic/yices/default.nix | 2 +- .../machine-learning/sc2-headless/default.nix | 2 +- .../science/machine-learning/shogun/default.nix | 1 - pkgs/applications/science/math/LiE/default.nix | 2 +- pkgs/applications/science/math/bcal/default.nix | 2 +- pkgs/applications/science/math/bliss/default.nix | 4 ++-- pkgs/applications/science/math/caffe/default.nix | 2 +- pkgs/applications/science/math/calc/default.nix | 6 +++--- pkgs/applications/science/math/clp/default.nix | 2 +- pkgs/applications/science/math/cntk/default.nix | 2 +- .../science/math/colpack/default.nix | 1 - pkgs/applications/science/math/cplex/default.nix | 2 +- pkgs/applications/science/math/form/default.nix | 2 +- .../science/math/geogebra/default.nix | 2 +- pkgs/applications/science/math/getdp/default.nix | 2 +- pkgs/applications/science/math/gfan/default.nix | 1 - .../applications/science/math/gurobi/default.nix | 2 +- .../applications/science/math/hmetis/default.nix | 2 +- .../science/math/lp_solve/default.nix | 2 +- .../applications/science/math/lrcalc/default.nix | 1 - .../applications/science/math/mathematica/10.nix | 2 +- pkgs/applications/science/math/mxnet/default.nix | 2 +- pkgs/applications/science/math/nauty/default.nix | 2 +- pkgs/applications/science/math/pari/gp2c.nix | 4 ++-- pkgs/applications/science/math/pcalc/default.nix | 2 +- .../science/math/polymake/default.nix | 1 - .../science/math/ratpoints/default.nix | 2 +- .../science/math/sage/sage-tests.nix | 2 +- .../science/math/sage/sage-with-env.nix | 2 +- pkgs/applications/science/math/sage/sage.nix | 2 +- pkgs/applications/science/math/sage/sagedoc.nix | 2 +- pkgs/applications/science/math/sage/sagelib.nix | 2 +- .../applications/science/math/scilab/default.nix | 4 ++-- .../applications/science/math/scotch/default.nix | 2 +- .../science/math/singular/default.nix | 2 +- .../science/math/speedcrunch/default.nix | 2 +- .../science/math/symmetrica/default.nix | 2 +- pkgs/applications/science/math/weka/default.nix | 4 ++-- .../science/math/wxmaxima/default.nix | 2 +- pkgs/applications/science/math/yacas/default.nix | 2 +- pkgs/applications/science/misc/boinc/default.nix | 4 ++-- .../science/misc/cytoscape/default.nix | 4 ++-- .../science/misc/gplates/default.nix | 4 ++-- .../science/misc/netlogo/default.nix | 2 +- .../science/misc/openmvg/default.nix | 2 +- pkgs/applications/science/misc/root/5.nix | 2 +- pkgs/applications/science/misc/root/default.nix | 2 +- .../dl-poly-classic/default.nix | 2 +- .../molecular-dynamics/lammps/default.nix | 2 +- .../science/physics/quantomatic/default.nix | 2 +- .../science/physics/sacrifice/default.nix | 2 +- .../science/physics/sherpa/default.nix | 2 +- .../science/physics/xfitter/default.nix | 6 +++--- .../science/programming/plm/default.nix | 4 ++-- .../science/robotics/apmplanner2/default.nix | 2 +- .../science/robotics/gazebo/default.nix | 4 ++-- .../science/robotics/qgroundcontrol/default.nix | 2 +- .../science/robotics/yarp/default.nix | 2 +- pkgs/applications/search/grepcidr/default.nix | 4 ++-- pkgs/applications/search/grepm/default.nix | 2 +- .../version-management/bitkeeper/default.nix | 2 +- .../version-management/blackbox/default.nix | 1 - .../bugseverywhere/default.nix | 2 +- .../version-management/cvsps/default.nix | 2 +- .../version-management/diffuse/default.nix | 4 ++-- .../version-management/fossil/default.nix | 4 ++-- .../version-management/gerrit/default.nix | 2 +- .../git-and-tools/cgit/default.nix | 4 ++-- .../git-and-tools/darcs-to-git/default.nix | 2 +- .../git-and-tools/diff-so-fancy/default.nix | 2 +- .../git-and-tools/ghq/default.nix | 2 +- .../git-annex-metadata-gui/default.nix | 2 +- .../git-annex-remote-b2/default.nix | 2 +- .../git-annex-remote-rclone/default.nix | 2 +- .../git-and-tools/git-appraise/default.nix | 2 +- .../git-and-tools/git-bug/default.nix | 2 +- .../git-and-tools/git-bz/default.nix | 2 +- .../git-and-tools/git-cola/default.nix | 2 +- .../git-and-tools/git-extras/default.nix | 2 +- .../git-and-tools/git-hub/default.nix | 2 +- .../git-and-tools/git-imerge/default.nix | 2 +- .../git-and-tools/git-octopus/default.nix | 2 +- .../git-and-tools/git-open/default.nix | 2 +- .../git-and-tools/git-radar/default.nix | 2 +- .../git-and-tools/git-remote-gcrypt/default.nix | 2 +- .../git-and-tools/git-reparent/default.nix | 2 +- .../git-and-tools/git-secrets/default.nix | 2 +- .../git-and-tools/git-stree/default.nix | 2 +- .../git-and-tools/git-sync/default.nix | 2 +- .../git-and-tools/git-test/default.nix | 2 +- .../git-and-tools/gitflow/default.nix | 1 - .../git-and-tools/tig/default.nix | 3 +-- .../git-and-tools/transcrypt/default.nix | 2 +- .../version-management/git-crecord/default.nix | 2 +- .../version-management/git-lfs/1.nix | 2 +- .../version-management/git-lfs/default.nix | 2 +- .../version-management/git-repo/default.nix | 2 +- .../version-management/git-sizer/default.nix | 1 - .../version-management/gitkraken/default.nix | 2 +- .../version-management/gitlab/gitaly/default.nix | 2 +- .../gitlab/gitlab-shell/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitolite/default.nix | 2 +- .../version-management/gitstats/default.nix | 4 ++-- .../version-management/gogs/default.nix | 2 +- .../version-management/gource/default.nix | 4 ++-- .../version-management/monotone-viz/default.nix | 4 ++-- .../version-management/mr/default.nix | 2 +- .../version-management/nbstripout/default.nix | 1 - .../version-management/nitpick/default.nix | 1 - .../version-management/p4v/default.nix | 2 +- .../version-management/rapidsvn/default.nix | 4 ++-- .../version-management/src/default.nix | 4 ++-- .../version-management/srcml/default.nix | 2 +- .../version-management/vcprompt/default.nix | 2 +- .../version-management/vcsh/default.nix | 2 +- pkgs/applications/video/aegisub/default.nix | 4 ++-- pkgs/applications/video/avidemux/default.nix | 2 +- pkgs/applications/video/avxsynth/default.nix | 2 +- pkgs/applications/video/bino3d/default.nix | 4 ++-- pkgs/applications/video/bombono/default.nix | 2 +- pkgs/applications/video/bomi/default.nix | 2 +- pkgs/applications/video/byzanz/default.nix | 2 +- .../video/clickshare-csc1/default.nix | 2 +- pkgs/applications/video/clipgrab/default.nix | 4 ++-- .../applications/video/dvd-slideshow/default.nix | 4 ++-- pkgs/applications/video/dvdbackup/default.nix | 4 ++-- pkgs/applications/video/dvdstyler/default.nix | 2 +- .../applications/video/gnome-mplayer/default.nix | 2 +- pkgs/applications/video/gpac/default.nix | 2 +- pkgs/applications/video/k9copy/default.nix | 4 ++-- pkgs/applications/video/key-mon/default.nix | 4 ++-- pkgs/applications/video/kmplayer/default.nix | 2 +- pkgs/applications/video/lightworks/default.nix | 4 ++-- .../video/linuxstopmotion/default.nix | 2 +- pkgs/applications/video/mapmap/default.nix | 2 +- .../applications/video/mediathekview/default.nix | 2 +- pkgs/applications/video/minitube/default.nix | 2 +- .../applications/video/mjpg-streamer/default.nix | 2 +- pkgs/applications/video/motion/default.nix | 2 +- pkgs/applications/video/mpc-qt/default.nix | 2 +- pkgs/applications/video/mpv/default.nix | 2 +- pkgs/applications/video/mythtv/default.nix | 2 +- pkgs/applications/video/natron/default.nix | 2 +- pkgs/applications/video/obs-studio/default.nix | 2 +- .../video/obs-studio/linuxbrowser.nix | 2 +- pkgs/applications/video/pitivi/default.nix | 2 +- .../video/plex-media-player/default.nix | 2 +- pkgs/applications/video/qstopmotion/default.nix | 3 +-- pkgs/applications/video/quvi/library.nix | 2 +- pkgs/applications/video/quvi/scripts.nix | 2 +- pkgs/applications/video/quvi/tool.nix | 2 +- .../video/recordmydesktop/default.nix | 2 +- pkgs/applications/video/recordmydesktop/gtk.nix | 2 +- pkgs/applications/video/recordmydesktop/qt.nix | 2 +- pkgs/applications/video/shotcut/default.nix | 2 +- .../video/simplescreenrecorder/default.nix | 2 +- pkgs/applications/video/smtube/default.nix | 4 ++-- pkgs/applications/video/streamlink/default.nix | 2 +- pkgs/applications/video/vlc/default.nix | 4 ++-- pkgs/applications/video/w_scan/default.nix | 4 ++-- .../video/webtorrent_desktop/default.nix | 2 +- pkgs/applications/video/wxcam/default.nix | 4 ++-- pkgs/applications/video/xscast/default.nix | 2 +- .../virtualization/8086tiny/default.nix | 2 +- .../virtualization/aqemu/default.nix | 2 +- .../virtualization/bochs/default.nix | 4 ++-- .../virtualization/cbfstool/default.nix | 2 +- .../virtualization/containerd/default.nix | 2 +- .../virtualization/docker/distribution.nix | 2 +- .../virtualization/driver/win-virtio/default.nix | 2 +- .../virtualization/dynamips/default.nix | 1 - .../virtualization/ecs-agent/default.nix | 1 - .../looking-glass-client/default.nix | 2 +- .../virtualization/nvidia-docker/default.nix | 4 ++-- .../virtualization/nvidia-docker/libnvc.nix | 2 +- .../virtualization/open-vm-tools/default.nix | 2 +- .../virtualization/podman/default.nix | 2 +- .../virtualization/remotebox/default.nix | 2 +- pkgs/applications/virtualization/rkt/default.nix | 4 ++-- .../applications/virtualization/runc/default.nix | 2 +- .../virtualization/seabios/default.nix | 4 ++-- .../virtualization/singularity/default.nix | 2 +- .../applications/virtualization/tini/default.nix | 2 +- .../virtualization/tinyemu/default.nix | 4 ++-- .../virtualization/virt-manager/qt.nix | 2 +- .../virtualization/virt-top/default.nix | 2 +- .../virtualization/virt-what/default.nix | 4 ++-- .../applications/virtualization/vpcs/default.nix | 5 ++--- .../virtualization/x11docker/default.nix | 2 +- .../virtualization/xhyve/default.nix | 2 +- .../window-managers/2bwm/default.nix | 2 +- .../window-managers/afterstep/default.nix | 2 +- .../window-managers/awesome/default.nix | 2 +- .../window-managers/bevelbar/default.nix | 2 +- .../window-managers/bspwm/default.nix | 2 +- .../window-managers/btops/default.nix | 2 +- .../window-managers/fbpanel/default.nix | 4 ++-- .../window-managers/fluxbox/default.nix | 4 ++-- .../window-managers/fvwm/default.nix | 3 +-- .../window-managers/i3/blocks-gaps.nix | 2 +- pkgs/applications/window-managers/i3/blocks.nix | 2 +- pkgs/applications/window-managers/i3/default.nix | 4 ++-- .../window-managers/i3/i3ipc-glib.nix | 2 +- .../window-managers/i3/lock-color.nix | 2 +- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- .../window-managers/icewm/default.nix | 2 +- .../applications/window-managers/jwm/default.nix | 2 +- .../window-managers/jwm/jwm-settings-manager.nix | 2 +- .../window-managers/matchbox/default.nix | 2 +- .../window-managers/neocomp/default.nix | 2 +- .../window-managers/openbox/default.nix | 4 ++-- .../window-managers/oroborus/default.nix | 2 +- .../window-managers/pekwm/default.nix | 4 ++-- .../window-managers/ratpoison/default.nix | 4 ++-- .../window-managers/sawfish/default.nix | 2 +- .../window-managers/spectrwm/default.nix | 2 +- .../window-managers/stalonetray/default.nix | 4 ++-- .../window-managers/stumpish/default.nix | 1 - pkgs/applications/window-managers/sway/bg.nix | 2 +- pkgs/applications/window-managers/sway/idle.nix | 2 +- pkgs/applications/window-managers/sway/lock.nix | 2 +- .../window-managers/sxhkd/default.nix | 2 +- .../window-managers/way-cooler/wlc.nix | 2 +- .../window-managers/weston/default.nix | 4 ++-- .../window-managers/windowmaker/default.nix | 2 +- .../window-managers/wmfs/default.nix | 2 +- .../window-managers/wmii-hg/default.nix | 2 +- pkgs/build-support/templaterpm/default.nix | 2 +- pkgs/data/documentation/bgnet/default.nix | 2 +- pkgs/data/documentation/man-pages/default.nix | 4 ++-- .../data/documentation/mustache-spec/default.nix | 2 +- pkgs/data/documentation/stdman/default.nix | 2 +- pkgs/data/documentation/zeal/default.nix | 2 +- pkgs/data/fonts/dina-pcf/default.nix | 2 +- pkgs/data/fonts/dosemu-fonts/default.nix | 2 +- pkgs/data/fonts/emojione/default.nix | 2 +- pkgs/data/fonts/gohufont/default.nix | 4 ++-- pkgs/data/fonts/google-fonts/default.nix | 2 +- pkgs/data/fonts/inconsolata/default.nix | 2 +- pkgs/data/fonts/inconsolata/lgc.nix | 4 ++-- pkgs/data/fonts/input-fonts/default.nix | 2 +- pkgs/data/fonts/libre-caslon/default.nix | 6 +++--- pkgs/data/fonts/lobster-two/default.nix | 6 +++--- pkgs/data/fonts/meslo-lg/default.nix | 6 +++--- pkgs/data/fonts/migmix/default.nix | 2 +- pkgs/data/fonts/migu/default.nix | 2 +- pkgs/data/fonts/monoid/default.nix | 2 +- pkgs/data/fonts/nerdfonts/default.nix | 2 +- pkgs/data/fonts/noto-fonts/tools.nix | 2 +- pkgs/data/fonts/ricty/default.nix | 2 +- .../rictydiminished-with-firacode/default.nix | 2 +- pkgs/data/fonts/roboto-mono/default.nix | 2 +- pkgs/data/fonts/roboto-slab/default.nix | 2 +- pkgs/data/fonts/terminus-font/default.nix | 5 ++--- pkgs/data/fonts/tlwg/default.nix | 2 +- pkgs/data/fonts/ucs-fonts/default.nix | 2 +- pkgs/data/fonts/unifont/default.nix | 6 +++--- pkgs/data/fonts/unscii/default.nix | 3 +-- pkgs/data/fonts/xits-math/default.nix | 2 +- pkgs/data/icons/bibata-cursors/default.nix | 2 +- .../icons/elementary-xfce-icon-theme/default.nix | 2 +- pkgs/data/icons/faba-mono-icons/default.nix | 1 - pkgs/data/icons/iconpack-obsidian/default.nix | 2 +- pkgs/data/icons/maia-icon-theme/default.nix | 2 +- pkgs/data/icons/moka-icon-theme/default.nix | 1 - pkgs/data/icons/numix-icon-theme/default.nix | 1 - pkgs/data/icons/paper-icon-theme/default.nix | 1 - pkgs/data/icons/vanilla-dmz/default.nix | 2 +- pkgs/data/misc/combinatorial_designs/default.nix | 2 +- pkgs/data/misc/conway_polynomials/default.nix | 2 +- pkgs/data/misc/elliptic_curves/default.nix | 1 - pkgs/data/misc/geolite-legacy/default.nix | 2 +- pkgs/data/misc/graphs/default.nix | 1 - pkgs/data/misc/libkkc-data/default.nix | 3 +-- pkgs/data/misc/pari-galdata/default.nix | 2 +- pkgs/data/misc/pari-seadata-small/default.nix | 2 +- pkgs/data/misc/polytopes_db/default.nix | 1 - pkgs/data/misc/scowl/default.nix | 1 - .../misc/sound-theme-freedesktop/default.nix | 4 ++-- pkgs/data/misc/tzdata/default.nix | 2 +- pkgs/data/misc/xorg-rgb/default.nix | 1 - pkgs/data/themes/matcha/default.nix | 2 +- pkgs/data/themes/nordic-polar/default.nix | 2 +- pkgs/data/themes/nordic/default.nix | 2 +- pkgs/desktops/deepin/dbus-factory/default.nix | 3 +-- pkgs/desktops/deepin/dde-api/default.nix | 3 +-- pkgs/desktops/deepin/dde-calendar/default.nix | 3 +-- .../deepin/dde-control-center/default.nix | 3 +-- pkgs/desktops/deepin/dde-daemon/default.nix | 3 +-- pkgs/desktops/deepin/dde-dock/default.nix | 3 +-- .../desktops/deepin/dde-file-manager/default.nix | 3 +-- pkgs/desktops/deepin/dde-launcher/default.nix | 3 +-- .../deepin/dde-network-utils/default.nix | 3 +-- .../desktops/deepin/dde-polkit-agent/default.nix | 3 +-- .../deepin/dde-qt-dbus-factory/default.nix | 3 +-- pkgs/desktops/deepin/dde-session-ui/default.nix | 3 +-- pkgs/desktops/deepin/deepin-anything/default.nix | 3 +-- .../deepin/deepin-calculator/default.nix | 3 +-- .../deepin/deepin-desktop-base/default.nix | 3 +-- .../deepin/deepin-desktop-schemas/default.nix | 3 +-- .../deepin/deepin-gettext-tools/default.nix | 3 +-- .../desktops/deepin/deepin-gtk-theme/default.nix | 3 +-- .../deepin/deepin-icon-theme/default.nix | 3 +-- .../deepin/deepin-image-viewer/default.nix | 3 +-- pkgs/desktops/deepin/deepin-menu/default.nix | 3 +-- pkgs/desktops/deepin/deepin-metacity/default.nix | 3 +-- .../deepin/deepin-movie-reborn/default.nix | 3 +-- pkgs/desktops/deepin/deepin-mutter/default.nix | 3 +-- .../deepin/deepin-screenshot/default.nix | 3 +-- .../deepin/deepin-shortcut-viewer/default.nix | 3 +-- .../deepin/deepin-sound-theme/default.nix | 3 +-- pkgs/desktops/deepin/deepin-terminal/default.nix | 3 +-- pkgs/desktops/deepin/deepin-turbo/default.nix | 3 +-- .../deepin/deepin-wallpapers/default.nix | 3 +-- pkgs/desktops/deepin/deepin-wm/default.nix | 3 +-- .../deepin/dpa-ext-gnomekeyring/default.nix | 3 +-- pkgs/desktops/deepin/dtkcore/default.nix | 3 +-- pkgs/desktops/deepin/dtkwidget/default.nix | 3 +-- pkgs/desktops/deepin/dtkwm/default.nix | 3 +-- pkgs/desktops/deepin/go-dbus-factory/default.nix | 3 +-- .../deepin/go-dbus-generator/default.nix | 3 +-- .../desktops/deepin/go-gir-generator/default.nix | 3 +-- pkgs/desktops/deepin/go-lib/default.nix | 3 +-- pkgs/desktops/deepin/qcef/default.nix | 3 +-- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 3 +-- pkgs/desktops/deepin/qt5integration/default.nix | 3 +-- pkgs/desktops/deepin/udisks2-qt5/default.nix | 3 +-- pkgs/desktops/enlightenment/econnman.nix | 4 ++-- pkgs/desktops/enlightenment/efl.nix | 4 ++-- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- pkgs/desktops/enlightenment/ephoto.nix | 4 ++-- pkgs/desktops/enlightenment/rage.nix | 4 ++-- .../bindings/gnome-python-desktop/default.nix | 4 ++-- .../gnome-2/desktop/gtksourceview/default.nix | 4 ++-- .../desktop/mail-notification/default.nix | 2 +- pkgs/desktops/gnome-2/platform/GConf/default.nix | 2 +- pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 4 ++-- pkgs/desktops/gnome-3/apps/cheese/default.nix | 4 ++-- .../gnome-3/apps/file-roller/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/glade/default.nix | 4 ++-- .../gnome-3/apps/gnome-characters/default.nix | 4 ++-- .../gnome-3/apps/gnome-clocks/default.nix | 4 ++-- .../gnome-3/apps/gnome-documents/default.nix | 4 ++-- .../apps/gnome-getting-started-docs/default.nix | 4 ++-- .../desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++-- .../gnome-3/apps/gnome-weather/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/vinagre/default.nix | 4 ++-- .../gnome-3/core/adwaita-icon-theme/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/empathy/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- .../core/evolution-data-server/default.nix | 6 +++--- pkgs/desktops/gnome-3/core/gdm/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- .../gnome-3/core/gnome-backgrounds/default.nix | 4 ++-- .../gnome-3/core/gnome-calculator/default.nix | 4 ++-- .../gnome-3/core/gnome-common/default.nix | 4 ++-- .../gnome-3/core/gnome-desktop/default.nix | 4 ++-- .../gnome-3/core/gnome-dictionary/default.nix | 4 ++-- .../gnome-3/core/gnome-disk-utility/default.nix | 4 ++-- .../gnome-3/core/gnome-font-viewer/default.nix | 4 ++-- .../gnome-3/core/gnome-keyring/default.nix | 4 ++-- .../gnome-3/core/gnome-online-miners/default.nix | 4 ++-- .../gnome-3/core/gnome-session/default.nix | 4 ++-- .../core/gnome-shell-extensions/default.nix | 6 +++--- .../gnome-3/core/gnome-shell/default.nix | 4 ++-- .../gnome-3/core/gnome-software/default.nix | 4 ++-- .../core/gnome-system-monitor/default.nix | 4 ++-- .../gnome-3/core/gnome-terminal/default.nix | 4 ++-- .../gnome-3/core/gnome-user-docs/default.nix | 4 ++-- .../gnome-3/core/gucharmap/unicode-data.nix | 2 +- .../gnome-3/core/simple-scan/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/sushi/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/totem/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/vino/default.nix | 4 ++-- .../desktops/gnome-3/core/yelp-tools/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/zenity/default.nix | 4 ++-- .../desktops/gnome-3/devtools/anjuta/default.nix | 4 ++-- .../gnome-3/devtools/devhelp/default.nix | 4 ++-- .../devtools/gnome-devel-docs/default.nix | 4 ++-- .../gnome-3/devtools/nemiver/default.nix | 4 ++-- .../gnome-3/extensions/appindicator/default.nix | 2 +- .../extensions/battery-status/default.nix | 2 +- .../gnome-3/extensions/caffeine/default.nix | 2 +- .../extensions/clipboard-indicator/default.nix | 2 +- .../gnome-3/extensions/dash-to-dock/default.nix | 2 +- .../gnome-3/extensions/dash-to-panel/default.nix | 2 +- .../gnome-3/extensions/gsconnect/default.nix | 4 ++-- .../gnome-3/extensions/icon-hider/default.nix | 2 +- pkgs/desktops/gnome-3/extensions/impatience.nix | 2 +- .../gnome-3/extensions/mediaplayer/default.nix | 2 +- .../gnome-3/extensions/no-title-bar/default.nix | 2 +- .../gnome-3/extensions/nohotcorner/default.nix | 2 +- .../remove-dropdown-arrows/default.nix | 2 +- .../extensions/system-monitor/default.nix | 2 +- .../gnome-3/extensions/taskwhisperer/default.nix | 2 +- .../gnome-3/extensions/timepp/default.nix | 2 +- .../gnome-3/extensions/topicons-plus/default.nix | 2 +- .../desktops/gnome-3/extensions/volume-mixer.nix | 2 +- .../gnome-3/extensions/workspace-grid.nix | 2 +- .../gnome-3/games/five-or-more/default.nix | 4 ++-- .../gnome-3/games/four-in-a-row/default.nix | 4 ++-- .../gnome-3/games/gnome-chess/default.nix | 4 ++-- .../gnome-3/games/gnome-mahjongg/default.nix | 4 ++-- .../gnome-3/games/gnome-mines/default.nix | 4 ++-- .../gnome-3/games/gnome-nibbles/default.nix | 4 ++-- .../gnome-3/games/gnome-robots/default.nix | 4 ++-- .../gnome-3/games/gnome-sudoku/default.nix | 4 ++-- .../gnome-3/games/gnome-taquin/default.nix | 4 ++-- .../gnome-3/games/gnome-tetravex/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/iagno/default.nix | 4 ++-- .../desktops/gnome-3/games/lightsoff/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/tali/default.nix | 4 ++-- .../gnome-3/misc/gnome-autoar/default.nix | 4 ++-- .../gnome-3/misc/gnome-packagekit/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 4 ++-- pkgs/desktops/lxde/core/lxmenu-data.nix | 4 ++-- pkgs/desktops/lxde/core/lxtask/default.nix | 4 ++-- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 1 - pkgs/desktops/lxqt/qlipper/default.nix | 1 - pkgs/desktops/mate/atril/default.nix | 4 ++-- pkgs/desktops/mate/caja-extensions/default.nix | 4 ++-- pkgs/desktops/mate/engrampa/default.nix | 4 ++-- pkgs/desktops/mate/eom/default.nix | 4 ++-- pkgs/desktops/mate/libmatekbd/default.nix | 4 ++-- pkgs/desktops/mate/libmatemixer/default.nix | 4 ++-- pkgs/desktops/mate/libmateweather/default.nix | 4 ++-- pkgs/desktops/mate/marco/default.nix | 4 ++-- pkgs/desktops/mate/mate-applets/default.nix | 4 ++-- pkgs/desktops/mate/mate-backgrounds/default.nix | 4 ++-- pkgs/desktops/mate/mate-calc/default.nix | 4 ++-- pkgs/desktops/mate/mate-common/default.nix | 4 ++-- .../mate/mate-control-center/default.nix | 4 ++-- pkgs/desktops/mate/mate-desktop/default.nix | 4 ++-- .../mate/mate-icon-theme-faenza/default.nix | 4 ++-- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++-- .../mate/mate-indicator-applet/default.nix | 4 ++-- pkgs/desktops/mate/mate-media/default.nix | 4 ++-- pkgs/desktops/mate/mate-menus/default.nix | 4 ++-- pkgs/desktops/mate/mate-netbook/default.nix | 4 ++-- .../mate/mate-notification-daemon/default.nix | 4 ++-- pkgs/desktops/mate/mate-panel/default.nix | 4 ++-- pkgs/desktops/mate/mate-polkit/default.nix | 4 ++-- .../desktops/mate/mate-power-manager/default.nix | 4 ++-- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- .../mate/mate-sensors-applet/default.nix | 4 ++-- .../mate/mate-session-manager/default.nix | 4 ++-- .../mate/mate-settings-daemon/default.nix | 4 ++-- .../mate/mate-system-monitor/default.nix | 4 ++-- pkgs/desktops/mate/mate-terminal/default.nix | 4 ++-- pkgs/desktops/mate/mate-themes/default.nix | 4 ++-- pkgs/desktops/mate/mate-user-guide/default.nix | 4 ++-- pkgs/desktops/mate/mate-user-share/default.nix | 4 ++-- pkgs/desktops/mate/mate-utils/default.nix | 4 ++-- pkgs/desktops/mate/pluma/default.nix | 4 ++-- pkgs/desktops/mate/python-caja/default.nix | 4 ++-- .../xfce4-hardware-monitor-plugin.nix | 3 +-- .../appmenu-gtk-module.nix | 2 +- .../xfce4-vala-panel-appmenu-plugin/default.nix | 2 +- pkgs/development/arduino/arduino-mk/default.nix | 2 +- pkgs/development/compilers/abcl/default.nix | 1 - .../compilers/apache-flex-sdk/default.nix | 4 ++-- .../compilers/arachne-pnr/default.nix | 2 +- pkgs/development/compilers/asn1c/default.nix | 2 +- pkgs/development/compilers/ats/default.nix | 2 +- pkgs/development/compilers/ats2/default.nix | 2 +- pkgs/development/compilers/avian/default.nix | 2 +- pkgs/development/compilers/bigloo/default.nix | 2 +- pkgs/development/compilers/binaryen/default.nix | 2 +- pkgs/development/compilers/ccl/default.nix | 2 +- pkgs/development/compilers/chez/default.nix | 2 +- pkgs/development/compilers/clasp/default.nix | 1 - pkgs/development/compilers/closure/default.nix | 2 +- pkgs/development/compilers/colm/default.nix | 4 ++-- pkgs/development/compilers/compcert/default.nix | 2 +- pkgs/development/compilers/coreclr/default.nix | 2 +- .../compilers/cudatoolkit/default.nix | 2 +- pkgs/development/compilers/dev86/default.nix | 2 +- pkgs/development/compilers/dmd/default.nix | 2 +- pkgs/development/compilers/eli/default.nix | 4 ++-- pkgs/development/compilers/eql/default.nix | 2 +- .../compilers/factor-lang/default.nix | 2 +- pkgs/development/compilers/fasm/default.nix | 2 +- pkgs/development/compilers/fpc/default.nix | 2 +- pkgs/development/compilers/fpc/lazarus.nix | 2 +- pkgs/development/compilers/fsharp/default.nix | 2 +- pkgs/development/compilers/fsharp41/default.nix | 2 +- pkgs/development/compilers/fstar/default.nix | 2 +- pkgs/development/compilers/gambit/bootstrap.nix | 2 +- .../compilers/gcc-arm-embedded/6/default.nix | 2 +- .../compilers/gcc-arm-embedded/7/default.nix | 2 +- .../compilers/gcc-arm-embedded/8/default.nix | 2 +- pkgs/development/compilers/gcl/2.6.13-pre.nix | 2 +- pkgs/development/compilers/gcl/default.nix | 4 ++-- pkgs/development/compilers/glslang/default.nix | 2 +- pkgs/development/compilers/gnu-cobol/default.nix | 2 +- .../compilers/gnu-smalltalk/default.nix | 2 +- .../development/compilers/go-jsonnet/default.nix | 2 +- pkgs/development/compilers/go/1.10.nix | 2 +- pkgs/development/compilers/go/1.4.nix | 2 +- pkgs/development/compilers/graalvm/default.nix | 4 ++-- pkgs/development/compilers/hhvm/default.nix | 2 +- pkgs/development/compilers/iasl/default.nix | 2 +- .../compilers/icedtea-web/default.nix | 4 ++-- pkgs/development/compilers/intercal/default.nix | 4 ++-- pkgs/development/compilers/ispc/default.nix | 2 +- .../compilers/javacard-devkit/default.nix | 1 - .../compilers/jetbrains-jdk/default.nix | 1 - pkgs/development/compilers/jsonnet/default.nix | 2 +- pkgs/development/compilers/julia/shared.nix | 3 +-- pkgs/development/compilers/jwasm/default.nix | 2 +- pkgs/development/compilers/kotlin/default.nix | 2 +- .../development/compilers/llvm/5/compiler-rt.nix | 2 +- .../development/compilers/llvm/6/compiler-rt.nix | 2 +- .../development/compilers/llvm/7/compiler-rt.nix | 2 +- .../development/compilers/llvm/8/compiler-rt.nix | 2 +- pkgs/development/compilers/manticore/default.nix | 2 +- pkgs/development/compilers/mercury/default.nix | 2 +- .../compilers/microscheme/default.nix | 4 ++-- pkgs/development/compilers/mint/default.nix | 2 +- pkgs/development/compilers/mkcl/default.nix | 2 +- .../compilers/mlton/20180207-binary.nix | 6 +++--- pkgs/development/compilers/mono/llvm.nix | 2 +- pkgs/development/compilers/mosml/default.nix | 2 +- pkgs/development/compilers/nasm/default.nix | 4 ++-- pkgs/development/compilers/neko/default.nix | 2 +- pkgs/development/compilers/nextpnr/default.nix | 2 +- .../compilers/nvidia-cg-toolkit/default.nix | 2 +- pkgs/development/compilers/obliv-c/default.nix | 2 +- pkgs/development/compilers/ocaml/3.08.0.nix | 4 ++-- pkgs/development/compilers/ocaml/3.10.0.nix | 4 ++-- pkgs/development/compilers/ocaml/3.11.2.nix | 4 ++-- pkgs/development/compilers/ocaml/3.12.1.nix | 4 ++-- pkgs/development/compilers/ocaml/4.00.1.nix | 4 ++-- .../compilers/ocaml/ber-metaocaml.nix | 8 ++++---- .../compilers/ocaml/metaocaml-3.09.nix | 2 +- pkgs/development/compilers/opa/default.nix | 1 - pkgs/development/compilers/openspin/default.nix | 2 +- pkgs/development/compilers/owl-lisp/default.nix | 2 +- pkgs/development/compilers/polyml/5.7.nix | 2 +- pkgs/development/compilers/polyml/default.nix | 2 +- pkgs/development/compilers/ponyc/pony-stable.nix | 2 +- pkgs/development/compilers/rgbds/default.nix | 2 +- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 4 ++-- pkgs/development/compilers/scala/dotty-bare.nix | 2 +- pkgs/development/compilers/sdcc/default.nix | 2 +- pkgs/development/compilers/seexpr/default.nix | 2 +- pkgs/development/compilers/serpent/default.nix | 2 +- pkgs/development/compilers/shaderc/default.nix | 2 +- pkgs/development/compilers/smlnj/bootstrap.nix | 2 +- pkgs/development/compilers/solc/default.nix | 2 +- pkgs/development/compilers/souffle/default.nix | 2 +- pkgs/development/compilers/squeak/default.nix | 2 +- pkgs/development/compilers/terra/default.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- pkgs/development/compilers/urweb/default.nix | 4 ++-- pkgs/development/compilers/wcc/default.nix | 2 +- pkgs/development/compilers/x11basic/default.nix | 1 - pkgs/development/compilers/yap/default.nix | 4 ++-- pkgs/development/compilers/yosys/default.nix | 2 +- pkgs/development/compilers/zulu/8.nix | 2 +- pkgs/development/compilers/zulu/default.nix | 2 +- pkgs/development/em-modules/generic/default.nix | 5 +++-- .../guile-modules/guile-cairo/default.nix | 4 ++-- .../guile-modules/guile-gnome/default.nix | 3 +-- .../guile-modules/guile-reader/default.nix | 4 ++-- .../guile-modules/guile-sdl/default.nix | 3 +-- pkgs/development/interpreters/acl2/default.nix | 2 +- pkgs/development/interpreters/bats/default.nix | 2 +- pkgs/development/interpreters/clips/default.nix | 2 +- .../interpreters/clojurescript/lumo/default.nix | 2 +- .../development/interpreters/duktape/default.nix | 2 +- pkgs/development/interpreters/falcon/default.nix | 2 +- pkgs/development/interpreters/gauche/default.nix | 2 +- .../development/interpreters/gnu-apl/default.nix | 2 +- pkgs/development/interpreters/groovy/default.nix | 2 +- .../interpreters/icon-lang/default.nix | 2 +- pkgs/development/interpreters/j/default.nix | 2 +- pkgs/development/interpreters/jimtcl/default.nix | 2 +- pkgs/development/interpreters/joker/default.nix | 2 +- pkgs/development/interpreters/jruby/default.nix | 2 +- pkgs/development/interpreters/jython/default.nix | 2 +- pkgs/development/interpreters/kona/default.nix | 2 +- .../development/interpreters/lolcode/default.nix | 2 +- .../interpreters/lua-5/filesystem.nix | 2 +- pkgs/development/interpreters/lua-5/sockets.nix | 2 +- .../interpreters/metamath/default.nix | 2 +- pkgs/development/interpreters/mujs/default.nix | 2 +- pkgs/development/interpreters/octave/default.nix | 6 +++--- pkgs/development/interpreters/picoc/default.nix | 2 +- .../interpreters/picolisp/default.nix | 4 ++-- pkgs/development/interpreters/pixie/default.nix | 2 +- .../interpreters/python/cpython/2.7/boot.nix | 2 +- pkgs/development/interpreters/qnial/default.nix | 2 +- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- pkgs/development/interpreters/rebol/default.nix | 2 +- pkgs/development/interpreters/red/default.nix | 10 +++++----- pkgs/development/interpreters/regina/default.nix | 4 ++-- pkgs/development/interpreters/renpy/default.nix | 2 +- pkgs/development/interpreters/self/default.nix | 2 +- .../interpreters/spidermonkey/1.8.5.nix | 2 +- .../development/interpreters/spidermonkey/38.nix | 2 +- .../interpreters/supercollider/default.nix | 2 +- .../interpreters/tinyscheme/default.nix | 4 ++-- .../interpreters/unicon-lang/default.nix | 2 +- .../java-modules/postgresql_jdbc/default.nix | 2 +- pkgs/development/libraries/CoinMP/default.nix | 4 ++-- pkgs/development/libraries/LASzip/default.nix | 2 +- pkgs/development/libraries/SDL/default.nix | 4 ++-- pkgs/development/libraries/SDL2/default.nix | 4 ++-- pkgs/development/libraries/SDL2_gfx/default.nix | 3 +-- .../development/libraries/SDL2_image/default.nix | 4 ++-- .../development/libraries/SDL2_mixer/default.nix | 4 ++-- pkgs/development/libraries/SDL2_net/default.nix | 4 ++-- pkgs/development/libraries/SDL2_ttf/default.nix | 4 ++-- pkgs/development/libraries/SDL_gfx/default.nix | 4 ++-- pkgs/development/libraries/SDL_image/default.nix | 4 ++-- pkgs/development/libraries/SDL_mixer/default.nix | 3 +-- pkgs/development/libraries/SDL_net/default.nix | 4 +--- pkgs/development/libraries/SDL_sixel/default.nix | 2 +- pkgs/development/libraries/SDL_sound/default.nix | 4 ++-- .../libraries/SDL_stretch/default.nix | 4 ++-- pkgs/development/libraries/SDL_ttf/default.nix | 4 ++-- .../development/libraries/abseil-cpp/default.nix | 2 +- .../libraries/accounts-qt/default.nix | 2 +- pkgs/development/libraries/ace/default.nix | 2 +- pkgs/development/libraries/afflib/default.nix | 2 +- pkgs/development/libraries/aften/default.nix | 4 ++-- pkgs/development/libraries/alembic/default.nix | 2 +- pkgs/development/libraries/alkimia/default.nix | 4 ++-- pkgs/development/libraries/allegro/5.nix | 2 +- pkgs/development/libraries/allegro/default.nix | 4 ++-- pkgs/development/libraries/alure/default.nix | 2 +- pkgs/development/libraries/amrwb/default.nix | 2 +- .../libraries/apache-activemq/default.nix | 4 ++-- pkgs/development/libraries/appstream/default.nix | 2 +- pkgs/development/libraries/appstream/qt.nix | 2 +- pkgs/development/libraries/aqbanking/default.nix | 4 ++-- .../libraries/aqbanking/gwenhywfar.nix | 4 ++-- .../libraries/aqbanking/libchipcard.nix | 4 ++-- pkgs/development/libraries/arb/default.nix | 1 - pkgs/development/libraries/armadillo/default.nix | 2 +- pkgs/development/libraries/arrow-cpp/default.nix | 2 +- pkgs/development/libraries/assimp/default.nix | 2 +- .../libraries/at-spi2-atk/default.nix | 3 +-- .../libraries/at-spi2-core/default.nix | 3 +-- .../libraries/audio/jamomacore/default.nix | 2 +- .../libraries/audio/libbs2b/default.nix | 4 ++-- .../libraries/audio/libmysofa/default.nix | 2 +- .../libraries/audio/libsmf/default.nix | 4 ++-- .../development/libraries/audio/lilv/default.nix | 4 ++-- pkgs/development/libraries/audio/lv2/default.nix | 4 ++-- .../development/libraries/audio/lv2/unstable.nix | 2 +- .../development/libraries/audio/lvtk/default.nix | 2 +- pkgs/development/libraries/audio/ntk/default.nix | 2 +- .../libraries/audio/rtaudio/default.nix | 2 +- .../libraries/audio/rtmidi/default.nix | 2 +- .../libraries/audio/sratom/default.nix | 4 ++-- .../libraries/audio/zita-alsa-pcmi/default.nix | 4 ++-- .../libraries/audio/zita-convolver/default.nix | 4 ++-- .../libraries/audio/zita-resampler/default.nix | 4 ++-- .../libraries/aws-sdk-cpp/default.nix | 2 +- .../libraries/backward-cpp/default.nix | 2 +- pkgs/development/libraries/bamf/default.nix | 2 +- pkgs/development/libraries/beignet/default.nix | 4 ++-- pkgs/development/libraries/biblesync/default.nix | 4 ++-- pkgs/development/libraries/bobcat/default.nix | 2 +- pkgs/development/libraries/boehm-gc/7.6.6.nix | 2 +- pkgs/development/libraries/boehm-gc/default.nix | 2 +- pkgs/development/libraries/boringssl/default.nix | 2 +- pkgs/development/libraries/botan/generic.nix | 2 +- pkgs/development/libraries/box2d/default.nix | 2 +- pkgs/development/libraries/brigand/default.nix | 2 +- pkgs/development/libraries/bullet/default.nix | 2 +- .../libraries/bullet/roboschool-fork.nix | 2 +- pkgs/development/libraries/bwidget/default.nix | 2 +- pkgs/development/libraries/c-blosc/default.nix | 2 +- pkgs/development/libraries/caf/default.nix | 2 +- pkgs/development/libraries/capnproto/default.nix | 2 +- pkgs/development/libraries/capstone/default.nix | 2 +- pkgs/development/libraries/catch/default.nix | 2 +- pkgs/development/libraries/catch2/default.nix | 2 +- pkgs/development/libraries/cctz/default.nix | 2 +- pkgs/development/libraries/cddlib/default.nix | 2 +- pkgs/development/libraries/cdk/default.nix | 2 +- pkgs/development/libraries/cegui/default.nix | 4 ++-- .../libraries/ceres-solver/default.nix | 2 +- pkgs/development/libraries/cgui/default.nix | 4 ++-- pkgs/development/libraries/check/default.nix | 2 +- pkgs/development/libraries/chipmunk/default.nix | 2 +- .../libraries/chromaprint/default.nix | 4 ++-- pkgs/development/libraries/cimg/default.nix | 2 +- pkgs/development/libraries/cl/default.nix | 4 ++-- pkgs/development/libraries/clipper/default.nix | 2 +- pkgs/development/libraries/cln/default.nix | 4 ++-- pkgs/development/libraries/cmark/default.nix | 2 +- pkgs/development/libraries/cmrt/default.nix | 2 +- .../libraries/concurrencykit/default.nix | 2 +- pkgs/development/libraries/coprthr/default.nix | 2 +- pkgs/development/libraries/cpp-hocon/default.nix | 2 +- .../libraries/cpp-ipfs-api/default.nix | 2 +- pkgs/development/libraries/cppcms/default.nix | 4 ++-- pkgs/development/libraries/cppdb/default.nix | 4 ++-- pkgs/development/libraries/cppunit/default.nix | 4 ++-- pkgs/development/libraries/cpputest/default.nix | 4 ++-- pkgs/development/libraries/cppzmq/default.nix | 2 +- pkgs/development/libraries/cre2/default.nix | 2 +- pkgs/development/libraries/crypto++/default.nix | 2 +- pkgs/development/libraries/ctpl/default.nix | 2 +- pkgs/development/libraries/ctpp2/default.nix | 4 ++-- pkgs/development/libraries/curlcpp/default.nix | 2 +- pkgs/development/libraries/curlpp/default.nix | 2 +- pkgs/development/libraries/cutee/default.nix | 1 - pkgs/development/libraries/cutelyst/default.nix | 2 +- .../libraries/cxx-prettyprint/default.nix | 2 +- pkgs/development/libraries/cxxtools/default.nix | 4 ++-- .../development/libraries/cyrus-sasl/default.nix | 6 +++--- pkgs/development/libraries/czmq/3.x.nix | 4 ++-- pkgs/development/libraries/czmq/4.x.nix | 4 ++-- pkgs/development/libraries/czmqpp/default.nix | 2 +- .../libraries/dbus-cplusplus/default.nix | 4 ++-- .../dbus-sharp-glib/dbus-sharp-glib-1.0.nix | 2 +- .../libraries/dbus-sharp-glib/default.nix | 2 +- .../libraries/dbus-sharp/dbus-sharp-1.0.nix | 2 +- .../development/libraries/dbus-sharp/default.nix | 2 +- pkgs/development/libraries/dbxml/default.nix | 4 ++-- pkgs/development/libraries/dirac/default.nix | 4 ++-- .../libraries/dleyna-connector-dbus/default.nix | 1 - pkgs/development/libraries/dlib/default.nix | 2 +- .../development/libraries/docopt_cpp/default.nix | 2 +- .../libraries/double-conversion/default.nix | 2 +- pkgs/development/libraries/drumstick/default.nix | 4 ++-- pkgs/development/libraries/dssi/default.nix | 4 ++-- pkgs/development/libraries/dxflib/default.nix | 4 ++-- pkgs/development/libraries/dyncall/default.nix | 2 +- .../libraries/easyloggingpp/default.nix | 2 +- pkgs/development/libraries/eccodes/default.nix | 2 +- pkgs/development/libraries/eclib/default.nix | 1 - pkgs/development/libraries/editline/default.nix | 2 +- .../elementary-cmake-modules/default.nix | 2 +- pkgs/development/libraries/embree/2.x.nix | 2 +- pkgs/development/libraries/enchant/1.x.nix | 3 +-- pkgs/development/libraries/epoxy/default.nix | 2 +- pkgs/development/libraries/exosip/default.nix | 2 +- pkgs/development/libraries/faac/default.nix | 4 ++-- pkgs/development/libraries/faad2/default.nix | 4 ++-- pkgs/development/libraries/farbfeld/default.nix | 2 +- pkgs/development/libraries/fastjson/default.nix | 2 +- pkgs/development/libraries/fcgi/default.nix | 2 +- pkgs/development/libraries/fdk-aac/default.nix | 4 ++-- pkgs/development/libraries/fflas-ffpack/1.nix | 1 - .../libraries/fflas-ffpack/default.nix | 1 - .../libraries/ffmpeg-full/default.nix | 2 +- .../libraries/ffmpeg-sixel/default.nix | 2 +- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- .../libraries/ffmpegthumbnailer/default.nix | 2 +- pkgs/development/libraries/ffms/default.nix | 2 +- .../libraries/filter-audio/default.nix | 2 +- .../libraries/flatbuffers/default.nix | 2 +- pkgs/development/libraries/flint/default.nix | 2 +- pkgs/development/libraries/fmt/default.nix | 2 +- pkgs/development/libraries/folly/default.nix | 2 +- .../development/libraries/fontconfig/default.nix | 4 ++-- pkgs/development/libraries/fox/default.nix | 4 ++-- pkgs/development/libraries/fplll/20160331.nix | 1 - pkgs/development/libraries/fplll/default.nix | 1 - pkgs/development/libraries/frame/default.nix | 4 ++-- pkgs/development/libraries/freenect/default.nix | 2 +- pkgs/development/libraries/freetds/default.nix | 4 ++-- pkgs/development/libraries/frei0r/default.nix | 4 ++-- pkgs/development/libraries/fstrcmp/default.nix | 2 +- pkgs/development/libraries/fstrm/default.nix | 2 +- .../development/libraries/gbenchmark/default.nix | 2 +- pkgs/development/libraries/gcc/libstdc++/5.nix | 2 +- pkgs/development/libraries/gd/default.nix | 4 ++-- pkgs/development/libraries/gdal/2.4.0.nix | 4 ++-- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/libraries/gdal/gdal-1_11.nix | 4 ++-- .../libraries/gdata-sharp/default.nix | 2 +- pkgs/development/libraries/gdcm/default.nix | 4 ++-- pkgs/development/libraries/gecode/3.nix | 4 ++-- pkgs/development/libraries/gecode/default.nix | 2 +- pkgs/development/libraries/geis/default.nix | 4 ++-- pkgs/development/libraries/getdata/default.nix | 4 ++-- pkgs/development/libraries/getdns/default.nix | 1 - pkgs/development/libraries/gettext/default.nix | 4 ++-- pkgs/development/libraries/gf2x/default.nix | 2 +- pkgs/development/libraries/gio-sharp/default.nix | 2 +- pkgs/development/libraries/givaro/3.7.nix | 1 - pkgs/development/libraries/givaro/3.nix | 1 - pkgs/development/libraries/givaro/default.nix | 1 - pkgs/development/libraries/gl2ps/default.nix | 4 ++-- pkgs/development/libraries/glbinding/default.nix | 1 - pkgs/development/libraries/glfw/3.x.nix | 2 +- pkgs/development/libraries/glm/default.nix | 4 ++-- .../libraries/globalplatform/default.nix | 4 ++-- .../globalplatform/gppcscconnectionplugin.nix | 4 ++-- pkgs/development/libraries/glog/default.nix | 2 +- pkgs/development/libraries/glpk/default.nix | 4 ++-- pkgs/development/libraries/gmime/2.nix | 4 ++-- pkgs/development/libraries/gmime/3.nix | 4 ++-- pkgs/development/libraries/gmm/default.nix | 4 ++-- pkgs/development/libraries/gmtk/default.nix | 2 +- .../libraries/gnome-sharp/default.nix | 2 +- .../development/libraries/gnu-config/default.nix | 2 +- pkgs/development/libraries/gnu-efi/default.nix | 4 ++-- pkgs/development/libraries/gpgme/default.nix | 4 ++-- pkgs/development/libraries/grail/default.nix | 4 ++-- .../development/libraries/grantlee/5/default.nix | 4 ++-- .../graphene-hardened-malloc/default.nix | 2 +- pkgs/development/libraries/grib-api/default.nix | 2 +- pkgs/development/libraries/grpc/default.nix | 2 +- .../gsettings-desktop-schemas/default.nix | 4 ++-- .../libraries/gsettings-qt/default.nix | 2 +- .../libraries/gsignond/plugins/lastfm.nix | 2 +- .../libraries/gsignond/plugins/oauth.nix | 2 +- .../libraries/gsignond/plugins/sasl.nix | 2 +- pkgs/development/libraries/gsm/default.nix | 4 ++-- pkgs/development/libraries/gsoap/default.nix | 2 +- .../libraries/gstreamer/bad/default.nix | 4 ++-- .../libraries/gstreamer/base/default.nix | 4 ++-- .../libraries/gstreamer/core/default.nix | 4 ++-- .../libraries/gstreamer/ges/default.nix | 4 ++-- .../libraries/gstreamer/good/default.nix | 4 ++-- .../libraries/gstreamer/libav/default.nix | 4 ++-- .../libraries/gstreamer/rtsp-server/default.nix | 4 ++-- .../libraries/gstreamer/ugly/default.nix | 4 ++-- .../libraries/gstreamer/vaapi/default.nix | 2 +- .../libraries/gstreamer/validate/default.nix | 4 ++-- pkgs/development/libraries/gtest/default.nix | 2 +- .../libraries/gtk-sharp-beans/default.nix | 2 +- pkgs/development/libraries/gtk-sharp/2.0.nix | 2 +- pkgs/development/libraries/gtkd/default.nix | 2 +- pkgs/development/libraries/gtksourceview/3.x.nix | 4 ++-- pkgs/development/libraries/gtksourceview/4.x.nix | 4 ++-- .../libraries/gtksourceviewmm/default.nix | 4 ++-- pkgs/development/libraries/gtkspell/3.nix | 2 +- .../development/libraries/gtkspellmm/default.nix | 4 ++-- pkgs/development/libraries/gts/default.nix | 4 ++-- pkgs/development/libraries/gumbo/default.nix | 2 +- pkgs/development/libraries/gusb/default.nix | 2 +- pkgs/development/libraries/half/default.nix | 2 +- pkgs/development/libraries/hamlib/default.nix | 3 +-- pkgs/development/libraries/herqq/default.nix | 2 +- pkgs/development/libraries/hiredis/default.nix | 2 +- pkgs/development/libraries/hivex/default.nix | 4 ++-- pkgs/development/libraries/hpx/default.nix | 2 +- pkgs/development/libraries/htmlcxx/default.nix | 4 ++-- pkgs/development/libraries/hunspell/default.nix | 2 +- pkgs/development/libraries/idnkit/default.nix | 4 ++-- pkgs/development/libraries/iksemel/default.nix | 2 +- pkgs/development/libraries/ilmbase/default.nix | 4 ++-- pkgs/development/libraries/iml/default.nix | 2 +- pkgs/development/libraries/incrtcl/default.nix | 2 +- .../libraries/indicator-application/gtk2.nix | 2 +- pkgs/development/libraries/iniparser/default.nix | 8 ++++---- .../libraries/intel-gmmlib/default.nix | 4 ++-- .../libraries/intel-media-driver/default.nix | 2 +- .../libraries/intel-media-sdk/default.nix | 2 +- .../libraries/ip2location-c/default.nix | 2 +- pkgs/development/libraries/irrlicht/default.nix | 4 ++-- pkgs/development/libraries/iso-codes/default.nix | 4 ++-- pkgs/development/libraries/jama/default.nix | 4 ++-- pkgs/development/libraries/jasper/default.nix | 2 +- .../libraries/java/commons/bcel/default.nix | 2 +- .../libraries/java/commons/compress/default.nix | 4 ++-- .../java/commons/fileupload/default.nix | 4 ++-- .../libraries/java/commons/io/default.nix | 4 ++-- .../libraries/java/commons/lang/default.nix | 2 +- .../libraries/java/commons/math/default.nix | 2 +- pkgs/development/libraries/java/cup/default.nix | 2 +- .../libraries/java/hydra-ant-logger/default.nix | 2 +- pkgs/development/libraries/java/jzmq/default.nix | 2 +- .../libraries/java/lucene/default.nix | 4 ++-- pkgs/development/libraries/java/swt/default.nix | 4 ++-- pkgs/development/libraries/jemalloc/common.nix | 4 ++-- .../libraries/jitterentropy/default.nix | 2 +- pkgs/development/libraries/jxrlib/default.nix | 1 - pkgs/development/libraries/kdb/default.nix | 3 +-- pkgs/development/libraries/kerberos/heimdal.nix | 2 +- pkgs/development/libraries/keybinder/default.nix | 4 ++-- .../development/libraries/keybinder3/default.nix | 2 +- pkgs/development/libraries/kmsxx/default.nix | 1 - pkgs/development/libraries/kproperty/default.nix | 3 +-- pkgs/development/libraries/kreport/default.nix | 3 +-- pkgs/development/libraries/lame/default.nix | 4 ++-- pkgs/development/libraries/lasso/default.nix | 2 +- pkgs/development/libraries/ldacbt/default.nix | 2 +- pkgs/development/libraries/ldns/default.nix | 4 +--- .../development/libraries/leatherman/default.nix | 2 +- pkgs/development/libraries/lensfun/default.nix | 4 ++-- pkgs/development/libraries/leptonica/default.nix | 4 ++-- pkgs/development/libraries/leveldb/default.nix | 2 +- pkgs/development/libraries/libaacs/default.nix | 4 ++-- pkgs/development/libraries/libaal/default.nix | 4 ++-- pkgs/development/libraries/libabw/default.nix | 4 ++-- .../libraries/libaccounts-glib/default.nix | 2 +- pkgs/development/libraries/libagar/default.nix | 2 +- .../libraries/libagar/libagar_test.nix | 2 +- .../development/libraries/libamqpcpp/default.nix | 2 +- pkgs/development/libraries/libao/default.nix | 2 +- pkgs/development/libraries/libaom/default.nix | 2 +- pkgs/development/libraries/libaosd/default.nix | 2 +- .../development/libraries/libarchive/default.nix | 2 +- pkgs/development/libraries/libasr/default.nix | 4 ++-- pkgs/development/libraries/libass/default.nix | 4 ++-- pkgs/development/libraries/libast/default.nix | 4 ++-- .../libraries/libatomic_ops/default.nix | 2 +- pkgs/development/libraries/libb2/default.nix | 2 +- pkgs/development/libraries/libb64/default.nix | 2 +- pkgs/development/libraries/libbap/default.nix | 2 +- pkgs/development/libraries/libbdplus/default.nix | 4 ++-- pkgs/development/libraries/libbfd/default.nix | 2 +- .../libraries/libbluedevil/default.nix | 3 +-- pkgs/development/libraries/libbluray/default.nix | 4 ++-- pkgs/development/libraries/libbsd/default.nix | 4 ++-- pkgs/development/libraries/libbson/default.nix | 2 +- pkgs/development/libraries/libburn/default.nix | 4 ++-- pkgs/development/libraries/libcacard/default.nix | 4 ++-- .../development/libraries/libcangjie/default.nix | 2 +- pkgs/development/libraries/libcef/default.nix | 2 +- .../development/libraries/libchardet/default.nix | 2 +- .../development/libraries/libchewing/default.nix | 2 +- pkgs/development/libraries/libcli/default.nix | 2 +- .../libraries/libclthreads/default.nix | 2 +- .../libraries/libclxclient/default.nix | 2 +- .../development/libraries/libcommuni/default.nix | 2 +- .../development/libraries/libconfuse/default.nix | 2 +- .../libraries/libcouchbase/default.nix | 2 +- .../development/libraries/libcrafter/default.nix | 2 +- pkgs/development/libraries/libcsptr/default.nix | 2 +- .../libraries/libctemplate/default.nix | 2 +- pkgs/development/libraries/libcue/default.nix | 2 +- pkgs/development/libraries/libdap/default.nix | 4 ++-- .../libraries/libdbusmenu-qt/qt-5.5.nix | 2 +- pkgs/development/libraries/libdc1394/default.nix | 4 ++-- pkgs/development/libraries/libde265/default.nix | 2 +- .../development/libraries/libdeflate/default.nix | 2 +- pkgs/development/libraries/libdevil/default.nix | 2 +- .../development/libraries/libdigidoc/default.nix | 2 +- .../libraries/libdigidocpp/default.nix | 2 +- pkgs/development/libraries/libdiscid/default.nix | 4 ++-- .../libraries/libdivecomputer/default.nix | 4 ++-- pkgs/development/libraries/libdvbpsi/default.nix | 4 ++-- pkgs/development/libraries/libdvdcss/default.nix | 4 ++-- pkgs/development/libraries/libdvdnav/default.nix | 4 ++-- .../development/libraries/libdvdread/default.nix | 4 ++-- pkgs/development/libraries/libeb/default.nix | 2 +- .../development/libraries/libebur128/default.nix | 2 +- .../libraries/libechonest/default.nix | 4 ++-- .../libraries/libelf-freebsd/default.nix | 2 +- pkgs/development/libraries/libesmtp/default.nix | 2 +- pkgs/development/libraries/libev/default.nix | 4 ++-- pkgs/development/libraries/libevent/default.nix | 2 +- pkgs/development/libraries/libewf/default.nix | 2 +- .../libraries/libexecinfo/default.nix | 4 ++-- .../development/libraries/libfakekey/default.nix | 4 ++-- .../libraries/libfaketime/default.nix | 2 +- pkgs/development/libraries/libfann/default.nix | 2 +- pkgs/development/libraries/libffcall/default.nix | 2 +- pkgs/development/libraries/libfive/default.nix | 2 +- .../libraries/libfixposix/default.nix | 2 +- .../libraries/libfreefare/default.nix | 2 +- pkgs/development/libraries/libfsm/default.nix | 2 +- .../libraries/libgaminggear/default.nix | 4 ++-- pkgs/development/libraries/libgap/default.nix | 2 +- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- .../development/libraries/libgeotiff/default.nix | 2 +- pkgs/development/libraries/libgig/default.nix | 4 ++-- pkgs/development/libraries/libgksu/default.nix | 3 +-- pkgs/development/libraries/libglvnd/default.nix | 2 +- pkgs/development/libraries/libgnurl/default.nix | 2 +- .../libraries/libgringotts/default.nix | 4 ++-- pkgs/development/libraries/libgroove/default.nix | 2 +- .../development/libraries/libguestfs/default.nix | 2 +- pkgs/development/libraries/libgumath/default.nix | 2 +- pkgs/development/libraries/libheif/default.nix | 2 +- pkgs/development/libraries/libical/default.nix | 2 +- pkgs/development/libraries/libiconv/default.nix | 4 ++-- pkgs/development/libraries/libid3tag/default.nix | 2 +- pkgs/development/libraries/libidn2/default.nix | 4 ++-- .../libraries/libiec61883/default.nix | 2 +- pkgs/development/libraries/libiio/default.nix | 2 +- .../libraries/libimobiledevice/default.nix | 2 -- .../libraries/libinfinity/default.nix | 4 ++-- .../libraries/libinotify-kqueue/default.nix | 2 +- pkgs/development/libraries/libinput/default.nix | 4 ++-- pkgs/development/libraries/libipfix/default.nix | 2 +- .../libraries/libircclient/default.nix | 3 +-- .../development/libraries/libisoburn/default.nix | 4 ++-- pkgs/development/libraries/libisofs/default.nix | 4 ++-- pkgs/development/libraries/libite/default.nix | 2 +- pkgs/development/libraries/libivykis/default.nix | 2 +- pkgs/development/libraries/libixp-hg/default.nix | 2 +- pkgs/development/libraries/libjreen/default.nix | 4 ++-- .../libraries/libjson-rpc-cpp/default.nix | 2 +- .../libraries/libkeyfinder/default.nix | 2 +- .../development/libraries/liblangtag/default.nix | 1 - .../development/libraries/liblaxjson/default.nix | 2 +- pkgs/development/libraries/liblcf/default.nix | 2 +- pkgs/development/libraries/liblinear/default.nix | 2 +- pkgs/development/libraries/liblscp/default.nix | 4 ++-- .../libraries/libmatchbox/default.nix | 2 +- .../libraries/libmatheval/default.nix | 4 ++-- .../libraries/libmaxminddb/default.nix | 4 ++-- pkgs/development/libraries/libmd/default.nix | 1 - .../libraries/libmediainfo/default.nix | 2 +- pkgs/development/libraries/libmesode/default.nix | 2 +- pkgs/development/libraries/libmhash/default.nix | 3 +-- .../libraries/libmicrohttpd/default.nix | 4 ++-- pkgs/development/libraries/libmilter/default.nix | 2 +- pkgs/development/libraries/libmkv/default.nix | 2 +- pkgs/development/libraries/libmowgli/default.nix | 2 +- pkgs/development/libraries/libmpack/default.nix | 2 +- pkgs/development/libraries/libmpeg2/default.nix | 4 ++-- .../development/libraries/libmusicbrainz/5.x.nix | 2 +- pkgs/development/libraries/libmx/default.nix | 2 +- .../libraries/libmysqlconnectorcpp/default.nix | 2 +- pkgs/development/libraries/libnabo/default.nix | 2 +- pkgs/development/libraries/libnatpmp/default.nix | 6 +++--- pkgs/development/libraries/libndctl/default.nix | 2 +- .../development/libraries/libndtypes/default.nix | 2 +- pkgs/development/libraries/libnet/default.nix | 4 ++-- .../libraries/libnetfilter_acct/default.nix | 4 ++-- .../libraries/libnetfilter_conntrack/default.nix | 4 ++-- .../libraries/libnetfilter_cthelper/default.nix | 4 ++-- .../libraries/libnetfilter_cttimeout/default.nix | 4 ++-- .../libraries/libnetfilter_log/default.nix | 4 ++-- .../libraries/libnetfilter_queue/default.nix | 4 ++-- pkgs/development/libraries/libnfc/default.nix | 2 +- pkgs/development/libraries/libnfs/default.nix | 2 +- .../development/libraries/libngspice/default.nix | 2 +- .../libraries/libomxil-bellagio/default.nix | 4 ++-- .../development/libraries/libopcodes/default.nix | 2 +- .../libraries/libopenaptx/default.nix | 2 +- pkgs/development/libraries/libosmium/default.nix | 2 +- pkgs/development/libraries/libow/default.nix | 2 +- pkgs/development/libraries/libp11/default.nix | 4 ++-- pkgs/development/libraries/libpaper/default.nix | 2 +- pkgs/development/libraries/libpfm/default.nix | 4 ++-- pkgs/development/libraries/libpinyin/default.nix | 2 +- pkgs/development/libraries/libplist/default.nix | 2 -- pkgs/development/libraries/libproxy/default.nix | 2 +- .../libraries/libpwquality/default.nix | 4 ++-- pkgs/development/libraries/libqtav/default.nix | 2 +- pkgs/development/libraries/libraw/default.nix | 2 +- pkgs/development/libraries/librdf/default.nix | 2 +- pkgs/development/libraries/libre/default.nix | 2 +- .../libraries/librealsense/default.nix | 2 +- pkgs/development/libraries/librem/default.nix | 2 +- pkgs/development/libraries/librep/default.nix | 2 +- pkgs/development/libraries/libressl/default.nix | 4 ++-- pkgs/development/libraries/librsync/default.nix | 2 +- pkgs/development/libraries/libscrypt/default.nix | 2 +- pkgs/development/libraries/libsearpc/default.nix | 2 +- .../development/libraries/libseccomp/default.nix | 2 +- .../libraries/libsidplayfp/default.nix | 3 +-- pkgs/development/libraries/libsieve/default.nix | 2 +- pkgs/development/libraries/libsixel/default.nix | 2 +- pkgs/development/libraries/libskk/default.nix | 2 +- pkgs/development/libraries/libsmi/default.nix | 4 ++-- pkgs/development/libraries/libsolv/default.nix | 2 +- .../development/libraries/libsoundio/default.nix | 2 +- pkgs/development/libraries/libsoup/default.nix | 3 +-- pkgs/development/libraries/libspiro/default.nix | 4 ++-- pkgs/development/libraries/libsrs2/default.nix | 2 +- .../development/libraries/libstrophe/default.nix | 2 +- pkgs/development/libraries/libsvm/default.nix | 2 +- pkgs/development/libraries/libtap/default.nix | 4 ++-- pkgs/development/libraries/libtar/default.nix | 2 +- pkgs/development/libraries/libtcod/default.nix | 2 +- pkgs/development/libraries/libtelnet/default.nix | 2 +- .../development/libraries/libtermkey/default.nix | 2 +- pkgs/development/libraries/libtiff/default.nix | 2 +- .../libraries/libtomcrypt/default.nix | 2 +- .../development/libraries/libtommath/default.nix | 2 +- pkgs/development/libraries/libuecc/default.nix | 2 +- pkgs/development/libraries/libunarr/default.nix | 2 +- .../libraries/libunibreak/default.nix | 4 ++-- pkgs/development/libraries/libunique/3.x.nix | 2 +- .../libraries/libunistring/default.nix | 4 ++-- pkgs/development/libraries/libunwind/default.nix | 4 ++-- pkgs/development/libraries/liburcu/default.nix | 2 +- pkgs/development/libraries/liburing/default.nix | 2 +- .../development/libraries/libusbmuxd/default.nix | 2 -- .../libraries/libutempter/default.nix | 2 +- .../libraries/libva-utils/default.nix | 2 +- pkgs/development/libraries/libva/1.0.0.nix | 4 ++-- .../libraries/libvdpau-va-gl/default.nix | 2 +- pkgs/development/libraries/libvdpau/default.nix | 4 ++-- pkgs/development/libraries/libvirt/default.nix | 4 ++-- pkgs/development/libraries/libvisio/default.nix | 4 ++-- pkgs/development/libraries/libvmi/default.nix | 2 +- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libwacom/default.nix | 2 +- pkgs/development/libraries/libwebp/default.nix | 4 ++-- .../libraries/libwebsockets/default.nix | 2 +- .../libraries/libwhereami/default.nix | 2 +- pkgs/development/libraries/libwps/default.nix | 4 ++-- pkgs/development/libraries/libx86/default.nix | 4 ++-- pkgs/development/libraries/libx86emu/default.nix | 2 +- pkgs/development/libraries/libxcomp/default.nix | 2 +- pkgs/development/libraries/libxls/default.nix | 2 +- pkgs/development/libraries/libxml2/default.nix | 4 ++-- pkgs/development/libraries/libxmlb/default.nix | 2 +- pkgs/development/libraries/libxnd/default.nix | 2 +- pkgs/development/libraries/libxslt/default.nix | 3 +-- .../libraries/libyaml-cpp/default.nix | 2 +- pkgs/development/libraries/libytnef/default.nix | 2 +- pkgs/development/libraries/libzdb/default.nix | 2 +- pkgs/development/libraries/libzen/default.nix | 2 +- pkgs/development/libraries/libzip/default.nix | 4 ++-- pkgs/development/libraries/libzmf/default.nix | 3 +-- pkgs/development/libraries/lightning/default.nix | 4 ++-- .../libraries/lightstep-tracer-cpp/default.nix | 2 +- pkgs/development/libraries/linbox/default.nix | 1 - .../libraries/linenoise-ng/default.nix | 2 +- pkgs/development/libraries/linenoise/default.nix | 2 +- .../development/libraries/liquid-dsp/default.nix | 2 +- pkgs/development/libraries/live555/default.nix | 2 +- pkgs/development/libraries/lmdb/default.nix | 2 +- pkgs/development/libraries/lmdbxx/default.nix | 2 +- pkgs/development/libraries/loadcaffe/default.nix | 2 +- pkgs/development/libraries/log4cxx/default.nix | 4 ++-- pkgs/development/libraries/log4shib/default.nix | 2 +- pkgs/development/libraries/loki/default.nix | 2 +- pkgs/development/libraries/loudmouth/default.nix | 4 ++-- pkgs/development/libraries/lucene++/default.nix | 2 +- pkgs/development/libraries/mac/default.nix | 2 +- pkgs/development/libraries/mailcore2/default.nix | 2 +- pkgs/development/libraries/mapnik/default.nix | 2 +- pkgs/development/libraries/martyr/default.nix | 4 ++-- pkgs/development/libraries/mbedtls/default.nix | 4 ++-- pkgs/development/libraries/medfile/default.nix | 2 +- .../libraries/mediastreamer/msopenh264.nix | 2 +- pkgs/development/libraries/mesa-glu/default.nix | 4 ++-- .../libraries/microsoft_gsl/default.nix | 2 +- pkgs/development/libraries/mimetic/default.nix | 1 - pkgs/development/libraries/miniball/default.nix | 2 +- pkgs/development/libraries/minixml/default.nix | 2 +- pkgs/development/libraries/mlt/default.nix | 2 +- pkgs/development/libraries/mlt/qt-5.nix | 2 +- pkgs/development/libraries/mongoc/default.nix | 2 +- .../libraries/mono-addins/default.nix | 2 +- .../libraries/mono-zeroconf/default.nix | 2 +- pkgs/development/libraries/motif/default.nix | 4 ++-- pkgs/development/libraries/movit/default.nix | 4 ++-- pkgs/development/libraries/mpfi/default.nix | 2 +- pkgs/development/libraries/mpfr/default.nix | 4 ++-- pkgs/development/libraries/mpich/default.nix | 2 +- pkgs/development/libraries/mpir/default.nix | 2 +- pkgs/development/libraries/mps/default.nix | 2 +- pkgs/development/libraries/msgpuck/default.nix | 2 +- pkgs/development/libraries/mtxclient/default.nix | 2 +- pkgs/development/libraries/muparser/default.nix | 2 +- pkgs/development/libraries/mygui/default.nix | 2 +- pkgs/development/libraries/nanoflann/default.nix | 2 +- pkgs/development/libraries/nanomsg/default.nix | 2 +- pkgs/development/libraries/nco/default.nix | 2 +- pkgs/development/libraries/neon/0.29.nix | 4 ++-- pkgs/development/libraries/neon/default.nix | 4 ++-- .../libraries/netcdf-cxx4/default.nix | 2 +- .../libraries/netcdf-fortran/default.nix | 2 +- .../libraries/notify-sharp/default.nix | 2 +- pkgs/development/libraries/npapi-sdk/default.nix | 4 ++-- pkgs/development/libraries/nss/default.nix | 4 ++-- pkgs/development/libraries/ntbtls/default.nix | 2 +- pkgs/development/libraries/ntl/default.nix | 4 ++-- pkgs/development/libraries/nuspell/default.nix | 2 +- .../libraries/nvidia-texture-tools/default.nix | 2 +- pkgs/development/libraries/ocl-icd/default.nix | 4 ++-- pkgs/development/libraries/ode/default.nix | 2 +- pkgs/development/libraries/odpic/default.nix | 2 +- pkgs/development/libraries/ogre/1.9.x.nix | 1 - pkgs/development/libraries/ogre/default.nix | 2 +- pkgs/development/libraries/ogrepaged/default.nix | 2 +- pkgs/development/libraries/ois/default.nix | 2 +- pkgs/development/libraries/olm/default.nix | 4 ++-- pkgs/development/libraries/oniguruma/default.nix | 2 +- pkgs/development/libraries/opae/default.nix | 2 +- .../libraries/openal-soft/default.nix | 4 ++-- pkgs/development/libraries/openbabel/default.nix | 2 +- pkgs/development/libraries/openbr/default.nix | 2 +- pkgs/development/libraries/openbsm/default.nix | 3 +-- .../libraries/opencl-clhpp/default.nix | 2 +- .../libraries/opencollada/default.nix | 2 +- .../libraries/opencolorio/default.nix | 2 +- pkgs/development/libraries/opencsg/default.nix | 2 +- pkgs/development/libraries/openct/default.nix | 4 ++-- pkgs/development/libraries/opencv/3.x.nix | 2 +- pkgs/development/libraries/opencv/4.x.nix | 2 +- pkgs/development/libraries/opencv/default.nix | 2 +- pkgs/development/libraries/opendht/default.nix | 2 +- pkgs/development/libraries/opendkim/default.nix | 4 ++-- pkgs/development/libraries/openexr/default.nix | 4 ++-- .../libraries/openexrid-unstable/default.nix | 2 +- pkgs/development/libraries/openfst/default.nix | 3 +-- pkgs/development/libraries/openfx/default.nix | 2 +- pkgs/development/libraries/openh264/default.nix | 2 +- pkgs/development/libraries/openpa/default.nix | 3 +-- pkgs/development/libraries/openpam/default.nix | 4 ++-- .../libraries/opensaml-cpp/default.nix | 2 +- pkgs/development/libraries/openssl/chacha.nix | 2 +- .../development/libraries/opensubdiv/default.nix | 2 +- .../libraries/opentracing-cpp/default.nix | 2 +- pkgs/development/libraries/openvdb/default.nix | 2 +- pkgs/development/libraries/openwsman/default.nix | 2 +- .../libraries/oracle-instantclient/default.nix | 6 +++--- pkgs/development/libraries/osip/default.nix | 2 +- .../libraries/osm-gps-map/default.nix | 2 +- pkgs/development/libraries/pagmo2/default.nix | 2 +- pkgs/development/libraries/pangolin/default.nix | 2 +- pkgs/development/libraries/partio/default.nix | 2 +- .../development/libraries/pcaudiolib/default.nix | 2 +- pkgs/development/libraries/pcg-c/default.nix | 4 ++-- pkgs/development/libraries/pcre2/default.nix | 4 ++-- pkgs/development/libraries/phash/default.nix | 1 - .../libraries/physics/apfel/default.nix | 2 +- .../libraries/physics/apfelgrid/default.nix | 2 +- .../libraries/physics/applgrid/default.nix | 4 ++-- .../libraries/physics/cernlib/default.nix | 2 +- .../libraries/physics/fastjet/default.nix | 2 +- .../libraries/physics/fastnlo/default.nix | 4 ++-- .../libraries/physics/geant4/default.nix | 2 +- .../libraries/physics/geant4/g4py/default.nix | 2 +- .../libraries/physics/hepmc2/default.nix | 2 +- .../libraries/physics/hepmc3/default.nix | 2 +- .../libraries/physics/herwig/default.nix | 2 +- .../libraries/physics/hoppet/default.nix | 4 ++-- .../libraries/physics/lhapdf/default.nix | 2 +- .../libraries/physics/mcgrid/default.nix | 4 ++-- .../libraries/physics/mela/default.nix | 2 +- .../libraries/physics/nlojet/default.nix | 2 +- .../libraries/physics/pythia/default.nix | 2 +- .../libraries/physics/qcdnum/default.nix | 2 +- .../libraries/physics/rivet/default.nix | 2 +- .../libraries/physics/thepeg/default.nix | 2 +- .../libraries/physics/yoda/default.nix | 2 +- pkgs/development/libraries/pixman/default.nix | 4 ++-- .../libraries/pkcs11helper/default.nix | 4 ++-- pkgs/development/libraries/pmdk/default.nix | 2 +- pkgs/development/libraries/png++/default.nix | 2 +- pkgs/development/libraries/poco/default.nix | 4 ++-- pkgs/development/libraries/podofo/default.nix | 4 ++-- pkgs/development/libraries/portmidi/default.nix | 2 +- pkgs/development/libraries/protozero/default.nix | 2 +- pkgs/development/libraries/pugixml/default.nix | 2 +- pkgs/development/libraries/pupnp/default.nix | 2 +- pkgs/development/libraries/pybind11/default.nix | 2 +- pkgs/development/libraries/python-qt/default.nix | 2 +- pkgs/development/libraries/qca2/default.nix | 2 +- pkgs/development/libraries/qjson/default.nix | 2 +- .../libraries/qmltermwidget/default.nix | 2 +- .../libraries/qt-mobility/default.nix | 2 +- .../libraries/qtinstaller/default.nix | 2 +- pkgs/development/libraries/quesoglc/default.nix | 3 +-- pkgs/development/libraries/quickder/default.nix | 1 - pkgs/development/libraries/qxt/default.nix | 2 +- .../development/libraries/rabbitmq-c/default.nix | 2 +- pkgs/development/libraries/range-v3/default.nix | 2 +- .../development/libraries/rapidcheck/default.nix | 2 +- pkgs/development/libraries/rapidjson/default.nix | 2 +- pkgs/development/libraries/rapidxml/default.nix | 3 +-- pkgs/development/libraries/rdkafka/default.nix | 2 +- pkgs/development/libraries/re2/default.nix | 2 +- pkgs/development/libraries/readline/7.0.nix | 2 +- pkgs/development/libraries/readline/8.0.nix | 2 +- pkgs/development/libraries/rep-gtk/default.nix | 2 +- pkgs/development/libraries/rote/default.nix | 4 ++-- pkgs/development/libraries/safefile/default.nix | 3 +-- .../development/libraries/sblim-sfcc/default.nix | 2 +- .../libraries/science/benchmark/papi/default.nix | 2 +- .../libraries/science/biology/htslib/default.nix | 3 +-- .../libraries/science/biology/mirtk/default.nix | 2 +- .../science/math/QuadProgpp/default.nix | 2 +- .../libraries/science/math/blas/default.nix | 4 ++-- .../libraries/science/math/brial/default.nix | 2 +- .../libraries/science/math/caffe2/default.nix | 2 +- .../science/math/cholmod-extra/default.nix | 2 -- .../libraries/science/math/clblas/default.nix | 2 +- .../libraries/science/math/cliquer/default.nix | 2 +- .../libraries/science/math/ecos/default.nix | 2 +- .../libraries/science/math/flintqs/default.nix | 1 - .../libraries/science/math/ipopt/default.nix | 2 +- .../libraries/science/math/lcalc/default.nix | 1 - .../science/math/libbraiding/default.nix | 2 +- .../libraries/science/math/libhomfly/default.nix | 2 +- .../libraries/science/math/lrs/default.nix | 1 - .../libraries/science/math/m4ri/default.nix | 2 +- .../libraries/science/math/m4rie/default.nix | 2 +- .../libraries/science/math/openblas/default.nix | 2 +- .../libraries/science/math/openlibm/default.nix | 2 +- .../libraries/science/math/or-tools/default.nix | 2 +- .../libraries/science/math/parmetis/default.nix | 2 +- .../libraries/science/math/petsc/default.nix | 2 +- .../libraries/science/math/planarity/default.nix | 1 - .../science/math/primesieve/default.nix | 2 +- .../libraries/science/math/rankwidth/default.nix | 1 - .../libraries/science/math/rubiks/default.nix | 1 - .../libraries/science/math/scalapack/default.nix | 2 +- .../libraries/science/math/scs/default.nix | 2 +- .../libraries/science/math/suitesparse/4.2.nix | 2 +- .../libraries/science/math/superlu/default.nix | 2 +- .../libraries/science/math/sympow/default.nix | 2 +- .../libraries/science/math/zn_poly/default.nix | 1 - .../science/robotics/ispike/default.nix | 4 ++-- .../libraries/scriptaculous/default.nix | 2 +- pkgs/development/libraries/serd/default.nix | 4 ++-- pkgs/development/libraries/sfsexp/default.nix | 2 +- .../libraries/shibboleth-sp/default.nix | 2 +- .../libraries/silgraphite/graphite2.nix | 2 +- pkgs/development/libraries/simpleitk/default.nix | 1 - .../libraries/smarty3-i18n/default.nix | 2 +- pkgs/development/libraries/smarty3/default.nix | 2 +- pkgs/development/libraries/snappy/default.nix | 2 +- pkgs/development/libraries/sonic/default.nix | 2 +- pkgs/development/libraries/sord/default.nix | 4 ++-- pkgs/development/libraries/spandsp/default.nix | 2 +- pkgs/development/libraries/spdk/default.nix | 2 +- pkgs/development/libraries/speechd/default.nix | 4 ++-- .../libraries/spirv-headers/default.nix | 2 +- pkgs/development/libraries/sqlcipher/default.nix | 2 +- pkgs/development/libraries/sqlite/analyzer.nix | 2 +- pkgs/development/libraries/sqlite/default.nix | 2 +- pkgs/development/libraries/sqlite/sqlar.nix | 2 +- pkgs/development/libraries/srtp/default.nix | 2 +- pkgs/development/libraries/stb/default.nix | 2 +- pkgs/development/libraries/strigi/default.nix | 4 ++-- pkgs/development/libraries/stxxl/default.nix | 2 +- pkgs/development/libraries/subunit/default.nix | 4 ++-- pkgs/development/libraries/svrcore/default.nix | 4 ++-- pkgs/development/libraries/swiften/default.nix | 2 +- pkgs/development/libraries/sword/default.nix | 4 ++-- pkgs/development/libraries/symengine/default.nix | 2 +- pkgs/development/libraries/szip/default.nix | 2 +- pkgs/development/libraries/tachyon/default.nix | 4 ++-- .../libraries/taglib-sharp/default.nix | 2 +- pkgs/development/libraries/tbb/default.nix | 2 +- pkgs/development/libraries/tcllib/default.nix | 2 +- pkgs/development/libraries/tcltls/default.nix | 2 +- pkgs/development/libraries/termbox/default.nix | 2 +- pkgs/development/libraries/theft/default.nix | 2 +- pkgs/development/libraries/thrift/default.nix | 4 ++-- pkgs/development/libraries/tinyxml-2/default.nix | 2 +- pkgs/development/libraries/tix/default.nix | 2 +- pkgs/development/libraries/tnt/default.nix | 2 +- pkgs/development/libraries/tntdb/default.nix | 4 ++-- pkgs/development/libraries/tntnet/default.nix | 4 ++-- .../development/libraries/torch-hdf5/default.nix | 2 +- pkgs/development/libraries/torch/default.nix | 2 +- .../libraries/trompeloeil/default.nix | 2 +- pkgs/development/libraries/tsocks/default.nix | 4 ++-- pkgs/development/libraries/twolame/default.nix | 2 +- pkgs/development/libraries/udns/default.nix | 4 ++-- pkgs/development/libraries/udunits/default.nix | 2 +- pkgs/development/libraries/uhttpmock/default.nix | 2 +- pkgs/development/libraries/umockdev/default.nix | 2 +- pkgs/development/libraries/unibilium/default.nix | 2 +- pkgs/development/libraries/unicap/default.nix | 4 ++-- .../libraries/unicorn-emu/default.nix | 2 +- .../libraries/unittest-cpp/default.nix | 2 +- pkgs/development/libraries/unixODBC/default.nix | 4 ++-- .../libraries/unixODBCDrivers/default.nix | 16 ++++++++-------- pkgs/development/libraries/uriparser/default.nix | 4 ++-- pkgs/development/libraries/usbredir/default.nix | 4 ++-- pkgs/development/libraries/ustr/default.nix | 4 ++-- pkgs/development/libraries/v8/3.14.nix | 2 +- pkgs/development/libraries/v8/3.16.14.nix | 4 ++-- pkgs/development/libraries/v8/5_x.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/libraries/v8/plv8_6_x.nix | 2 +- .../libraries/vaapi-intel-hybrid/default.nix | 2 +- .../libraries/vaapi-intel/default.nix | 2 +- .../libraries/vapoursynth-mvtools/default.nix | 2 +- pkgs/development/libraries/vc/0.7.nix | 2 +- pkgs/development/libraries/vc/default.nix | 2 +- pkgs/development/libraries/vcg/default.nix | 2 +- pkgs/development/libraries/vid-stab/default.nix | 2 +- pkgs/development/libraries/vigra/default.nix | 2 +- .../libraries/virglrenderer/default.nix | 4 ++-- pkgs/development/libraries/vmime/default.nix | 2 +- pkgs/development/libraries/vmmlib/default.nix | 2 +- pkgs/development/libraries/vrb/default.nix | 4 ++-- pkgs/development/libraries/vsqlite/default.nix | 2 +- .../libraries/vulkan-headers/default.nix | 2 +- .../libraries/vulkan-loader/default.nix | 2 +- pkgs/development/libraries/wavpack/default.nix | 4 ++-- pkgs/development/libraries/wayland/1.9.nix | 4 ++-- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- pkgs/development/libraries/wcslib/default.nix | 4 ++-- pkgs/development/libraries/webkitgtk/2.4.nix | 4 ++-- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- .../libraries/websocket++/default.nix | 2 +- .../development/libraries/wiredtiger/default.nix | 2 +- pkgs/development/libraries/wolfssl/default.nix | 2 +- pkgs/development/libraries/wxSVG/default.nix | 2 +- pkgs/development/libraries/wxsqlite3/default.nix | 2 +- .../libraries/wxsqliteplus/default.nix | 2 +- .../libraries/wxwidgets/2.8/default.nix | 2 +- .../libraries/wxwidgets/3.0/default.nix | 2 +- pkgs/development/libraries/wxwidgets/3.0/mac.nix | 2 +- .../libraries/wxwidgets/3.1/default.nix | 2 +- pkgs/development/libraries/x265/default.nix | 2 +- pkgs/development/libraries/xalanc/default.nix | 2 +- .../libraries/xapian/tools/omega/default.nix | 2 +- pkgs/development/libraries/xavs/default.nix | 2 +- .../libraries/xcb-util-cursor/HEAD.nix | 2 +- pkgs/development/libraries/xercesc/default.nix | 4 ++-- pkgs/development/libraries/xgboost/default.nix | 2 +- pkgs/development/libraries/xlslib/default.nix | 2 +- .../libraries/xml-security-c/default.nix | 4 ++-- .../libraries/xml-tooling-c/default.nix | 2 +- pkgs/development/libraries/xsd/default.nix | 2 +- pkgs/development/libraries/xvidcore/default.nix | 4 ++-- pkgs/development/libraries/xxHash/default.nix | 2 +- pkgs/development/libraries/xylib/default.nix | 4 ++-- pkgs/development/libraries/zeroc-ice/default.nix | 2 +- pkgs/development/libraries/zeromq/4.x.nix | 2 +- pkgs/development/libraries/zimlib/default.nix | 4 ++-- pkgs/development/libraries/zlog/default.nix | 4 ++-- pkgs/development/libraries/zmqpp/default.nix | 2 +- pkgs/development/libraries/zxcvbn-c/default.nix | 2 +- pkgs/development/libraries/zziplib/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 4 ++-- pkgs/development/misc/amdadl-sdk/default.nix | 2 +- pkgs/development/mobile/adb-sync/default.nix | 2 +- .../mobile/adbfs-rootless/default.nix | 2 +- .../development/mobile/imgpatchtools/default.nix | 2 +- pkgs/development/mobile/webos/cmake-modules.nix | 2 +- pkgs/development/mobile/webos/novacom.nix | 2 +- pkgs/development/mobile/webos/novacomd.nix | 2 +- .../development/ocaml-modules/camomile/0.8.2.nix | 2 +- .../development/ocaml-modules/camomile/0.8.5.nix | 2 +- pkgs/development/ocaml-modules/cow/default.nix | 2 +- .../ocaml-modules/cryptgps/default.nix | 2 +- .../ocaml-modules/cryptokit/default.nix | 2 +- .../development/ocaml-modules/curses/default.nix | 2 +- pkgs/development/ocaml-modules/eliom/default.nix | 1 - pkgs/development/ocaml-modules/higlo/default.nix | 2 +- .../ocaml-modules/lablgtk/default.nix | 2 +- .../ocaml-modules/lambda-term/1.6.nix | 2 +- .../ocaml-modules/ocaml-libvirt/default.nix | 2 +- .../ocaml-modules/ocaml-text/default.nix | 2 +- .../ocaml-modules/ocamlfuse/default.nix | 2 +- .../ocaml-modules/ocamlgraph/default.nix | 2 +- .../ocaml-modules/ocamlnat/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocf/default.nix | 2 +- .../ocaml-modules/ocsigen-server/default.nix | 2 +- .../ocaml-modules/piqi-ocaml/default.nix | 2 +- pkgs/development/ocaml-modules/piqi/default.nix | 2 +- .../ocaml-modules/sqlite3/default.nix | 2 +- pkgs/development/ocaml-modules/uuidm/default.nix | 2 +- pkgs/development/pharo/launcher/default.nix | 2 +- pkgs/development/pharo/vm/share.nix | 2 +- .../python-modules/augeas/default.nix | 1 - .../python-modules/binwalk/default.nix | 2 +- .../python-modules/blockdiag/default.nix | 1 - .../python-modules/bottleneck/default.nix | 1 - .../python-modules/btchip/default.nix | 1 - .../python-modules/cgroup-utils/default.nix | 1 - .../python-modules/cx_freeze/default.nix | 1 - .../development/python-modules/cymem/default.nix | 1 - pkgs/development/python-modules/django/1_8.nix | 4 ++-- pkgs/development/python-modules/dyn/default.nix | 1 - .../python-modules/edward/default.nix | 1 - .../development/python-modules/first/default.nix | 1 - .../python-modules/geopandas/default.nix | 1 - .../python-modules/glances/default.nix | 2 +- pkgs/development/python-modules/gpy/default.nix | 1 - .../python-modules/hcs_utils/default.nix | 1 - .../python-modules/hmmlearn/default.nix | 3 +-- .../python-modules/hoomd-blue/default.nix | 2 +- .../python-modules/ldappool/default.nix | 2 +- .../python-modules/libgpuarray/default.nix | 1 - .../python-modules/libsoundtouch/default.nix | 1 - .../python-modules/llfuse/default.nix | 3 +-- .../python-modules/mps-youtube/default.nix | 2 +- .../python-modules/nilearn/default.nix | 1 - .../python-modules/notify/default.nix | 2 +- .../python-modules/nwdiag/default.nix | 3 +-- .../development/python-modules/ovito/default.nix | 2 +- .../python-modules/paramz/default.nix | 1 - .../python-modules/passlib/default.nix | 1 - .../python-modules/pathspec/default.nix | 1 - .../python-modules/powerline/default.nix | 3 +-- .../python-modules/pyGithub/default.nix | 1 - .../python-modules/pyblock/default.nix | 4 ++-- .../python-modules/pycuda/compyte.nix | 1 - pkgs/development/python-modules/pyev/default.nix | 3 +-- .../python-modules/pyftgl/default.nix | 3 +-- .../python-modules/pygobject/default.nix | 5 ++--- .../python-modules/pygtksourceview/default.nix | 1 - .../python-modules/pykde4/default.nix | 4 ++-- .../python-modules/pykde4/kdelibs.nix | 4 ++-- .../python-modules/pylibacl/default.nix | 1 - .../development/python-modules/pyocr/default.nix | 1 - .../python-modules/pyparted/default.nix | 2 +- .../python-modules/pypillowfight/default.nix | 2 +- .../development/python-modules/pyro4/default.nix | 2 -- .../python-modules/python-efl/default.nix | 4 ++-- .../python-modules/python_fedora/default.nix | 1 - .../python-modules/pyxattr/default.nix | 1 - .../python-modules/qscintilla/default.nix | 2 +- .../recursive-pth-loader/default.nix | 1 - .../robotframework-ride/default.nix | 3 +-- pkgs/development/python-modules/rpkg/default.nix | 3 +-- .../python-modules/selectors34/default.nix | 2 -- .../python-modules/seqdiag/default.nix | 3 +-- .../python-modules/serpent/default.nix | 2 -- .../python-modules/smugline/default.nix | 1 - .../python-modules/smugpy/default.nix | 1 - .../python-modules/sphfile/default.nix | 3 +-- .../python-modules/spotipy/default.nix | 1 - .../python-modules/sybase/default.nix | 3 +-- .../python-modules/systemd/default.nix | 1 - .../python-modules/tempita/default.nix | 2 +- .../python-modules/torchvision/default.nix | 1 - .../python-modules/umemcache/default.nix | 3 +-- .../python-modules/unicorn/default.nix | 1 - .../python-modules/uritools/default.nix | 1 - .../python-modules/urlgrabber/default.nix | 1 - .../python-modules/usbtmc/default.nix | 1 - pkgs/development/python-modules/wxPython/3.0.nix | 1 - pkgs/development/tools/ammonite/default.nix | 2 +- .../tools/analysis/autoflake/default.nix | 1 - .../tools/analysis/checkstyle/default.nix | 2 +- .../tools/analysis/clang-analyzer/default.nix | 2 +- pkgs/development/tools/analysis/coan/default.nix | 4 ++-- .../tools/analysis/cov-build/default.nix | 2 +- .../tools/analysis/cppcheck/default.nix | 3 +-- .../development/tools/analysis/eresi/default.nix | 2 +- .../tools/analysis/evmdis/default.nix | 2 +- .../tools/analysis/frama-c/default.nix | 2 +- .../analysis/include-what-you-use/default.nix | 4 ++-- .../tools/analysis/jdepend/default.nix | 4 ++-- pkgs/development/tools/analysis/kcov/default.nix | 2 +- .../tools/analysis/massif-visualizer/default.nix | 4 ++-- .../tools/analysis/randoop/default.nix | 4 ++-- .../tools/analysis/retdec/default.nix | 2 +- .../tools/analysis/retdec/yaracpp.nix | 2 +- pkgs/development/tools/analysis/rr/default.nix | 2 +- .../tools/analysis/snowman/default.nix | 2 +- pkgs/development/tools/analysis/spin/default.nix | 2 +- pkgs/development/tools/apktool/default.nix | 2 +- pkgs/development/tools/asmfmt/default.nix | 2 +- pkgs/development/tools/avro-tools/default.nix | 10 +++++----- pkgs/development/tools/azcopy/default.nix | 2 +- pkgs/development/tools/bloaty/default.nix | 2 +- pkgs/development/tools/boomerang/default.nix | 2 +- pkgs/development/tools/boost-build/default.nix | 2 +- .../tools/build-managers/arpa2cm/default.nix | 1 - .../tools/build-managers/bam/default.nix | 2 +- .../tools/build-managers/bazel/0.4.nix | 2 +- .../build-managers/bazel/buildtools/default.nix | 2 +- .../tools/build-managers/bear/default.nix | 2 +- .../tools/build-managers/bmake/default.nix | 4 ++-- .../tools/build-managers/boot/default.nix | 2 +- .../tools/build-managers/colormake/default.nix | 2 +- .../tools/build-managers/dub/default.nix | 2 +- .../tools/build-managers/gn/default.nix | 2 +- .../tools/build-managers/gup/default.nix | 2 +- .../tools/build-managers/icmake/default.nix | 2 +- .../tools/build-managers/kati/default.nix | 2 +- .../tools/build-managers/leiningen/default.nix | 5 ++--- .../tools/build-managers/mill/default.nix | 2 +- .../tools/build-managers/ninja/default.nix | 2 +- .../tools/build-managers/qbs/default.nix | 2 +- .../build-managers/redo-apenwarr/default.nix | 2 +- .../tools/build-managers/redo-sh/default.nix | 2 +- .../tools/build-managers/remake/default.nix | 2 +- .../tools/build-managers/sbt/default.nix | 4 ++-- .../tools/build-managers/shards/default.nix | 2 +- .../tools/build-managers/tup/default.nix | 2 +- .../tools/build-managers/waf/default.nix | 4 ++-- pkgs/development/tools/cask/default.nix | 2 +- pkgs/development/tools/check/default.nix | 2 +- .../tools/cloudfoundry-cli/default.nix | 2 +- .../development/tools/compile-daemon/default.nix | 2 +- .../default.nix | 2 +- .../continuous-integration/cide/default.nix | 4 ++-- .../continuous-integration/drone-cli/default.nix | 2 +- .../continuous-integration/drone/default.nix | 2 +- .../gitlab-runner/default.nix | 2 +- .../continuous-integration/jenkins/default.nix | 2 +- pkgs/development/tools/coursier/default.nix | 2 +- pkgs/development/tools/cppclean/default.nix | 2 +- .../tools/database/dbmate/default.nix | 2 +- .../tools/database/ephemeralpg/default.nix | 4 ++-- .../tools/database/liquibase/default.nix | 7 +++---- .../tools/database/schemaspy/default.nix | 8 ++++---- .../development/tools/database/shmig/default.nix | 2 +- .../tools/database/sqlcheck/default.nix | 2 +- .../tools/database/sqldeveloper/18.2.nix | 2 +- .../tools/database/sqldeveloper/default.nix | 2 +- pkgs/development/tools/dcadec/default.nix | 1 - pkgs/development/tools/deadcode/default.nix | 2 +- pkgs/development/tools/deis/default.nix | 2 +- pkgs/development/tools/deisctl/default.nix | 2 +- pkgs/development/tools/delve/default.nix | 2 +- pkgs/development/tools/dep/default.nix | 2 +- pkgs/development/tools/devpi-client/default.nix | 1 - pkgs/development/tools/devtodo/default.nix | 4 ++-- pkgs/development/tools/doctl/default.nix | 2 +- pkgs/development/tools/drip/default.nix | 1 - pkgs/development/tools/dtools/default.nix | 2 +- pkgs/development/tools/easyjson/default.nix | 2 +- pkgs/development/tools/ejson/default.nix | 2 +- pkgs/development/tools/erlang/cuter/default.nix | 2 +- pkgs/development/tools/errcheck/default.nix | 2 +- pkgs/development/tools/fac/default.nix | 2 +- pkgs/development/tools/flock/default.nix | 1 - pkgs/development/tools/fmbt/default.nix | 2 +- .../development/tools/fusee-launcher/default.nix | 2 +- pkgs/development/tools/galen/default.nix | 1 - .../development/tools/gamecube-tools/default.nix | 2 +- pkgs/development/tools/gauge/default.nix | 2 +- pkgs/development/tools/gdm/default.nix | 2 +- pkgs/development/tools/git-ftp/default.nix | 2 +- .../tools/git-quick-stats/default.nix | 2 +- pkgs/development/tools/github/cligh/default.nix | 2 +- pkgs/development/tools/glide/default.nix | 2 +- pkgs/development/tools/gllvm/default.nix | 2 +- .../tools/global-platform-pro/default.nix | 3 +-- pkgs/development/tools/glock/default.nix | 2 +- pkgs/development/tools/glslviewer/default.nix | 2 +- .../tools/gnome-desktop-testing/default.nix | 2 +- .../tools/go-bindata-assetfs/default.nix | 2 +- pkgs/development/tools/go-bindata/default.nix | 2 +- .../tools/go-junit-report/default.nix | 2 +- pkgs/development/tools/go-motion/default.nix | 2 +- pkgs/development/tools/go-outline/default.nix | 2 +- pkgs/development/tools/go-protobuf/default.nix | 2 +- pkgs/development/tools/go-repo-root/default.nix | 2 +- pkgs/development/tools/go-symbols/default.nix | 2 +- pkgs/development/tools/go2nix/default.nix | 2 +- pkgs/development/tools/goa/default.nix | 2 +- pkgs/development/tools/gocode-gomod/default.nix | 2 +- pkgs/development/tools/gocode/default.nix | 2 +- pkgs/development/tools/goconst/default.nix | 2 +- pkgs/development/tools/goconvey/default.nix | 2 +- pkgs/development/tools/gocyclo/default.nix | 2 +- pkgs/development/tools/godef/default.nix | 2 +- pkgs/development/tools/godot/default.nix | 2 +- pkgs/development/tools/gogetdoc/default.nix | 2 +- pkgs/development/tools/golangci-lint/default.nix | 2 +- pkgs/development/tools/golint/default.nix | 2 +- pkgs/development/tools/gometalinter/default.nix | 2 +- pkgs/development/tools/gomodifytags/default.nix | 2 +- .../tools/google-app-engine-go-sdk/default.nix | 2 +- pkgs/development/tools/gopkgs/default.nix | 2 +- pkgs/development/tools/gosec/default.nix | 2 +- pkgs/development/tools/gotags/default.nix | 2 +- pkgs/development/tools/gotests/default.nix | 2 +- pkgs/development/tools/gotools/default.nix | 2 +- pkgs/development/tools/govendor/default.nix | 2 +- pkgs/development/tools/govers/default.nix | 2 +- pkgs/development/tools/gox/default.nix | 2 +- pkgs/development/tools/gpp/default.nix | 2 +- pkgs/development/tools/gron/default.nix | 2 +- .../tools/gtk-mac-bundler/default.nix | 2 +- pkgs/development/tools/guile/g-wrap/default.nix | 3 +-- .../tools/guile/guile-lint/default.nix | 6 +++--- .../tools/haskell/hyper-haskell/default.nix | 2 +- pkgs/development/tools/hexio/default.nix | 1 - pkgs/development/tools/icestorm/default.nix | 2 +- pkgs/development/tools/iferr/default.nix | 2 +- pkgs/development/tools/imatix_gsl/default.nix | 2 +- pkgs/development/tools/impl/default.nix | 2 +- pkgs/development/tools/ineffassign/default.nix | 2 +- pkgs/development/tools/interfacer/default.nix | 2 +- pkgs/development/tools/irony-server/default.nix | 2 +- pkgs/development/tools/java/cfr/default.nix | 2 +- pkgs/development/tools/java/jhiccup/default.nix | 2 +- pkgs/development/tools/java/visualvm/default.nix | 2 +- pkgs/development/tools/jbake/default.nix | 4 ++-- pkgs/development/tools/jd/default.nix | 2 +- pkgs/development/tools/jid/default.nix | 2 +- pkgs/development/tools/jmespath/default.nix | 2 +- pkgs/development/tools/jp/default.nix | 2 +- pkgs/development/tools/jq/default.nix | 2 +- pkgs/development/tools/jsduck/default.nix | 1 - pkgs/development/tools/json2hcl/default.nix | 1 - pkgs/development/tools/kafkacat/default.nix | 2 +- pkgs/development/tools/kind/default.nix | 2 +- pkgs/development/tools/ktlint/default.nix | 6 +++--- pkgs/development/tools/kube-aws/default.nix | 2 +- pkgs/development/tools/kube-prompt/default.nix | 2 +- pkgs/development/tools/kubicorn/default.nix | 2 +- pkgs/development/tools/leaps/default.nix | 2 +- .../tools/librarian-puppet-go/default.nix | 2 +- .../tools/literate-programming/nuweb/default.nix | 8 ++++---- pkgs/development/tools/makerpm/default.nix | 2 +- pkgs/development/tools/maligned/default.nix | 2 +- .../misc/abi-compliance-checker/default.nix | 2 +- .../tools/misc/abi-dumper/default.nix | 2 +- pkgs/development/tools/misc/arcanist/default.nix | 2 +- .../tools/misc/autoconf-archive/default.nix | 2 +- pkgs/development/tools/misc/autogen/default.nix | 2 +- pkgs/development/tools/misc/awf/default.nix | 2 +- pkgs/development/tools/misc/bashdb/default.nix | 4 ++-- .../tools/misc/bin_replace_string/default.nix | 2 +- pkgs/development/tools/misc/bsdbuild/default.nix | 4 ++-- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- pkgs/development/tools/misc/ccls/default.nix | 2 +- pkgs/development/tools/misc/cgdb/default.nix | 4 ++-- .../tools/misc/checkbashisms/default.nix | 2 +- pkgs/development/tools/misc/chruby/default.nix | 2 +- .../tools/misc/coccinelle/default.nix | 4 ++-- .../tools/misc/complexity/default.nix | 4 ++-- pkgs/development/tools/misc/cproto/default.nix | 2 +- pkgs/development/tools/misc/cquery/default.nix | 2 +- pkgs/development/tools/misc/csmith/default.nix | 8 ++++---- pkgs/development/tools/misc/cwebbin/default.nix | 2 +- pkgs/development/tools/misc/dfu-util/default.nix | 4 ++-- pkgs/development/tools/misc/dialog/default.nix | 6 +++--- pkgs/development/tools/misc/elfinfo/default.nix | 2 +- .../tools/misc/elfkickers/default.nix | 2 +- pkgs/development/tools/misc/elfutils/default.nix | 4 ++-- pkgs/development/tools/misc/epm/default.nix | 2 +- pkgs/development/tools/misc/fsatrace/default.nix | 8 ++++---- pkgs/development/tools/misc/fswatch/default.nix | 2 +- pkgs/development/tools/misc/gede/default.nix | 4 ++-- pkgs/development/tools/misc/global/default.nix | 4 ++-- pkgs/development/tools/misc/gpshell/default.nix | 2 +- pkgs/development/tools/misc/gputils/default.nix | 4 ++-- pkgs/development/tools/misc/hound/default.nix | 2 +- pkgs/development/tools/misc/igprof/default.nix | 2 +- .../tools/misc/inotify-tools/default.nix | 2 +- .../tools/misc/intel-gpu-tools/default.nix | 2 +- pkgs/development/tools/misc/intltool/default.nix | 4 ++-- pkgs/development/tools/misc/kdbg/default.nix | 4 ++-- pkgs/development/tools/misc/kibana/5.x.nix | 4 ++-- pkgs/development/tools/misc/loccount/default.nix | 2 +- pkgs/development/tools/misc/lsof/default.nix | 2 +- .../tools/misc/lttng-tools/default.nix | 4 ++-- .../development/tools/misc/lttng-ust/default.nix | 4 ++-- .../tools/misc/macdylibbundler/default.nix | 2 +- pkgs/development/tools/misc/md2man/default.nix | 2 +- pkgs/development/tools/misc/moby/default.nix | 2 +- pkgs/development/tools/misc/objconv/default.nix | 4 ++-- pkgs/development/tools/misc/opengrok/default.nix | 4 ++-- pkgs/development/tools/misc/openocd/default.nix | 2 +- .../development/tools/misc/patchelf/unstable.nix | 2 +- pkgs/development/tools/misc/pmccabe/default.nix | 2 +- pkgs/development/tools/misc/premake/5.nix | 2 +- pkgs/development/tools/misc/pwndbg/default.nix | 2 +- .../tools/misc/saleae-logic/default.nix | 1 - pkgs/development/tools/misc/sipp/default.nix | 2 +- pkgs/development/tools/misc/strace/default.nix | 4 ++-- pkgs/development/tools/misc/tcptrack/default.nix | 2 +- pkgs/development/tools/misc/tet/default.nix | 2 +- pkgs/development/tools/misc/texinfo/4.13a.nix | 4 ++-- pkgs/development/tools/misc/tie/default.nix | 4 ++-- pkgs/development/tools/misc/trv/default.nix | 2 +- .../tools/misc/universal-ctags/default.nix | 2 +- .../tools/misc/usb-modeswitch/data.nix | 4 ++-- .../tools/misc/usb-modeswitch/default.nix | 4 ++-- .../tools/misc/vtable-dumper/default.nix | 2 +- .../tools/misc/watson-ruby/default.nix | 2 +- pkgs/development/tools/misc/xc3sprog/default.nix | 2 +- pkgs/development/tools/misc/ycmd/default.nix | 2 +- pkgs/development/tools/misc/yodl/default.nix | 2 +- pkgs/development/tools/mod/default.nix | 2 +- pkgs/development/tools/msgpack-tools/default.nix | 2 +- pkgs/development/tools/mustache-go/default.nix | 2 +- pkgs/development/tools/node-webkit/nw12.nix | 2 +- pkgs/development/tools/nrpl/default.nix | 2 +- pkgs/development/tools/nsis/default.nix | 2 +- pkgs/development/tools/nwjs/default.nix | 2 +- pkgs/development/tools/ocaml/camlp4/default.nix | 2 +- pkgs/development/tools/ocaml/findlib/default.nix | 2 +- pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix | 2 +- .../tools/ocaml/js_of_ocaml/camlp4.nix | 2 +- .../tools/ocaml/js_of_ocaml/compiler.nix | 2 +- pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix | 2 +- .../tools/ocaml/js_of_ocaml/ocamlbuild.nix | 2 +- pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix | 2 +- .../ocaml/js_of_ocaml/ppx_deriving_json.nix | 2 +- .../tools/ocaml/js_of_ocaml/tyxml.nix | 2 +- pkgs/development/tools/ocaml/oasis/default.nix | 2 +- pkgs/development/tools/ocaml/obelisk/default.nix | 2 +- .../development/tools/ocaml/ocamlmod/default.nix | 2 +- .../tools/ocaml/ocsigen-i18n/default.nix | 1 - pkgs/development/tools/ocaml/omake/default.nix | 4 ++-- pkgs/development/tools/ocaml/opaline/default.nix | 2 +- pkgs/development/tools/ocaml/opam/1.2.2.nix | 2 +- pkgs/development/tools/ocaml/opam/default.nix | 2 +- pkgs/development/tools/ocaml/utop/default.nix | 2 +- pkgs/development/tools/omniorb/default.nix | 2 +- .../tools/omnisharp-roslyn/default.nix | 2 +- pkgs/development/tools/packer/default.nix | 2 +- pkgs/development/tools/packet/default.nix | 2 +- pkgs/development/tools/parse-cli-bin/default.nix | 2 +- pkgs/development/tools/parsing/antlr/3.4.nix | 2 +- pkgs/development/tools/parsing/byacc/default.nix | 6 +++--- pkgs/development/tools/parsing/flex/default.nix | 2 +- .../tools/parsing/flexc++/default.nix | 2 +- .../development/tools/parsing/hammer/default.nix | 2 +- pkgs/development/tools/parsing/lemon/default.nix | 2 +- pkgs/development/tools/parsing/re2c/default.nix | 2 +- pkgs/development/tools/pet/default.nix | 2 +- pkgs/development/tools/pew/default.nix | 1 - pkgs/development/tools/pgloader/default.nix | 1 - pkgs/development/tools/phantomjs2/default.nix | 2 +- .../tools/profiling/EZTrace/default.nix | 2 +- .../tools/profiling/heaptrack/default.nix | 2 +- .../tools/profiling/pprof/default.nix | 2 +- .../development/tools/protoc-gen-doc/default.nix | 2 +- pkgs/development/tools/pup/default.nix | 2 +- pkgs/development/tools/quicktemplate/default.nix | 2 +- pkgs/development/tools/rdocker/default.nix | 2 +- .../tools/react-native-debugger/default.nix | 2 +- pkgs/development/tools/reflex/default.nix | 2 +- pkgs/development/tools/reftools/default.nix | 2 +- pkgs/development/tools/reno/default.nix | 4 ++-- .../tools/repository-managers/nexus/default.nix | 4 ++-- pkgs/development/tools/richgo/default.nix | 2 +- pkgs/development/tools/ronn/default.nix | 2 +- pkgs/development/tools/rtags/default.nix | 2 +- pkgs/development/tools/rucksack/default.nix | 2 +- pkgs/development/tools/sauce-connect/default.nix | 2 +- .../tools/selenium/chromedriver/default.nix | 2 +- .../tools/selenium/htmlunit-driver/default.nix | 4 ++-- .../tools/selenium/server/default.nix | 8 ++++---- pkgs/development/tools/simavr/default.nix | 2 +- pkgs/development/tools/skaffold/default.nix | 2 +- .../tools/solarus-quest-editor/default.nix | 2 +- pkgs/development/tools/sourcetrail/default.nix | 2 +- pkgs/development/tools/spirv-tools/default.nix | 2 +- pkgs/development/tools/sqsh/default.nix | 4 ++-- pkgs/development/tools/stagit/default.nix | 2 +- pkgs/development/tools/statik/default.nix | 2 +- pkgs/development/tools/textql/default.nix | 2 +- pkgs/development/tools/thrust/default.nix | 2 +- pkgs/development/tools/toluapp/default.nix | 2 +- pkgs/development/tools/tora/default.nix | 2 +- pkgs/development/tools/toxiproxy/default.nix | 2 +- pkgs/development/tools/trellis/default.nix | 2 +- pkgs/development/tools/tychus/default.nix | 2 +- pkgs/development/tools/uftrace/default.nix | 2 +- pkgs/development/tools/unconvert/default.nix | 2 +- pkgs/development/tools/unity3d/default.nix | 2 +- pkgs/development/tools/valadoc/default.nix | 4 ++-- pkgs/development/tools/vcstool/default.nix | 1 - pkgs/development/tools/vgo2nix/default.nix | 2 +- pkgs/development/tools/vim-vint/default.nix | 2 +- pkgs/development/tools/vndr/default.nix | 2 +- pkgs/development/tools/vogl/default.nix | 2 +- .../tools/vulkan-validation-layers/default.nix | 2 +- pkgs/development/tools/vultr/default.nix | 2 +- pkgs/development/tools/wabt/default.nix | 2 +- pkgs/development/tools/watchman/default.nix | 2 +- pkgs/development/tools/wiiload/default.nix | 2 +- pkgs/development/tools/ws/default.nix | 2 +- pkgs/development/tools/xcbuild/default.nix | 2 +- pkgs/development/tools/xqilla/default.nix | 2 +- pkgs/development/tools/yaml2json/default.nix | 2 +- pkgs/development/tools/yj/default.nix | 2 +- pkgs/development/tools/yuicompressor/default.nix | 4 ++-- pkgs/development/web/csslint/default.nix | 4 ++-- pkgs/development/web/grails/default.nix | 2 +- pkgs/development/web/insomnia/default.nix | 2 +- pkgs/development/web/kcgi/default.nix | 1 - pkgs/development/web/now-cli/default.nix | 2 +- pkgs/development/web/postman/default.nix | 4 ++-- pkgs/development/web/remarkjs/default.nix | 2 +- pkgs/development/web/valum/default.nix | 2 +- pkgs/development/web/woff2/default.nix | 2 +- pkgs/development/web/xmlindent/default.nix | 4 ++-- pkgs/games/0ad/data.nix | 2 +- pkgs/games/0ad/game.nix | 2 +- pkgs/games/2048-in-terminal/default.nix | 2 +- pkgs/games/airstrike/default.nix | 2 +- pkgs/games/amoeba/data.nix | 2 +- pkgs/games/angband/default.nix | 2 +- pkgs/games/arx-libertatis/default.nix | 2 +- pkgs/games/astromenace/default.nix | 2 +- pkgs/games/atanks/default.nix | 4 ++-- pkgs/games/bastet/default.nix | 2 +- pkgs/games/blobby/default.nix | 2 +- pkgs/games/braincurses/default.nix | 2 +- pkgs/games/brogue/default.nix | 2 +- pkgs/games/bzflag/default.nix | 3 +-- pkgs/games/chessx/default.nix | 2 +- pkgs/games/ckan/default.nix | 2 +- pkgs/games/commandergenius/default.nix | 2 +- pkgs/games/construo/default.nix | 4 ++-- pkgs/games/crafty/default.nix | 2 +- pkgs/games/cutemaze/default.nix | 4 ++-- pkgs/games/cuyo/default.nix | 2 +- pkgs/games/dhewm3/default.nix | 2 +- .../dwarf-fortress/dwarf-therapist/default.nix | 2 +- pkgs/games/dwarf-fortress/soundsense.nix | 2 +- pkgs/games/dxx-rebirth/default.nix | 2 +- pkgs/games/easyrpg-player/default.nix | 2 +- pkgs/games/empty-epsilon/default.nix | 4 ++-- pkgs/games/enyo-doom/default.nix | 2 +- pkgs/games/eternity-engine/default.nix | 2 +- pkgs/games/extremetuxracer/default.nix | 2 +- pkgs/games/ezquake/default.nix | 1 - pkgs/games/fairymax/default.nix | 2 +- pkgs/games/fish-fillets-ng/default.nix | 2 +- pkgs/games/fltrator/default.nix | 2 +- pkgs/games/freecell-solver/default.nix | 4 ++-- pkgs/games/freeorion/default.nix | 2 +- pkgs/games/freesweep/default.nix | 2 +- pkgs/games/frotz/default.nix | 2 +- pkgs/games/galaxis/default.nix | 4 ++-- pkgs/games/gambatte/default.nix | 2 +- pkgs/games/garden-of-coloured-lights/default.nix | 2 +- pkgs/games/gcompris/default.nix | 2 +- pkgs/games/gcs/default.nix | 4 ++-- pkgs/games/gemrb/default.nix | 2 +- pkgs/games/gl-117/default.nix | 4 ++-- pkgs/games/gnugo/default.nix | 2 +- pkgs/games/gnujump/default.nix | 4 ++-- pkgs/games/gnushogi/default.nix | 4 ++-- pkgs/games/gtypist/default.nix | 2 +- pkgs/games/gzdoom/default.nix | 2 +- pkgs/games/hawkthorne/default.nix | 2 +- pkgs/games/hedgewars/default.nix | 2 +- pkgs/games/holdingnuts/default.nix | 3 +-- pkgs/games/hyperrogue/default.nix | 2 +- pkgs/games/instead-launcher/default.nix | 2 +- pkgs/games/ivan/default.nix | 2 +- pkgs/games/ja2-stracciatella/default.nix | 2 +- pkgs/games/klavaro/default.nix | 4 ++-- pkgs/games/lbreakout2/default.nix | 4 ++-- pkgs/games/leela-zero/default.nix | 2 +- pkgs/games/lgogdownloader/default.nix | 2 +- pkgs/games/liberal-crime-squad/default.nix | 2 +- pkgs/games/lincity/default.nix | 4 ++-- pkgs/games/lincity/ng.nix | 2 +- pkgs/games/liquidwar/5.nix | 2 +- pkgs/games/liquidwar/default.nix | 4 ++-- pkgs/games/ltris/default.nix | 4 ++-- pkgs/games/mar1d/default.nix | 2 +- pkgs/games/meritous/default.nix | 2 +- pkgs/games/minecraft-server/default.nix | 2 +- pkgs/games/mudlet/default.nix | 2 +- pkgs/games/newtonwars/default.nix | 2 +- pkgs/games/openarena/default.nix | 2 +- pkgs/games/openclonk/default.nix | 2 +- pkgs/games/opendune/default.nix | 2 +- pkgs/games/opendungeons/default.nix | 2 +- pkgs/games/openmw/default.nix | 4 ++-- pkgs/games/openrw/default.nix | 2 +- pkgs/games/openspades/default.nix | 2 +- pkgs/games/openttd/default.nix | 4 ++-- pkgs/games/opentyrian/default.nix | 2 +- pkgs/games/pacvim/default.nix | 2 +- pkgs/games/performous/default.nix | 2 +- pkgs/games/pro-office-calculator/default.nix | 2 +- pkgs/games/qgo/default.nix | 2 +- pkgs/games/qqwing/default.nix | 2 +- pkgs/games/quake2/yquake2/default.nix | 2 +- pkgs/games/quake3/ioquake/default.nix | 2 +- pkgs/games/quakespasm/default.nix | 4 ++-- pkgs/games/quakespasm/vulkan.nix | 2 +- pkgs/games/residualvm/default.nix | 2 +- pkgs/games/rftg/default.nix | 2 +- pkgs/games/rigsofrods/default.nix | 2 +- pkgs/games/riko4/default.nix | 4 ++-- pkgs/games/robotfindskitten/default.nix | 4 ++-- pkgs/games/runelite/default.nix | 2 +- pkgs/games/scid-vs-pc/default.nix | 2 +- pkgs/games/scid/default.nix | 2 +- pkgs/games/scorched3d/default.nix | 2 +- pkgs/games/scummvm/default.nix | 4 ++-- pkgs/games/sdlmame/default.nix | 6 +++--- pkgs/games/sil/default.nix | 2 +- pkgs/games/snipes/default.nix | 2 +- pkgs/games/soi/default.nix | 4 ++-- pkgs/games/solarus/default.nix | 2 +- pkgs/games/space-orbit/default.nix | 2 +- pkgs/games/spring/default.nix | 2 +- pkgs/games/spring/springlobby.nix | 2 +- pkgs/games/stardust/default.nix | 4 ++-- pkgs/games/steam/steamcmd.nix | 2 +- pkgs/games/stepmania/default.nix | 2 +- pkgs/games/stuntrally/default.nix | 2 +- pkgs/games/supertux/default.nix | 2 +- pkgs/games/terraria-server/default.nix | 2 +- pkgs/games/the-butterfly-effect/default.nix | 2 +- pkgs/games/the-powder-toy/default.nix | 2 +- pkgs/games/tinyfugue/default.nix | 2 +- pkgs/games/trackballs/default.nix | 2 +- pkgs/games/tremulous/default.nix | 4 ++-- pkgs/games/tuxpaint/default.nix | 4 ++-- pkgs/games/ue4/default.nix | 2 +- pkgs/games/ultrastardx/default.nix | 2 +- pkgs/games/unnethack/default.nix | 2 +- pkgs/games/uqm/default.nix | 2 +- pkgs/games/urbanterror/default.nix | 2 +- pkgs/games/ut2004/demo.nix | 2 +- pkgs/games/vitetris/default.nix | 2 +- pkgs/games/vms-empire/default.nix | 4 ++-- pkgs/games/voxelands/default.nix | 4 ++-- pkgs/games/warmux/default.nix | 2 +- pkgs/games/warsow/default.nix | 4 ++-- pkgs/games/wesnoth/default.nix | 4 +--- pkgs/games/widelands/default.nix | 2 +- pkgs/games/xjump/default.nix | 2 +- pkgs/games/xmoto/default.nix | 2 +- pkgs/games/xpilot/bloodspilot-client.nix | 2 +- pkgs/games/xpilot/bloodspilot-server.nix | 2 +- pkgs/games/xpilot/default.nix | 4 ++-- pkgs/games/xsnow/default.nix | 4 ++-- pkgs/games/xsok/default.nix | 1 - pkgs/games/xsokoban/default.nix | 4 ++-- pkgs/games/xtris/default.nix | 2 +- pkgs/games/zandronum/fmod.nix | 2 +- pkgs/games/zangband/default.nix | 3 +-- pkgs/games/zdoom/default.nix | 2 +- pkgs/games/zdoom/zdbsp.nix | 2 +- pkgs/misc/brightnessctl/default.nix | 2 +- pkgs/misc/cups/cups-pk-helper.nix | 2 +- pkgs/misc/cups/default.nix | 2 +- pkgs/misc/cups/drivers/brlaser/default.nix | 2 +- pkgs/misc/cups/drivers/cnijfilter2/default.nix | 2 +- .../cups/drivers/cnijfilter_2_80/default.nix | 2 +- .../cups/drivers/cnijfilter_4_00/default.nix | 2 +- pkgs/misc/cups/drivers/dymo/default.nix | 2 +- pkgs/misc/cups/drivers/estudio/default.nix | 2 +- pkgs/misc/cups/drivers/fxlinuxprint/default.nix | 2 +- .../cups/drivers/googlecloudprint/default.nix | 2 +- .../misc/cups/drivers/hll2390dw-cups/default.nix | 2 +- pkgs/misc/cups/drivers/kyocera/default.nix | 2 +- pkgs/misc/cups/drivers/kyodialog3/default.nix | 2 +- .../drivers/mfcj470dwcupswrapper/default.nix | 2 +- pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix | 2 +- .../drivers/mfcj6510dwcupswrapper/default.nix | 2 +- pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix | 2 +- pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix | 4 ++-- .../drivers/mfcl2720dwcupswrapper/default.nix | 4 ++-- pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix | 4 ++-- .../drivers/mfcl2740dwcupswrapper/default.nix | 4 ++-- pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix | 4 ++-- .../drivers/mfcl8690cdwcupswrapper/default.nix | 4 ++-- .../misc/cups/drivers/mfcl8690cdwlpr/default.nix | 4 ++-- .../cups/drivers/samsung/1.00.36/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 2 +- .../cups/drivers/samsung/4.00.39/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- pkgs/misc/cups/drivers/zj-58/default.nix | 1 - pkgs/misc/cups/filters.nix | 4 ++-- pkgs/misc/drivers/epkowa/default.nix | 4 ++-- pkgs/misc/drivers/epson-escpr/default.nix | 2 +- pkgs/misc/drivers/epson-escpr2/default.nix | 8 ++++---- pkgs/misc/drivers/moltengamepad/default.nix | 2 +- pkgs/misc/drivers/steamcontroller/default.nix | 2 +- pkgs/misc/dumb/default.nix | 2 +- pkgs/misc/emulators/atari++/default.nix | 2 +- pkgs/misc/emulators/atari800/default.nix | 4 ++-- pkgs/misc/emulators/attract-mode/default.nix | 2 +- pkgs/misc/emulators/blastem/default.nix | 4 ++-- pkgs/misc/emulators/cdemu/vhba.nix | 2 +- pkgs/misc/emulators/citra/default.nix | 2 +- pkgs/misc/emulators/darcnes/default.nix | 2 +- pkgs/misc/emulators/desmume/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/default.nix | 2 +- pkgs/misc/emulators/dolphin-emu/master.nix | 2 +- pkgs/misc/emulators/emulationstation/default.nix | 2 +- pkgs/misc/emulators/epsxe/default.nix | 2 +- pkgs/misc/emulators/firebird-emu/default.nix | 2 +- pkgs/misc/emulators/fs-uae/default.nix | 4 ++-- pkgs/misc/emulators/gxemul/default.nix | 10 +++++----- pkgs/misc/emulators/higan/default.nix | 2 +- pkgs/misc/emulators/kega-fusion/default.nix | 2 +- pkgs/misc/emulators/libdsk/default.nix | 4 ++-- pkgs/misc/emulators/mednafen/default.nix | 4 ++-- pkgs/misc/emulators/mednafen/server.nix | 2 +- pkgs/misc/emulators/mednaffe/default.nix | 2 +- pkgs/misc/emulators/mgba/default.nix | 2 +- pkgs/misc/emulators/mupen64plus/default.nix | 2 +- pkgs/misc/emulators/nestopia/default.nix | 2 +- pkgs/misc/emulators/openmsx/default.nix | 2 +- pkgs/misc/emulators/pcsx2/default.nix | 2 +- pkgs/misc/emulators/pcsxr/default.nix | 6 +++--- pkgs/misc/emulators/ppsspp/default.nix | 2 +- pkgs/misc/emulators/qmc2/default.nix | 4 ++-- pkgs/misc/emulators/retroarch/default.nix | 2 +- .../retroarch/kodi-advanced-launchers.nix | 2 +- pkgs/misc/emulators/retrofe/default.nix | 2 +- pkgs/misc/emulators/rpcs3/default.nix | 2 +- pkgs/misc/emulators/snes9x-gtk/default.nix | 2 +- pkgs/misc/emulators/stella/default.nix | 4 ++-- pkgs/misc/emulators/vbam/default.nix | 2 +- pkgs/misc/emulators/yabause/default.nix | 4 ++-- pkgs/misc/gnash/default.nix | 2 +- pkgs/misc/jackaudio/jack1.nix | 2 +- pkgs/misc/libcardiacarrest/default.nix | 2 +- pkgs/misc/mnemonicode/default.nix | 2 +- pkgs/misc/mxt-app/default.nix | 2 +- pkgs/misc/sailsd/default.nix | 2 +- .../screensavers/betterlockscreen/default.nix | 2 +- pkgs/misc/screensavers/electricsheep/default.nix | 1 - .../misc/screensavers/i3lock-pixeled/default.nix | 2 +- pkgs/misc/screensavers/physlock/default.nix | 2 +- pkgs/misc/screensavers/pipes/default.nix | 2 +- pkgs/misc/screensavers/rss-glx/default.nix | 2 +- pkgs/misc/screensavers/xautolock/default.nix | 2 +- pkgs/misc/seafile-shared/default.nix | 2 +- pkgs/misc/sndio/default.nix | 2 +- pkgs/misc/sound-of-sorting/default.nix | 2 +- pkgs/misc/stabber/default.nix | 2 +- pkgs/misc/themes/adapta-kde/default.nix | 2 +- pkgs/misc/themes/adapta/default.nix | 2 +- pkgs/misc/themes/albatross/default.nix | 2 +- pkgs/misc/themes/arc-kde/default.nix | 2 +- pkgs/misc/themes/blackbird/default.nix | 1 - pkgs/misc/themes/clearlooks-phenix/default.nix | 2 +- pkgs/misc/themes/e17gtk/default.nix | 2 +- pkgs/misc/themes/equilux-theme/default.nix | 2 +- pkgs/misc/themes/jade1/default.nix | 2 +- pkgs/misc/themes/numix-solarized/default.nix | 2 +- pkgs/misc/themes/numix-sx/default.nix | 2 +- pkgs/misc/themes/numix/default.nix | 2 +- pkgs/misc/themes/obsidian2/default.nix | 2 +- pkgs/misc/themes/onestepback/default.nix | 2 +- pkgs/misc/themes/paper/default.nix | 2 +- pkgs/misc/themes/solarc/default.nix | 2 +- pkgs/misc/themes/vertex/default.nix | 1 - pkgs/misc/urbit/default.nix | 2 +- pkgs/misc/xosd/default.nix | 4 ++-- pkgs/os-specific/darwin/apple-sdk/default.nix | 2 +- .../darwin/apple-source-releases/objc4/pure.nix | 2 +- pkgs/os-specific/darwin/chunkwm/default.nix | 2 +- pkgs/os-specific/darwin/duti/default.nix | 1 - pkgs/os-specific/darwin/goku/default.nix | 2 +- pkgs/os-specific/darwin/iproute2mac/default.nix | 2 +- pkgs/os-specific/darwin/khd/default.nix | 2 +- pkgs/os-specific/darwin/kwm/default.nix | 2 +- pkgs/os-specific/darwin/lsusb/default.nix | 2 +- pkgs/os-specific/darwin/m-cli/default.nix | 2 +- pkgs/os-specific/darwin/opencflite/default.nix | 4 ++-- pkgs/os-specific/darwin/osxfuse/default.nix | 1 - pkgs/os-specific/darwin/qes/default.nix | 2 +- .../reattach-to-user-namespace/default.nix | 2 +- pkgs/os-specific/darwin/skhd/default.nix | 2 +- pkgs/os-specific/darwin/smimesign/default.nix | 2 +- pkgs/os-specific/darwin/trash/default.nix | 2 +- pkgs/os-specific/linux/acpi/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-tools/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- .../linux/android-udev-rules/default.nix | 2 +- pkgs/os-specific/linux/atop/default.nix | 2 +- pkgs/os-specific/linux/bpftrace/default.nix | 2 +- pkgs/os-specific/linux/cachefilesd/default.nix | 4 ++-- pkgs/os-specific/linux/can-isotp/default.nix | 2 +- pkgs/os-specific/linux/can-utils/default.nix | 2 +- pkgs/os-specific/linux/checkpolicy/default.nix | 2 +- pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++-- pkgs/os-specific/linux/conky/default.nix | 2 +- .../linux/conntrack-tools/default.nix | 4 ++-- pkgs/os-specific/linux/consoletools/default.nix | 4 ++-- pkgs/os-specific/linux/crda/default.nix | 2 +- pkgs/os-specific/linux/criu/default.nix | 4 ++-- pkgs/os-specific/linux/dbus-broker/default.nix | 2 +- pkgs/os-specific/linux/directvnc/default.nix | 2 +- pkgs/os-specific/linux/displaylink/default.nix | 2 +- pkgs/os-specific/linux/dmtcp/default.nix | 2 +- pkgs/os-specific/linux/dropwatch/default.nix | 1 - pkgs/os-specific/linux/ebtables/default.nix | 2 +- pkgs/os-specific/linux/eventstat/default.nix | 2 +- pkgs/os-specific/linux/extrace/default.nix | 2 +- pkgs/os-specific/linux/fatrace/default.nix | 4 ++-- .../linux/firmware/b43-firmware/6.30.163.46.nix | 2 +- .../firmware/broadcom-bt-firmware/default.nix | 6 +++--- .../linux/firmware/bt-fw-converter/default.nix | 6 +++--- .../firmware/firmware-linux-nonfree/default.nix | 2 +- .../firmware/openelec-dvb-firmware/default.nix | 2 +- .../firmware/raspberrypi-wireless/default.nix | 2 +- .../linux/firmware/raspberrypi/tools.nix | 2 +- pkgs/os-specific/linux/flashbench/default.nix | 2 +- pkgs/os-specific/linux/fnotifystat/default.nix | 2 +- pkgs/os-specific/linux/forkstat/default.nix | 2 +- pkgs/os-specific/linux/freefall/default.nix | 2 +- pkgs/os-specific/linux/fscrypt/default.nix | 2 +- pkgs/os-specific/linux/fscryptctl/default.nix | 2 +- pkgs/os-specific/linux/ftop/default.nix | 4 ++-- pkgs/os-specific/linux/fwts/default.nix | 2 +- pkgs/os-specific/linux/gfxtablet/default.nix | 2 +- .../linux/google-authenticator/default.nix | 2 +- pkgs/os-specific/linux/gpu-switch/default.nix | 2 +- pkgs/os-specific/linux/gradm/default.nix | 4 ++-- pkgs/os-specific/linux/guvcview/default.nix | 2 +- pkgs/os-specific/linux/hostapd/default.nix | 4 ++-- pkgs/os-specific/linux/hwdata/default.nix | 2 +- .../os-specific/linux/hyperv-daemons/default.nix | 4 ++-- pkgs/os-specific/linux/i2c-tools/default.nix | 4 ++-- pkgs/os-specific/linux/i7z/default.nix | 2 +- pkgs/os-specific/linux/ifenslave/default.nix | 2 +- pkgs/os-specific/linux/ima-evm-utils/default.nix | 2 +- pkgs/os-specific/linux/input-utils/default.nix | 2 +- pkgs/os-specific/linux/intel-ocl/default.nix | 2 +- pkgs/os-specific/linux/iptstate/default.nix | 4 ++-- pkgs/os-specific/linux/ipvsadm/default.nix | 4 ++-- pkgs/os-specific/linux/irqbalance/default.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 4 ++-- pkgs/os-specific/linux/kbd/keymaps.nix | 4 ++-- pkgs/os-specific/linux/kbdlight/default.nix | 2 +- pkgs/os-specific/linux/kexectools/default.nix | 6 +++--- pkgs/os-specific/linux/keyutils/default.nix | 4 ++-- pkgs/os-specific/linux/klibc/default.nix | 2 +- pkgs/os-specific/linux/libaio/default.nix | 4 ++-- pkgs/os-specific/linux/libbpf/default.nix | 2 +- pkgs/os-specific/linux/libcap-ng/default.nix | 4 ++-- pkgs/os-specific/linux/libcap/default.nix | 8 ++++---- pkgs/os-specific/linux/libcgroup/default.nix | 4 ++-- pkgs/os-specific/linux/libnl/default.nix | 2 +- pkgs/os-specific/linux/libratbag/default.nix | 2 +- pkgs/os-specific/linux/libselinux/default.nix | 2 +- pkgs/os-specific/linux/libsemanage/default.nix | 2 +- pkgs/os-specific/linux/libsepol/default.nix | 2 +- pkgs/os-specific/linux/libsmbios/default.nix | 2 +- pkgs/os-specific/linux/libudev0-shim/default.nix | 2 +- pkgs/os-specific/linux/libwebcam/default.nix | 1 - pkgs/os-specific/linux/light/default.nix | 2 +- pkgs/os-specific/linux/lm-sensors/default.nix | 2 +- pkgs/os-specific/linux/lockdep/default.nix | 2 +- .../linux/logitech-udev-rules/default.nix | 2 +- pkgs/os-specific/linux/lxc/default.nix | 2 +- pkgs/os-specific/linux/macchanger/default.nix | 2 +- pkgs/os-specific/linux/mbpfan/default.nix | 2 +- pkgs/os-specific/linux/mcelog/default.nix | 2 +- pkgs/os-specific/linux/microcode/iucode-tool.nix | 2 +- pkgs/os-specific/linux/miraclecast/default.nix | 2 +- pkgs/os-specific/linux/mmc-utils/default.nix | 2 +- pkgs/os-specific/linux/molly-guard/default.nix | 2 +- pkgs/os-specific/linux/msr-tools/default.nix | 4 ++-- .../linux/multipath-tools/default.nix | 4 ++-- pkgs/os-specific/linux/net-tools/default.nix | 4 ++-- pkgs/os-specific/linux/nfs-utils/default.nix | 4 ++-- pkgs/os-specific/linux/nftables/default.nix | 4 ++-- pkgs/os-specific/linux/nmon/default.nix | 2 +- pkgs/os-specific/linux/numactl/default.nix | 2 +- pkgs/os-specific/linux/nvme-cli/default.nix | 2 +- pkgs/os-specific/linux/odp-dpdk/default.nix | 4 ++-- pkgs/os-specific/linux/ofp/default.nix | 2 +- pkgs/os-specific/linux/open-iscsi/default.nix | 2 +- pkgs/os-specific/linux/open-isns/default.nix | 2 +- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- pkgs/os-specific/linux/pagemon/default.nix | 2 +- pkgs/os-specific/linux/pam/default.nix | 2 +- pkgs/os-specific/linux/pam_pgsql/default.nix | 2 +- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- pkgs/os-specific/linux/paxctl/default.nix | 4 ++-- pkgs/os-specific/linux/paxtest/default.nix | 4 ++-- pkgs/os-specific/linux/pcm/default.nix | 2 +- pkgs/os-specific/linux/pflask/default.nix | 2 +- pkgs/os-specific/linux/pipework/default.nix | 2 +- pkgs/os-specific/linux/pktgen/default.nix | 2 +- pkgs/os-specific/linux/plymouth/default.nix | 4 ++-- pkgs/os-specific/linux/pmount/default.nix | 2 +- .../linux/policycoreutils/default.nix | 2 +- pkgs/os-specific/linux/prl-tools/default.nix | 2 +- pkgs/os-specific/linux/procdump/default.nix | 2 +- pkgs/os-specific/linux/procps-ng/default.nix | 2 +- pkgs/os-specific/linux/pscircle/default.nix | 2 +- pkgs/os-specific/linux/psmisc/default.nix | 1 - pkgs/os-specific/linux/radeontop/default.nix | 2 +- pkgs/os-specific/linux/read-edid/default.nix | 4 ++-- pkgs/os-specific/linux/reptyr/default.nix | 2 +- pkgs/os-specific/linux/rewritefs/default.nix | 2 +- pkgs/os-specific/linux/roccat-tools/default.nix | 4 ++-- pkgs/os-specific/linux/rtlwifi_new/default.nix | 2 +- pkgs/os-specific/linux/schedtool/default.nix | 4 ++-- pkgs/os-specific/linux/sdparm/default.nix | 4 ++-- .../os-specific/linux/selinux-python/default.nix | 2 +- .../linux/selinux-sandbox/default.nix | 2 +- .../os-specific/linux/semodule-utils/default.nix | 4 ++-- pkgs/os-specific/linux/sepolgen/default.nix | 2 +- pkgs/os-specific/linux/shadow/default.nix | 2 +- pkgs/os-specific/linux/smem/default.nix | 2 +- pkgs/os-specific/linux/smemstat/default.nix | 2 +- pkgs/os-specific/linux/speedometer/default.nix | 2 +- pkgs/os-specific/linux/sssd/default.nix | 4 ++-- .../linux/syscall_limiter/default.nix | 2 +- pkgs/os-specific/linux/sysdig/default.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/tcp-wrappers/default.nix | 2 +- pkgs/os-specific/linux/thunderbolt/default.nix | 2 +- pkgs/os-specific/linux/tiptop/default.nix | 4 ++-- pkgs/os-specific/linux/tiscamera/default.nix | 3 +-- pkgs/os-specific/linux/tomb/default.nix | 2 +- pkgs/os-specific/linux/tpacpi-bat/default.nix | 2 +- pkgs/os-specific/linux/trace-cmd/default.nix | 2 +- pkgs/os-specific/linux/untie/default.nix | 4 ++-- pkgs/os-specific/linux/usbguard/default.nix | 4 ++-- pkgs/os-specific/linux/uvcdynctrl/default.nix | 2 +- pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++-- pkgs/os-specific/linux/wireguard/default.nix | 2 +- .../os-specific/linux/wpa_supplicant/default.nix | 4 ++-- pkgs/os-specific/linux/x86info/default.nix | 4 ++-- pkgs/os-specific/linux/xsensors/default.nix | 2 +- .../os-specific/windows/cygwin-setup/default.nix | 2 +- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- pkgs/servers/apache-kafka/default.nix | 2 +- pkgs/servers/asterisk/default.nix | 2 +- pkgs/servers/atlassian/confluence.nix | 4 ++-- pkgs/servers/atlassian/crowd.nix | 4 ++-- pkgs/servers/atlassian/jira.nix | 2 +- pkgs/servers/beanstalkd/default.nix | 2 +- pkgs/servers/caddy/default.nix | 2 +- pkgs/servers/cayley/default.nix | 2 +- pkgs/servers/clickhouse/default.nix | 2 +- pkgs/servers/cloud-print-connector/default.nix | 2 +- pkgs/servers/computing/slurm/default.nix | 4 ++-- pkgs/servers/confluent-platform/default.nix | 2 +- pkgs/servers/consul/default.nix | 2 +- pkgs/servers/coturn/default.nix | 2 +- pkgs/servers/couchpotato/default.nix | 2 +- pkgs/servers/dante/default.nix | 4 ++-- pkgs/servers/dgraph/default.nix | 2 +- pkgs/servers/dict/default.nix | 2 +- pkgs/servers/dict/dictd-wiktionary.nix | 2 +- pkgs/servers/dict/dictd-wordnet.nix | 2 +- pkgs/servers/dict/libmaa.nix | 2 +- pkgs/servers/diod/default.nix | 4 ++-- pkgs/servers/dns/coredns/default.nix | 2 +- pkgs/servers/dns/dnsdist/default.nix | 2 +- pkgs/servers/dns/knot-dns/default.nix | 2 +- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- pkgs/servers/dns/pdns-recursor/default.nix | 2 +- pkgs/servers/dns/powerdns/default.nix | 2 +- pkgs/servers/echoip/default.nix | 2 +- pkgs/servers/elasticmq-server-bin/default.nix | 3 +-- pkgs/servers/etcd/default.nix | 2 +- pkgs/servers/exhibitor/default.nix | 2 +- pkgs/servers/fcgiwrap/default.nix | 2 +- pkgs/servers/felix/default.nix | 2 +- pkgs/servers/felix/remoteshell.nix | 2 +- pkgs/servers/firebird/default.nix | 2 +- pkgs/servers/foundationdb/cmake.nix | 2 +- pkgs/servers/foundationdb/vsmake.nix | 2 +- pkgs/servers/freeradius/default.nix | 2 +- pkgs/servers/gnatsd/default.nix | 2 +- pkgs/servers/gopher/gofish/default.nix | 4 ++-- pkgs/servers/gotty/default.nix | 2 +- pkgs/servers/h2/default.nix | 2 +- pkgs/servers/hbase/default.nix | 2 +- pkgs/servers/hitch/default.nix | 4 ++-- pkgs/servers/http/4store/default.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- .../apache-modules/mod_auth_mellon/default.nix | 2 +- .../http/apache-modules/mod_wsgi/default.nix | 2 +- pkgs/servers/http/apt-cacher-ng/default.nix | 2 +- pkgs/servers/http/couchdb/2.0.0.nix | 4 ++-- pkgs/servers/http/couchdb/default.nix | 4 ++-- pkgs/servers/http/darkhttpd/default.nix | 4 ++-- pkgs/servers/http/h2o/default.nix | 2 +- pkgs/servers/http/hiawatha/default.nix | 2 +- pkgs/servers/http/jetty/default.nix | 2 +- pkgs/servers/http/lwan/default.nix | 1 - pkgs/servers/http/nix-binary-cache/default.nix | 2 +- pkgs/servers/http/openresty/default.nix | 2 +- pkgs/servers/http/pshs/default.nix | 2 +- pkgs/servers/http/spawn-fcgi/default.nix | 2 +- pkgs/servers/http/tengine/default.nix | 2 +- pkgs/servers/http/thttpd/default.nix | 4 ++-- pkgs/servers/http/tomcat/axis2/default.nix | 4 ++-- pkgs/servers/http/tomcat/default.nix | 4 ++-- pkgs/servers/http/unit/default.nix | 2 +- pkgs/servers/http/webfs/default.nix | 4 ++-- pkgs/servers/http/webhook/default.nix | 2 +- pkgs/servers/http/yaws/default.nix | 4 ++-- pkgs/servers/hydron/default.nix | 2 +- pkgs/servers/icingaweb2/default.nix | 2 +- pkgs/servers/identd/nullidentdmod/default.nix | 2 +- pkgs/servers/identd/oidentd/default.nix | 4 ++-- pkgs/servers/interlock/default.nix | 2 +- pkgs/servers/irker/default.nix | 2 +- pkgs/servers/jackett/default.nix | 8 ++++---- pkgs/servers/jetbrains/youtrack.nix | 4 ++-- pkgs/servers/kippo/default.nix | 4 ++-- pkgs/servers/kwakd/default.nix | 2 +- pkgs/servers/lidarr/default.nix | 2 +- pkgs/servers/livepeer/default.nix | 2 +- pkgs/servers/mail/archiveopteryx/default.nix | 4 ++-- .../mail/dovecot/plugins/pigeonhole/default.nix | 2 +- pkgs/servers/mail/mailhog/default.nix | 2 +- pkgs/servers/mail/mailman/default.nix | 4 ++-- pkgs/servers/mail/mlmmj/default.nix | 4 ++-- pkgs/servers/mail/nullmailer/default.nix | 2 +- pkgs/servers/mail/opensmtpd/default.nix | 4 ++-- pkgs/servers/mail/opensmtpd/extras.nix | 4 ++-- pkgs/servers/mail/postfix/default.nix | 4 ++-- pkgs/servers/mail/postsrsd/default.nix | 2 +- pkgs/servers/mail/pypolicyd-spf/default.nix | 4 ++-- pkgs/servers/mail/rmilter/default.nix | 2 +- pkgs/servers/mail/rspamd/default.nix | 2 +- pkgs/servers/matterbridge/default.nix | 2 +- pkgs/servers/mattermost/matterircd.nix | 2 +- pkgs/servers/mautrix-whatsapp/default.nix | 2 +- pkgs/servers/mediatomb/default.nix | 2 +- pkgs/servers/meguca/default.nix | 2 +- pkgs/servers/memcached/default.nix | 4 ++-- pkgs/servers/mesos-dns/default.nix | 2 +- pkgs/servers/minio/default.nix | 2 +- pkgs/servers/mirrorbits/default.nix | 2 +- pkgs/servers/misc/airsonic/default.nix | 2 +- pkgs/servers/misc/subsonic/default.nix | 8 ++++---- pkgs/servers/misc/taskserver/default.nix | 2 +- pkgs/servers/monitoring/bosun/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- .../servers/monitoring/consul-alerts/default.nix | 2 +- pkgs/servers/monitoring/facette/default.nix | 2 +- .../monitoring/grafana-reporter/default.nix | 2 +- pkgs/servers/monitoring/grafana/default.nix | 2 +- pkgs/servers/monitoring/kapacitor/default.nix | 2 +- pkgs/servers/monitoring/lcdproc/default.nix | 2 +- pkgs/servers/monitoring/loki/default.nix | 2 +- pkgs/servers/monitoring/longview/default.nix | 2 +- pkgs/servers/monitoring/mtail/default.nix | 2 +- pkgs/servers/monitoring/munin/default.nix | 2 +- pkgs/servers/monitoring/nagios/default.nix | 4 ++-- .../monitoring/nagios/plugins/check_ssl_cert.nix | 2 +- .../monitoring/newrelic-sysmond/default.nix | 2 +- pkgs/servers/monitoring/plugins/uptime.nix | 2 +- .../monitoring/prometheus/alertmanager.nix | 2 +- .../monitoring/prometheus/bind-exporter.nix | 2 +- .../monitoring/prometheus/blackbox-exporter.nix | 2 +- .../monitoring/prometheus/collectd-exporter.nix | 2 +- .../monitoring/prometheus/consul-exporter.nix | 2 +- .../monitoring/prometheus/dnsmasq-exporter.nix | 2 +- .../monitoring/prometheus/dovecot-exporter.nix | 2 +- .../monitoring/prometheus/fritzbox-exporter.nix | 2 +- .../monitoring/prometheus/haproxy-exporter.nix | 2 +- .../monitoring/prometheus/json-exporter.nix | 2 +- .../monitoring/prometheus/mail-exporter.nix | 2 +- .../monitoring/prometheus/mesos-exporter.nix | 2 +- .../prometheus/minio-exporter/default.nix | 2 +- .../monitoring/prometheus/mysqld-exporter.nix | 2 +- .../monitoring/prometheus/nginx-exporter.nix | 2 +- .../monitoring/prometheus/node-exporter.nix | 2 +- .../monitoring/prometheus/openvpn-exporter.nix | 2 +- .../monitoring/prometheus/postfix-exporter.nix | 2 +- .../monitoring/prometheus/postgres-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/prom2json.nix | 2 +- .../monitoring/prometheus/pushgateway.nix | 2 +- .../monitoring/prometheus/rabbitmq-exporter.nix | 2 +- .../monitoring/prometheus/snmp-exporter.nix | 2 +- .../monitoring/prometheus/statsd-exporter.nix | 2 +- .../monitoring/prometheus/surfboard-exporter.nix | 2 +- .../prometheus/unifi-exporter/default.nix | 2 +- pkgs/servers/monitoring/riemann/default.nix | 4 ++-- pkgs/servers/monitoring/seyren/default.nix | 2 +- pkgs/servers/monitoring/telegraf/default.nix | 2 +- pkgs/servers/monitoring/zipkin/default.nix | 2 +- pkgs/servers/mpd/clientlib.nix | 2 +- pkgs/servers/mpd/default.nix | 2 +- pkgs/servers/mqtt/mosquitto/default.nix | 2 +- pkgs/servers/nats-streaming-server/default.nix | 2 +- pkgs/servers/nextcloud/default.nix | 4 ++-- pkgs/servers/nginx-sso/default.nix | 2 +- pkgs/servers/nosql/aerospike/default.nix | 2 +- pkgs/servers/nosql/cassandra/generic.nix | 10 +++++----- pkgs/servers/nosql/eventstore/default.nix | 2 +- pkgs/servers/nosql/neo4j/default.nix | 2 +- pkgs/servers/nosql/redis/default.nix | 4 ++-- pkgs/servers/nosql/rethinkdb/default.nix | 4 ++-- pkgs/servers/nsq/default.nix | 2 +- pkgs/servers/openafs/1.6/default.nix | 2 +- pkgs/servers/openafs/1.8/default.nix | 2 +- pkgs/servers/osrm-backend/default.nix | 2 +- pkgs/servers/p910nd/default.nix | 4 ++-- pkgs/servers/plex/raw.nix | 1 - pkgs/servers/polipo/default.nix | 4 ++-- pkgs/servers/ps3netsrv/default.nix | 2 +- pkgs/servers/quagga/default.nix | 4 ++-- pkgs/servers/radarr/default.nix | 8 ++++---- pkgs/servers/radicale/1.x.nix | 2 +- pkgs/servers/rippled/default.nix | 2 +- pkgs/servers/rpcbind/default.nix | 2 +- pkgs/servers/rt/default.nix | 4 ++-- pkgs/servers/sabnzbd/default.nix | 1 - pkgs/servers/samba/4.x.nix | 4 ++-- pkgs/servers/search/elasticsearch/5.x.nix | 4 ++-- pkgs/servers/search/groonga/default.nix | 4 ++-- pkgs/servers/serf/default.nix | 2 +- pkgs/servers/serviio/default.nix | 4 ++-- pkgs/servers/shairplay/default.nix | 2 +- pkgs/servers/shairport-sync/default.nix | 2 +- pkgs/servers/shellinabox/default.nix | 2 +- pkgs/servers/simplehttp2server/default.nix | 2 +- pkgs/servers/sks/default.nix | 2 +- pkgs/servers/skydns/default.nix | 2 +- pkgs/servers/smcroute/default.nix | 2 +- pkgs/servers/softether/4.25.nix | 2 +- pkgs/servers/softether/4.29.nix | 2 +- pkgs/servers/sonarr/default.nix | 2 +- pkgs/servers/sql/cockroachdb/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 6 +++--- pkgs/servers/sql/oracle-xe/default.nix | 6 +++--- pkgs/servers/sql/percona/5.6.x.nix | 2 +- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- pkgs/servers/sql/pgpool/default.nix | 5 ++--- pkgs/servers/sql/postgresql/default.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 2 +- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 2 +- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 2 +- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 2 +- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 2 +- pkgs/servers/sql/postgresql/ext/pgtap.nix | 2 +- pkgs/servers/sql/postgresql/ext/postgis.nix | 2 +- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 2 +- .../sql/postgresql/ext/tsearch_extras.nix | 2 +- pkgs/servers/sql/sqlite/jdbc/default.nix | 3 +-- pkgs/servers/sslh/default.nix | 2 +- pkgs/servers/tautulli/default.nix | 1 - pkgs/servers/tegola/default.nix | 2 +- pkgs/servers/teleport/default.nix | 2 +- pkgs/servers/traefik/default.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- pkgs/servers/tt-rss/default.nix | 2 +- pkgs/servers/tt-rss/plugin-auth-ldap/default.nix | 2 +- .../tt-rss/plugin-ff-instagram/default.nix | 2 +- .../tt-rss/plugin-tumblr-gdpr/default.nix | 2 +- pkgs/servers/tt-rss/theme-feedly/default.nix | 2 +- pkgs/servers/ttyd/default.nix | 2 +- pkgs/servers/udpt/default.nix | 2 +- pkgs/servers/uftp/default.nix | 2 +- pkgs/servers/uhub/default.nix | 2 +- pkgs/servers/ums/default.nix | 6 +++--- pkgs/servers/uwsgi/default.nix | 4 ++-- pkgs/servers/web-apps/morty/default.nix | 2 +- .../web-apps/pgpkeyserver-lite/default.nix | 2 +- pkgs/servers/web-apps/restya-board/default.nix | 2 +- pkgs/servers/web-apps/selfoss/default.nix | 4 ++-- pkgs/servers/web-apps/shaarli/default.nix | 2 +- pkgs/servers/web-apps/shaarli/material-theme.nix | 2 +- pkgs/servers/web-apps/virtlyst/default.nix | 2 +- pkgs/servers/web-apps/wallabag/default.nix | 2 +- pkgs/servers/x11/xorg/xcb-util-xrm.nix | 4 ++-- pkgs/servers/xmpp/biboumi/default.nix | 2 +- pkgs/servers/xmpp/ejabberd/default.nix | 4 ++-- pkgs/servers/xmpp/openfire/default.nix | 2 +- pkgs/servers/xmpp/prosody/default.nix | 4 ++-- pkgs/servers/xmpp/pyIRCt/default.nix | 10 +++++----- pkgs/servers/xmpp/pyMAILt/default.nix | 8 ++++---- pkgs/servers/zoneminder/default.nix | 2 +- pkgs/servers/zookeeper/default.nix | 10 +++++----- pkgs/shells/any-nix-shell/default.nix | 2 +- pkgs/shells/bash/bash-completion/default.nix | 4 ++-- .../shells/bash/nix-bash-completions/default.nix | 2 +- pkgs/shells/dgsh/default.nix | 2 +- pkgs/shells/fish/default.nix | 4 ++-- pkgs/shells/fish/fish-foreign-env/default.nix | 2 +- pkgs/shells/ksh/default.nix | 2 +- pkgs/shells/mksh/default.nix | 2 +- pkgs/shells/oh/default.nix | 2 +- pkgs/shells/powershell/default.nix | 2 +- pkgs/shells/rc/default.nix | 2 +- pkgs/shells/rssh/default.nix | 4 ++-- pkgs/shells/tcsh/default.nix | 8 ++++---- pkgs/shells/zsh/antigen/default.nix | 2 +- pkgs/shells/zsh/gradle-completion/default.nix | 2 +- pkgs/shells/zsh/grml-zsh-config/default.nix | 2 +- pkgs/shells/zsh/oh-my-zsh/default.nix | 2 +- pkgs/shells/zsh/spaceship-prompt/default.nix | 2 +- pkgs/shells/zsh/zsh-autosuggestions/default.nix | 2 +- pkgs/shells/zsh/zsh-command-time/default.nix | 2 +- pkgs/shells/zsh/zsh-completions/default.nix | 2 +- .../zsh/zsh-history-substring-search/default.nix | 2 +- pkgs/shells/zsh/zsh-powerlevel9k/default.nix | 2 +- .../zsh/zsh-syntax-highlighting/default.nix | 2 +- pkgs/tools/X11/autocutsel/default.nix | 4 ++-- pkgs/tools/X11/bgs/default.nix | 2 +- pkgs/tools/X11/ckbcomp/default.nix | 2 +- pkgs/tools/X11/dispad/default.nix | 2 +- pkgs/tools/X11/dragon-drop/default.nix | 2 +- pkgs/tools/X11/ffcast/default.nix | 2 +- pkgs/tools/X11/go-sct/default.nix | 2 +- pkgs/tools/X11/grobi/default.nix | 2 +- pkgs/tools/X11/hsetroot/default.nix | 2 +- pkgs/tools/X11/jumpapp/default.nix | 2 +- pkgs/tools/X11/numlockx/default.nix | 1 - pkgs/tools/X11/nx-libs/default.nix | 2 +- pkgs/tools/X11/obconf/default.nix | 2 +- pkgs/tools/X11/oblogout/default.nix | 2 +- pkgs/tools/X11/run-scaled/default.nix | 2 +- pkgs/tools/X11/runningx/default.nix | 2 +- pkgs/tools/X11/screen-message/default.nix | 2 +- pkgs/tools/X11/setroot/default.nix | 2 +- pkgs/tools/X11/skippy-xd/default.nix | 2 +- pkgs/tools/X11/sselp/default.nix | 4 ++-- pkgs/tools/X11/virtualgl/lib.nix | 2 +- pkgs/tools/X11/wayv/default.nix | 1 - pkgs/tools/X11/winswitch/default.nix | 4 ++-- pkgs/tools/X11/wmutils-core/default.nix | 2 +- pkgs/tools/X11/wmutils-opt/default.nix | 2 +- pkgs/tools/X11/x11vnc/default.nix | 2 +- pkgs/tools/X11/xannotate/default.nix | 1 - pkgs/tools/X11/xbanish/default.nix | 1 - pkgs/tools/X11/xbindkeys-config/default.nix | 2 +- pkgs/tools/X11/xcwd/default.nix | 2 +- pkgs/tools/X11/xdg-utils/default.nix | 4 ++-- pkgs/tools/X11/xdotool/default.nix | 2 +- pkgs/tools/X11/xinput_calibrator/default.nix | 1 - pkgs/tools/X11/xkb-switch/default.nix | 2 +- pkgs/tools/X11/xloadimage/default.nix | 2 +- pkgs/tools/X11/xmacro/default.nix | 4 ++-- pkgs/tools/X11/xnee/default.nix | 4 ++-- pkgs/tools/X11/xosview2/default.nix | 4 ++-- pkgs/tools/X11/xpointerbarrier/default.nix | 2 +- pkgs/tools/X11/xpra/libfakeXinerama.nix | 4 ++-- pkgs/tools/X11/xrectsel/default.nix | 2 +- pkgs/tools/X11/xrestop/default.nix | 2 +- pkgs/tools/X11/xsecurelock/default.nix | 2 +- pkgs/tools/X11/xsettingsd/default.nix | 2 +- pkgs/tools/X11/xvkbd/default.nix | 2 +- pkgs/tools/X11/xwinmosaic/default.nix | 2 +- pkgs/tools/admin/acme.sh/default.nix | 2 +- pkgs/tools/admin/adtool/default.nix | 4 ++-- .../amazon-ecr-credential-helper/default.nix | 2 +- pkgs/tools/admin/aws-env/default.nix | 1 - pkgs/tools/admin/aws-rotate-key/default.nix | 2 +- pkgs/tools/admin/aws-vault/default.nix | 1 - pkgs/tools/admin/bluemix-cli/default.nix | 2 +- pkgs/tools/admin/bubblewrap/default.nix | 4 ++-- pkgs/tools/admin/cli53/default.nix | 2 +- .../admin/docker-credential-gcr/default.nix | 2 +- pkgs/tools/admin/fastlane/default.nix | 3 +-- pkgs/tools/admin/google-cloud-sdk/default.nix | 4 ++-- pkgs/tools/admin/gtk-vnc/default.nix | 4 ++-- pkgs/tools/admin/iamy/default.nix | 2 +- pkgs/tools/admin/pulumi/default.nix | 2 +- pkgs/tools/admin/scaleway-cli/default.nix | 2 +- pkgs/tools/admin/ssl-cert-check/default.nix | 1 - pkgs/tools/admin/tigervnc/default.nix | 2 +- pkgs/tools/admin/vncdo/default.nix | 1 - pkgs/tools/archivers/afio/default.nix | 4 ++-- pkgs/tools/archivers/gnutar/default.nix | 2 +- pkgs/tools/archivers/p7zip/default.nix | 2 +- pkgs/tools/archivers/runzip/default.nix | 2 +- pkgs/tools/archivers/s-tar/default.nix | 2 +- pkgs/tools/archivers/unarj/default.nix | 4 ++-- pkgs/tools/archivers/undmg/default.nix | 2 +- pkgs/tools/archivers/unp/default.nix | 2 +- pkgs/tools/archivers/unrar/default.nix | 2 +- pkgs/tools/archivers/unshield/default.nix | 2 +- pkgs/tools/archivers/wimlib/default.nix | 4 ++-- pkgs/tools/archivers/xarchive/default.nix | 4 ++-- pkgs/tools/archivers/xarchiver/default.nix | 2 +- pkgs/tools/archivers/zpaq/default.nix | 2 +- pkgs/tools/audio/abcm2ps/default.nix | 2 +- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- .../tools/audio/accuraterip-checksum/default.nix | 2 +- .../audio/acoustid-fingerprinter/default.nix | 4 ++-- pkgs/tools/audio/aucdtect/default.nix | 2 +- pkgs/tools/audio/beets/alternatives-plugin.nix | 2 +- pkgs/tools/audio/darkice/default.nix | 2 +- pkgs/tools/audio/ezstream/default.nix | 4 ++-- pkgs/tools/audio/glyr/default.nix | 2 +- pkgs/tools/audio/mpdas/default.nix | 2 +- pkgs/tools/audio/mpdcron/default.nix | 2 +- pkgs/tools/audio/mpdris2/default.nix | 1 - pkgs/tools/audio/pasystray/default.nix | 4 ++-- pkgs/tools/audio/playerctl/default.nix | 2 +- pkgs/tools/audio/pnmixer/default.nix | 2 +- pkgs/tools/audio/trx/default.nix | 2 +- pkgs/tools/audio/volumeicon/default.nix | 2 +- pkgs/tools/backup/bareos/default.nix | 4 ++-- pkgs/tools/backup/btrbk/default.nix | 4 ++-- pkgs/tools/backup/burp/default.nix | 2 +- pkgs/tools/backup/chunksync/default.nix | 2 +- pkgs/tools/backup/dar/default.nix | 4 ++-- pkgs/tools/backup/diskrsync/default.nix | 2 -- pkgs/tools/backup/duplicati/default.nix | 10 +++++----- pkgs/tools/backup/duply/default.nix | 2 +- pkgs/tools/backup/easysnap/default.nix | 2 +- pkgs/tools/backup/flockit/default.nix | 2 +- pkgs/tools/backup/httrack/default.nix | 2 +- pkgs/tools/backup/httrack/qt.nix | 4 ++-- pkgs/tools/backup/mydumper/default.nix | 2 +- pkgs/tools/backup/ori/default.nix | 2 +- pkgs/tools/backup/partclone/default.nix | 2 +- pkgs/tools/backup/percona-xtrabackup/default.nix | 4 ++-- pkgs/tools/backup/rdup/default.nix | 2 +- pkgs/tools/backup/restic/default.nix | 2 +- pkgs/tools/backup/restic/rest-server.nix | 2 +- pkgs/tools/backup/rsbep/default.nix | 2 +- pkgs/tools/backup/store-backup/default.nix | 2 +- pkgs/tools/backup/tarsnap/default.nix | 2 +- pkgs/tools/backup/wal-e/default.nix | 2 +- pkgs/tools/backup/wal-g/default.nix | 2 +- pkgs/tools/backup/zbackup/default.nix | 2 +- pkgs/tools/bluetooth/blueman/default.nix | 4 ++-- pkgs/tools/bluetooth/bluez-alsa/default.nix | 2 +- pkgs/tools/bootloaders/refind/default.nix | 2 +- pkgs/tools/cd-dvd/bashburn/default.nix | 4 ++-- pkgs/tools/cd-dvd/bchunk/default.nix | 4 ++-- pkgs/tools/cd-dvd/brasero/default.nix | 4 ++-- pkgs/tools/cd-dvd/cdi2iso/default.nix | 4 ++-- pkgs/tools/cd-dvd/cdimgtools/default.nix | 2 +- pkgs/tools/cd-dvd/cue2pops/default.nix | 2 +- pkgs/tools/cd-dvd/dvd-vr/default.nix | 2 +- pkgs/tools/cd-dvd/dvdisaster/default.nix | 4 ++-- pkgs/tools/cd-dvd/ecm-tools/default.nix | 2 +- pkgs/tools/cd-dvd/mdf2iso/default.nix | 2 +- pkgs/tools/cd-dvd/mkcue/default.nix | 2 +- pkgs/tools/cd-dvd/nrg2iso/default.nix | 4 ++-- pkgs/tools/cd-dvd/unetbootin/default.nix | 2 +- pkgs/tools/compression/advancecomp/default.nix | 2 +- pkgs/tools/compression/brotli/default.nix | 2 +- pkgs/tools/compression/bsc/default.nix | 2 +- pkgs/tools/compression/bsdiff/default.nix | 4 ++-- pkgs/tools/compression/bzip2/default.nix | 4 ++-- pkgs/tools/compression/dtrx/default.nix | 2 +- pkgs/tools/compression/gzip/default.nix | 4 ++-- pkgs/tools/compression/lrzip/default.nix | 4 ++-- pkgs/tools/compression/lzfse/default.nix | 2 +- pkgs/tools/compression/lzip/default.nix | 4 ++-- pkgs/tools/compression/mozlz4a/default.nix | 1 - pkgs/tools/compression/pbzx/default.nix | 1 - pkgs/tools/compression/upx/default.nix | 4 ++-- pkgs/tools/compression/xar/default.nix | 4 ++-- pkgs/tools/compression/xdelta/default.nix | 2 +- pkgs/tools/compression/xdelta/unstable.nix | 2 +- pkgs/tools/compression/zopfli/default.nix | 6 +++--- pkgs/tools/filesystems/afpfs-ng/default.nix | 2 +- pkgs/tools/filesystems/avfs/default.nix | 4 ++-- pkgs/tools/filesystems/bashmount/default.nix | 2 +- pkgs/tools/filesystems/bcache-tools/default.nix | 4 ++-- pkgs/tools/filesystems/bees/default.nix | 2 +- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- pkgs/tools/filesystems/blobfuse/default.nix | 2 +- pkgs/tools/filesystems/boxfs/default.nix | 2 +- pkgs/tools/filesystems/btrfs-progs/default.nix | 2 +- pkgs/tools/filesystems/chunkfs/default.nix | 2 +- pkgs/tools/filesystems/convoy/default.nix | 2 +- pkgs/tools/filesystems/cryfs/default.nix | 2 +- pkgs/tools/filesystems/darling-dmg/default.nix | 2 +- pkgs/tools/filesystems/disorderfs/default.nix | 2 +- pkgs/tools/filesystems/djmount/default.nix | 4 ++-- pkgs/tools/filesystems/dosfstools/default.nix | 2 +- pkgs/tools/filesystems/duff/default.nix | 2 +- pkgs/tools/filesystems/duperemove/default.nix | 2 +- pkgs/tools/filesystems/e2tools/default.nix | 3 +-- pkgs/tools/filesystems/encfs/default.nix | 2 +- pkgs/tools/filesystems/exfat/default.nix | 2 +- pkgs/tools/filesystems/ext4magic/default.nix | 4 ++-- pkgs/tools/filesystems/extundelete/default.nix | 2 +- pkgs/tools/filesystems/f2fs-tools/default.nix | 2 +- pkgs/tools/filesystems/f3/default.nix | 1 - pkgs/tools/filesystems/fatresize/default.nix | 2 +- pkgs/tools/filesystems/fatsort/default.nix | 4 ++-- pkgs/tools/filesystems/fuse-7z-ng/default.nix | 1 - pkgs/tools/filesystems/gcsfuse/default.nix | 2 +- pkgs/tools/filesystems/genimage/default.nix | 2 +- pkgs/tools/filesystems/genromfs/default.nix | 4 ++-- pkgs/tools/filesystems/go-mtpfs/default.nix | 2 +- pkgs/tools/filesystems/gpart/default.nix | 2 +- pkgs/tools/filesystems/grive2/default.nix | 2 +- pkgs/tools/filesystems/hubicfuse/default.nix | 2 +- pkgs/tools/filesystems/ifuse/default.nix | 2 -- pkgs/tools/filesystems/lizardfs/default.nix | 2 +- pkgs/tools/filesystems/mhddfs/default.nix | 2 +- pkgs/tools/filesystems/mkspiffs/default.nix | 2 +- pkgs/tools/filesystems/mp3fs/default.nix | 4 ++-- pkgs/tools/filesystems/mtdutils/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 4 ++-- pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/pyblock.nix | 4 ++-- .../filesystems/nixpart/0.4/pykickstart.nix | 4 ++-- pkgs/tools/filesystems/nixpart/0.4/pyparted.nix | 4 ++-- pkgs/tools/filesystems/nixpart/default.nix | 2 +- pkgs/tools/filesystems/ntfs-3g/default.nix | 1 - pkgs/tools/filesystems/rdfind/default.nix | 4 ++-- pkgs/tools/filesystems/s3backer/default.nix | 2 +- pkgs/tools/filesystems/s3fs/default.nix | 2 +- pkgs/tools/filesystems/securefs/default.nix | 2 +- pkgs/tools/filesystems/simg2img/default.nix | 2 +- pkgs/tools/filesystems/smbnetfs/default.nix | 4 ++-- pkgs/tools/filesystems/snapraid/default.nix | 2 +- pkgs/tools/filesystems/squashfs/default.nix | 2 +- pkgs/tools/filesystems/squashfuse/default.nix | 1 - pkgs/tools/filesystems/sshfs-fuse/default.nix | 2 +- pkgs/tools/filesystems/tmsu/default.nix | 2 +- pkgs/tools/filesystems/u3-tool/default.nix | 3 +-- pkgs/tools/filesystems/udftools/default.nix | 2 +- pkgs/tools/filesystems/unionfs-fuse/default.nix | 2 +- pkgs/tools/filesystems/xfsprogs/default.nix | 2 +- pkgs/tools/filesystems/xtreemfs/default.nix | 2 +- pkgs/tools/filesystems/yandex-disk/default.nix | 4 ++-- pkgs/tools/filesystems/zerofree/default.nix | 4 ++-- pkgs/tools/filesystems/zkfuse/default.nix | 2 +- pkgs/tools/graphics/appleseed/default.nix | 2 +- pkgs/tools/graphics/barcode/default.nix | 3 +-- pkgs/tools/graphics/blockhash/default.nix | 2 +- pkgs/tools/graphics/cfdg/default.nix | 6 +++--- pkgs/tools/graphics/convchain/default.nix | 2 +- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/dpic/default.nix | 4 ++-- pkgs/tools/graphics/enblend-enfuse/default.nix | 4 ++-- pkgs/tools/graphics/epstool/default.nix | 2 +- pkgs/tools/graphics/facedetect/default.nix | 4 ++-- .../graphics/fast-neural-doodle/default.nix | 2 +- pkgs/tools/graphics/fim/default.nix | 4 ++-- pkgs/tools/graphics/flam3/default.nix | 1 - pkgs/tools/graphics/ggobi/default.nix | 2 +- pkgs/tools/graphics/glee/default.nix | 1 - pkgs/tools/graphics/glmark2/default.nix | 2 +- pkgs/tools/graphics/glxinfo/default.nix | 2 +- pkgs/tools/graphics/gromit-mpx/default.nix | 2 +- pkgs/tools/graphics/ibniz/default.nix | 4 ++-- pkgs/tools/graphics/imgur-screenshot/default.nix | 2 +- pkgs/tools/graphics/jhead/default.nix | 8 ++++---- pkgs/tools/graphics/lepton/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 4 ++-- pkgs/tools/graphics/luxcorerender/default.nix | 2 +- pkgs/tools/graphics/maim/default.nix | 2 +- pkgs/tools/graphics/neural-style/default.nix | 2 +- pkgs/tools/graphics/nifskope/default.nix | 2 +- pkgs/tools/graphics/optar/default.nix | 2 +- pkgs/tools/graphics/pdf2svg/default.nix | 2 +- pkgs/tools/graphics/pdftag/default.nix | 1 - pkgs/tools/graphics/perceptualdiff/default.nix | 1 - pkgs/tools/graphics/pfstools/default.nix | 3 +-- pkgs/tools/graphics/pngquant/default.nix | 2 +- pkgs/tools/graphics/povray/default.nix | 2 +- pkgs/tools/graphics/qrcode/default.nix | 2 +- pkgs/tools/graphics/rocket/default.nix | 2 +- pkgs/tools/graphics/s2png/default.nix | 2 +- pkgs/tools/graphics/scanbd/default.nix | 4 ++-- pkgs/tools/graphics/sng/default.nix | 2 +- pkgs/tools/graphics/structure-synth/default.nix | 2 +- pkgs/tools/graphics/swfdec/default.nix | 1 - pkgs/tools/graphics/syntex/default.nix | 2 +- pkgs/tools/graphics/unpaper/default.nix | 4 ++-- pkgs/tools/graphics/vips/default.nix | 2 +- pkgs/tools/graphics/vulkan-tools/default.nix | 2 +- pkgs/tools/graphics/wallutils/default.nix | 2 +- .../graphics/wavefunctioncollapse/default.nix | 2 +- pkgs/tools/graphics/welkin/default.nix | 2 +- pkgs/tools/graphics/wkhtmltopdf/default.nix | 2 +- pkgs/tools/graphics/yafaray-core/default.nix | 2 +- pkgs/tools/graphics/yaxg/default.nix | 2 +- pkgs/tools/graphics/zxing/default.nix | 2 +- .../fcitx-engines/fcitx-anthy/default.nix | 4 ++-- .../fcitx-engines/fcitx-chewing/default.nix | 4 ++-- .../fcitx-engines/fcitx-cloudpinyin/default.nix | 4 ++-- .../fcitx-engines/fcitx-hangul/default.nix | 4 ++-- .../fcitx-engines/fcitx-libpinyin/default.nix | 4 ++-- .../fcitx-engines/fcitx-m17n/default.nix | 4 ++-- .../fcitx-engines/fcitx-rime/default.nix | 4 ++-- .../fcitx-engines/fcitx-skk/default.nix | 2 +- .../fcitx-engines/fcitx-table-extra/default.nix | 4 ++-- .../fcitx-engines/fcitx-table-other/default.nix | 4 ++-- .../fcitx-engines/fcitx-unikey/default.nix | 4 ++-- pkgs/tools/inputmethods/fcitx/unwrapped.nix | 2 +- .../ibus-engines/ibus-anthy/default.nix | 4 ++-- .../ibus-engines/ibus-hangul/default.nix | 4 ++-- .../ibus-engines/ibus-kkc/default.nix | 3 +-- .../ibus-engines/ibus-libpinyin/default.nix | 2 +- .../ibus-engines/ibus-m17n/default.nix | 2 +- .../ibus-engines/ibus-table-chinese/default.nix | 2 +- .../ibus-engines/ibus-table-others/default.nix | 4 ++-- .../ibus-engines/ibus-table/default.nix | 2 +- .../ibus-engines/ibus-uniemoji/default.nix | 2 +- pkgs/tools/inputmethods/ibus/default.nix | 4 ++-- pkgs/tools/inputmethods/ibus/ibus-qt.nix | 4 ++-- pkgs/tools/inputmethods/keyfuzz/default.nix | 2 +- .../inputmethods/libinput-gestures/default.nix | 1 - pkgs/tools/inputmethods/libkkc/default.nix | 3 +-- .../tools/inputmethods/skk/skk-dicts/default.nix | 2 +- pkgs/tools/inputmethods/skk/skktools/default.nix | 2 +- .../tegaki-zinnia-japanese/default.nix | 2 +- pkgs/tools/inputmethods/touchegg/default.nix | 4 ++-- pkgs/tools/inputmethods/triggerhappy/default.nix | 2 +- pkgs/tools/inputmethods/uim/default.nix | 2 +- pkgs/tools/inputmethods/zinnia/default.nix | 2 +- pkgs/tools/misc/0x0/default.nix | 2 +- pkgs/tools/misc/aescrypt/default.nix | 4 ++-- pkgs/tools/misc/alarm-clock-applet/default.nix | 2 +- pkgs/tools/misc/antimicro/default.nix | 2 +- pkgs/tools/misc/argtable/default.nix | 2 +- pkgs/tools/misc/arp-scan/default.nix | 2 +- pkgs/tools/misc/aspcud/default.nix | 2 +- pkgs/tools/misc/autojump/default.nix | 2 +- pkgs/tools/misc/automirror/default.nix | 1 - pkgs/tools/misc/autorevision/default.nix | 2 +- pkgs/tools/misc/azure-vhd-utils/default.nix | 2 +- pkgs/tools/misc/bandwidth/default.nix | 4 ++-- pkgs/tools/misc/bbe/default.nix | 2 +- pkgs/tools/misc/bibtex2html/default.nix | 2 +- pkgs/tools/misc/bibtool/default.nix | 2 +- pkgs/tools/misc/bibutils/default.nix | 2 +- pkgs/tools/misc/blink1-tool/default.nix | 2 +- pkgs/tools/misc/blsd/default.nix | 2 +- pkgs/tools/misc/bmon/default.nix | 2 +- pkgs/tools/misc/calamares/default.nix | 3 +-- pkgs/tools/misc/capture/default.nix | 2 +- pkgs/tools/misc/chelf/default.nix | 2 +- pkgs/tools/misc/chezmoi/default.nix | 2 +- pkgs/tools/misc/cht.sh/default.nix | 2 +- pkgs/tools/misc/ckb-next/default.nix | 2 +- pkgs/tools/misc/clac/default.nix | 1 - pkgs/tools/misc/clex/default.nix | 4 ++-- pkgs/tools/misc/clipnotify/default.nix | 2 +- pkgs/tools/misc/clipster/default.nix | 2 +- pkgs/tools/misc/cloc/default.nix | 2 +- pkgs/tools/misc/cloud-sql-proxy/default.nix | 2 +- pkgs/tools/misc/cloud-utils/default.nix | 2 +- pkgs/tools/misc/colord-kde/default.nix | 4 ++-- pkgs/tools/misc/contacts/default.nix | 2 +- pkgs/tools/misc/cowsay/default.nix | 2 +- pkgs/tools/misc/cpulimit/default.nix | 4 ++-- pkgs/tools/misc/cpuminer/default.nix | 4 ++-- pkgs/tools/misc/crex/default.nix | 1 - pkgs/tools/misc/cunit/default.nix | 4 ++-- pkgs/tools/misc/cutecom/default.nix | 2 +- pkgs/tools/misc/dashing/default.nix | 2 +- pkgs/tools/misc/datamash/default.nix | 4 ++-- pkgs/tools/misc/dateutils/default.nix | 4 ++-- pkgs/tools/misc/dbus-map/default.nix | 2 +- pkgs/tools/misc/ddcutil/default.nix | 2 +- pkgs/tools/misc/debian-devscripts/default.nix | 2 +- pkgs/tools/misc/ding-libs/default.nix | 2 +- pkgs/tools/misc/direnv/default.nix | 2 +- pkgs/tools/misc/diskscan/default.nix | 2 +- pkgs/tools/misc/docbook2mdoc/default.nix | 4 ++-- pkgs/tools/misc/docker-ls/default.nix | 2 +- pkgs/tools/misc/docui/default.nix | 2 +- pkgs/tools/misc/dtach/default.nix | 4 ++-- pkgs/tools/misc/duc/default.nix | 2 +- pkgs/tools/misc/dumptorrent/default.nix | 2 +- pkgs/tools/misc/dynamic-colors/default.nix | 2 +- pkgs/tools/misc/emv/default.nix | 2 +- pkgs/tools/misc/entr/default.nix | 4 ++-- pkgs/tools/misc/envdir-go/default.nix | 2 +- pkgs/tools/misc/envsubst/default.nix | 2 +- pkgs/tools/misc/eot-utilities/default.nix | 1 - pkgs/tools/misc/esptool-ck/default.nix | 2 +- pkgs/tools/misc/ethtool/default.nix | 4 ++-- pkgs/tools/misc/expect/default.nix | 2 +- pkgs/tools/misc/fdupes/default.nix | 2 +- pkgs/tools/misc/file/default.nix | 6 +++--- pkgs/tools/misc/filebench/default.nix | 4 ++-- pkgs/tools/misc/flashrom/default.nix | 2 +- pkgs/tools/misc/fltrdr/default.nix | 2 +- pkgs/tools/misc/fondu/default.nix | 2 +- pkgs/tools/misc/fpart/default.nix | 4 ++-- pkgs/tools/misc/fpp/default.nix | 2 +- pkgs/tools/misc/fsmark/default.nix | 2 +- pkgs/tools/misc/fsmon/default.nix | 2 +- pkgs/tools/misc/fsql/default.nix | 2 +- pkgs/tools/misc/fwup/default.nix | 2 +- pkgs/tools/misc/fzy/default.nix | 2 +- pkgs/tools/misc/gams/default.nix | 2 +- pkgs/tools/misc/gawp/default.nix | 2 +- pkgs/tools/misc/gbdfed/default.nix | 4 ++-- pkgs/tools/misc/geekbench/default.nix | 2 +- pkgs/tools/misc/geteltorito/default.nix | 2 +- pkgs/tools/misc/gibo/default.nix | 2 +- pkgs/tools/misc/git-town/default.nix | 2 +- pkgs/tools/misc/gnokii/default.nix | 4 ++-- pkgs/tools/misc/goaccess/default.nix | 2 +- pkgs/tools/misc/gosu/default.nix | 2 +- pkgs/tools/misc/graylog/default.nix | 2 +- pkgs/tools/misc/grc/default.nix | 2 +- pkgs/tools/misc/grub4dos/default.nix | 2 +- pkgs/tools/misc/gsmartcontrol/default.nix | 2 +- pkgs/tools/misc/gti/default.nix | 2 +- pkgs/tools/misc/h5utils/default.nix | 2 +- pkgs/tools/misc/hakuneko/default.nix | 2 +- pkgs/tools/misc/hdf4/default.nix | 2 +- pkgs/tools/misc/hdf5/1_8.nix | 4 ++-- pkgs/tools/misc/hdf5/default.nix | 4 ++-- pkgs/tools/misc/hdfjava/default.nix | 2 +- pkgs/tools/misc/hdfview/default.nix | 4 ++-- pkgs/tools/misc/hebcal/default.nix | 2 +- pkgs/tools/misc/hexd/default.nix | 2 +- pkgs/tools/misc/hhpc/default.nix | 2 +- pkgs/tools/misc/hostsblock/default.nix | 2 +- pkgs/tools/misc/hpl/default.nix | 4 ++-- pkgs/tools/misc/i3cat/default.nix | 2 +- pkgs/tools/misc/i3minator/default.nix | 2 +- pkgs/tools/misc/ical2org/default.nix | 2 +- pkgs/tools/misc/ideviceinstaller/default.nix | 2 -- pkgs/tools/misc/ifdtool/default.nix | 2 +- pkgs/tools/misc/intelmetool/default.nix | 2 +- pkgs/tools/misc/ipad_charge/default.nix | 2 +- pkgs/tools/misc/ised/default.nix | 4 ++-- pkgs/tools/misc/jdupes/default.nix | 2 +- pkgs/tools/misc/keychain/default.nix | 2 +- pkgs/tools/misc/kt/default.nix | 2 +- pkgs/tools/misc/latex2html/default.nix | 2 +- pkgs/tools/misc/ldapvi/default.nix | 2 +- pkgs/tools/misc/ldmtool/default.nix | 2 +- pkgs/tools/misc/lf/default.nix | 2 +- pkgs/tools/misc/libcpuid/default.nix | 2 +- pkgs/tools/misc/linuxquota/default.nix | 2 +- pkgs/tools/misc/logstash/5.x.nix | 4 ++-- pkgs/tools/misc/logstash/contrib.nix | 2 +- pkgs/tools/misc/ltunify/default.nix | 2 +- pkgs/tools/misc/mandoc/default.nix | 2 +- pkgs/tools/misc/massren/default.nix | 2 +- pkgs/tools/misc/mbuffer/default.nix | 2 +- pkgs/tools/misc/mc/default.nix | 4 ++-- pkgs/tools/misc/mcrypt/default.nix | 4 ++-- pkgs/tools/misc/megacli/default.nix | 2 +- pkgs/tools/misc/mht2htm/default.nix | 2 +- pkgs/tools/misc/minicom/default.nix | 2 +- pkgs/tools/misc/ministat/default.nix | 2 +- pkgs/tools/misc/mktorrent/default.nix | 2 +- pkgs/tools/misc/mlocate/default.nix | 4 ++-- pkgs/tools/misc/mmake/default.nix | 2 +- pkgs/tools/misc/mmv/default.nix | 2 +- pkgs/tools/misc/mongodb-tools/default.nix | 2 +- pkgs/tools/misc/moreutils/default.nix | 2 +- pkgs/tools/misc/mpdscribble/default.nix | 2 +- pkgs/tools/misc/mprime/default.nix | 2 +- pkgs/tools/misc/mrtg/default.nix | 4 ++-- pkgs/tools/misc/ms-sys/default.nix | 4 ++-- pkgs/tools/misc/multitail/default.nix | 4 ++-- pkgs/tools/misc/mysqltuner/default.nix | 2 +- pkgs/tools/misc/nagstamon/default.nix | 2 +- pkgs/tools/misc/nbench/default.nix | 4 ++-- pkgs/tools/misc/ncdu/default.nix | 4 ++-- pkgs/tools/misc/neofetch/default.nix | 2 +- .../misc/nginx-config-formatter/default.nix | 2 +- pkgs/tools/misc/nms/default.nix | 2 +- pkgs/tools/misc/noteshrink/default.nix | 2 +- pkgs/tools/misc/noti/default.nix | 2 +- pkgs/tools/misc/notify-desktop/default.nix | 2 +- pkgs/tools/misc/nvramtool/default.nix | 2 +- pkgs/tools/misc/oci-image-tool/default.nix | 2 +- pkgs/tools/misc/ocz-ssd-guru/default.nix | 2 +- pkgs/tools/misc/opentsdb/default.nix | 4 ++-- pkgs/tools/misc/os-prober/default.nix | 2 +- pkgs/tools/misc/osm2pgsql/default.nix | 2 +- pkgs/tools/misc/otfcc/default.nix | 2 +- pkgs/tools/misc/parcellite/default.nix | 2 +- pkgs/tools/misc/pastebinit/default.nix | 4 ++-- pkgs/tools/misc/pb_cli/default.nix | 2 +- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- pkgs/tools/misc/phraseapp-client/default.nix | 2 +- pkgs/tools/misc/pick/default.nix | 2 +- pkgs/tools/misc/picocom/default.nix | 2 +- pkgs/tools/misc/pipelight/default.nix | 2 +- pkgs/tools/misc/pixd/default.nix | 2 +- pkgs/tools/misc/plantuml/default.nix | 2 +- pkgs/tools/misc/plotinus/default.nix | 2 +- pkgs/tools/misc/plowshare/default.nix | 2 +- pkgs/tools/misc/pod2mdoc/default.nix | 4 ++-- pkgs/tools/misc/powerline-go/default.nix | 1 - pkgs/tools/misc/profile-cleaner/default.nix | 2 +- pkgs/tools/misc/profile-sync-daemon/default.nix | 2 +- pkgs/tools/misc/progress/default.nix | 2 +- pkgs/tools/misc/pspg/default.nix | 2 +- pkgs/tools/misc/radeon-profile/default.nix | 2 +- pkgs/tools/misc/rcm/default.nix | 2 +- pkgs/tools/misc/recoverjpeg/default.nix | 4 ++-- pkgs/tools/misc/rig/default.nix | 2 +- pkgs/tools/misc/rlwrap/default.nix | 4 ++-- pkgs/tools/misc/rmlint/default.nix | 2 +- pkgs/tools/misc/rockbox-utility/default.nix | 2 +- pkgs/tools/misc/roundup/default.nix | 2 +- pkgs/tools/misc/routino/default.nix | 4 ++-- pkgs/tools/misc/rw/default.nix | 2 +- pkgs/tools/misc/sam-ba/default.nix | 2 +- pkgs/tools/misc/scanmem/default.nix | 2 +- pkgs/tools/misc/scfbuild/default.nix | 2 +- pkgs/tools/misc/screen/default.nix | 4 ++-- pkgs/tools/misc/screenfetch/default.nix | 2 +- pkgs/tools/misc/sdate/default.nix | 2 +- pkgs/tools/misc/sdl-jstest/default.nix | 2 +- pkgs/tools/misc/sl/default.nix | 2 +- pkgs/tools/misc/slop/default.nix | 2 +- pkgs/tools/misc/smenu/default.nix | 2 +- pkgs/tools/misc/snapper/default.nix | 2 +- pkgs/tools/misc/sonota/default.nix | 2 +- pkgs/tools/misc/staruml/default.nix | 2 +- pkgs/tools/misc/subberthehut/default.nix | 2 +- pkgs/tools/misc/sutils/default.nix | 2 +- pkgs/tools/misc/svtplay-dl/default.nix | 2 +- pkgs/tools/misc/sweep-visualizer/default.nix | 2 +- .../tools/misc/system-config-printer/default.nix | 4 ++-- pkgs/tools/misc/systrayhelper/default.nix | 2 +- pkgs/tools/misc/teleconsole/default.nix | 2 +- pkgs/tools/misc/tewisay/default.nix | 2 +- pkgs/tools/misc/texi2mdoc/default.nix | 4 ++-- .../misc/thin-provisioning-tools/default.nix | 2 +- pkgs/tools/misc/time/default.nix | 4 ++-- pkgs/tools/misc/tio/default.nix | 2 +- pkgs/tools/misc/tldr/default.nix | 2 +- pkgs/tools/misc/tlp/default.nix | 2 +- pkgs/tools/misc/tmate/default.nix | 2 +- pkgs/tools/misc/togglesg-download/default.nix | 2 +- pkgs/tools/misc/toilet/default.nix | 4 ++-- pkgs/tools/misc/toybox/default.nix | 1 - pkgs/tools/misc/ttfautohint/default.nix | 4 ++-- pkgs/tools/misc/ttwatch/default.nix | 2 +- pkgs/tools/misc/tty-clock/default.nix | 2 +- pkgs/tools/misc/ttylog/default.nix | 2 +- pkgs/tools/misc/ttyplot/default.nix | 2 +- pkgs/tools/misc/ttyrec/default.nix | 4 ++-- pkgs/tools/misc/txt2man/default.nix | 4 ++-- pkgs/tools/misc/txtw/default.nix | 2 +- pkgs/tools/misc/ultrastar-creator/default.nix | 2 +- pkgs/tools/misc/umlet/default.nix | 2 +- pkgs/tools/misc/units/default.nix | 4 ++-- pkgs/tools/misc/up/default.nix | 2 +- pkgs/tools/misc/upower-notify/default.nix | 2 +- pkgs/tools/misc/urjtag/default.nix | 2 +- pkgs/tools/misc/vfdecrypt/default.nix | 2 +- pkgs/tools/misc/vimer/default.nix | 2 +- pkgs/tools/misc/vimpager/build.nix | 2 +- pkgs/tools/misc/wakatime/default.nix | 2 +- pkgs/tools/misc/wl-clipboard/default.nix | 2 +- pkgs/tools/misc/woeusb/default.nix | 2 +- pkgs/tools/misc/woof/default.nix | 2 +- pkgs/tools/misc/wv/default.nix | 3 +-- pkgs/tools/misc/wyrd/default.nix | 2 +- pkgs/tools/misc/xclip/default.nix | 2 +- pkgs/tools/misc/xdaliclock/default.nix | 4 ++-- pkgs/tools/misc/xdo/default.nix | 2 +- pkgs/tools/misc/xflux/gui.nix | 2 +- pkgs/tools/misc/xiccd/default.nix | 2 +- pkgs/tools/misc/xmonad-log/default.nix | 2 +- pkgs/tools/misc/xsel/default.nix | 2 +- pkgs/tools/misc/yle-dl/default.nix | 2 +- .../misc/yubikey-personalization/default.nix | 2 +- pkgs/tools/misc/zabbix-cli/default.nix | 2 +- pkgs/tools/misc/zsh-autoenv/default.nix | 2 +- pkgs/tools/misc/zsh-navigation-tools/default.nix | 2 +- pkgs/tools/networking/acme-client/default.nix | 2 +- pkgs/tools/networking/argus-clients/default.nix | 3 +-- pkgs/tools/networking/argus/default.nix | 3 +-- pkgs/tools/networking/aria2/default.nix | 2 +- pkgs/tools/networking/arping/default.nix | 2 +- pkgs/tools/networking/assh/default.nix | 2 +- pkgs/tools/networking/asynk/default.nix | 4 ++-- pkgs/tools/networking/atftp/default.nix | 4 ++-- pkgs/tools/networking/biosdevname/default.nix | 2 +- pkgs/tools/networking/bud/default.nix | 2 +- pkgs/tools/networking/bully/default.nix | 2 +- pkgs/tools/networking/ccnet/default.nix | 2 +- pkgs/tools/networking/chrony/default.nix | 4 ++-- pkgs/tools/networking/cmst/default.nix | 4 ++-- pkgs/tools/networking/cntlm/default.nix | 4 ++-- pkgs/tools/networking/connect/default.nix | 2 +- .../networking/connman/connman-gtk/default.nix | 2 +- .../connman/connman-ncurses/default.nix | 2 +- .../connman/connman-notify/default.nix | 2 +- .../networking/connman/connman_dmenu/default.nix | 2 +- .../networking/connman/connmanui/default.nix | 2 +- pkgs/tools/networking/connman/default.nix | 4 ++-- pkgs/tools/networking/darkstat/default.nix | 4 ++-- pkgs/tools/networking/davix/default.nix | 2 +- pkgs/tools/networking/dd-agent/5.nix | 2 +- pkgs/tools/networking/dd-agent/datadog-agent.nix | 2 +- .../dd-agent/datadog-process-agent.nix | 2 +- pkgs/tools/networking/dhcp/default.nix | 4 ++-- pkgs/tools/networking/dhcping/default.nix | 2 +- pkgs/tools/networking/dibbler/default.nix | 4 ++-- pkgs/tools/networking/dirb/default.nix | 2 +- .../networking/dnscrypt-proxy/1.x/default.nix | 4 ++-- .../networking/dnscrypt-wrapper/default.nix | 2 +- pkgs/tools/networking/dnsperf/default.nix | 2 +- pkgs/tools/networking/driftnet/default.nix | 2 +- pkgs/tools/networking/eggdrop/default.nix | 2 +- pkgs/tools/networking/envoy/default.nix | 2 +- .../networking/eternal-terminal/default.nix | 2 +- pkgs/tools/networking/fakeroute/default.nix | 4 ++-- pkgs/tools/networking/fastd/default.nix | 2 +- pkgs/tools/networking/ferm/default.nix | 2 +- pkgs/tools/networking/flannel/default.nix | 2 +- pkgs/tools/networking/freebind/default.nix | 2 +- pkgs/tools/networking/gmvault/default.nix | 4 ++-- pkgs/tools/networking/goklp/default.nix | 2 +- pkgs/tools/networking/grpcurl/default.nix | 2 +- pkgs/tools/networking/gvpe/default.nix | 2 +- pkgs/tools/networking/hans/default.nix | 2 +- pkgs/tools/networking/haproxy/default.nix | 3 +-- pkgs/tools/networking/horst/default.nix | 2 +- pkgs/tools/networking/hping/default.nix | 2 +- pkgs/tools/networking/htpdate/default.nix | 4 ++-- pkgs/tools/networking/http-prompt/default.nix | 1 - pkgs/tools/networking/httperf/default.nix | 1 - pkgs/tools/networking/httping/default.nix | 4 ++-- pkgs/tools/networking/httplab/default.nix | 2 +- pkgs/tools/networking/httpstat/default.nix | 1 - pkgs/tools/networking/httptunnel/default.nix | 4 ++-- pkgs/tools/networking/i2p/default.nix | 2 +- pkgs/tools/networking/i2pd/default.nix | 2 -- pkgs/tools/networking/ifstat-legacy/default.nix | 2 +- pkgs/tools/networking/inadyn/default.nix | 2 +- pkgs/tools/networking/iouyap/default.nix | 1 - pkgs/tools/networking/ip2location/default.nix | 2 +- pkgs/tools/networking/ip2unix/default.nix | 2 +- pkgs/tools/networking/ipcalc/default.nix | 4 ++-- pkgs/tools/networking/ipv6calc/default.nix | 4 ++-- pkgs/tools/networking/kail/default.nix | 2 +- pkgs/tools/networking/kea/default.nix | 3 +-- pkgs/tools/networking/keepalived/default.nix | 2 +- pkgs/tools/networking/lftp/default.nix | 8 ++++---- pkgs/tools/networking/lldpd/default.nix | 4 ++-- .../tools/networking/logmein-hamachi/default.nix | 4 ++-- pkgs/tools/networking/maxscale/default.nix | 4 ++-- pkgs/tools/networking/mcrcon/default.nix | 2 +- pkgs/tools/networking/megatools/default.nix | 2 +- .../networking/memtier-benchmark/default.nix | 2 +- pkgs/tools/networking/minio-client/default.nix | 2 +- pkgs/tools/networking/minissdpd/default.nix | 6 +++--- pkgs/tools/networking/miredo/default.nix | 2 +- pkgs/tools/networking/mu/default.nix | 2 +- pkgs/tools/networking/nat-traverse/default.nix | 2 +- pkgs/tools/networking/ncftp/default.nix | 2 +- pkgs/tools/networking/ndjbdns/default.nix | 2 +- pkgs/tools/networking/netalyzr/default.nix | 2 +- pkgs/tools/networking/nethogs/default.nix | 2 +- pkgs/tools/networking/netmask/default.nix | 2 +- pkgs/tools/networking/netrw/default.nix | 2 +- pkgs/tools/networking/netselect/default.nix | 4 ++-- .../networking/network-manager/0.9.8/default.nix | 2 +- .../tools/networking/network-manager/default.nix | 2 +- pkgs/tools/networking/network-manager/dmenu.nix | 2 +- .../networking/network-manager/strongswan.nix | 3 +-- pkgs/tools/networking/ngrep/default.nix | 2 +- pkgs/tools/networking/ngrok-1/default.nix | 2 +- pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++-- pkgs/tools/networking/nuttcp/default.nix | 10 +++++----- pkgs/tools/networking/nzbget/default.nix | 2 +- pkgs/tools/networking/ocproxy/default.nix | 2 +- pkgs/tools/networking/ocserv/default.nix | 2 +- pkgs/tools/networking/olsrd/default.nix | 4 ++-- pkgs/tools/networking/openconnect_pa/default.nix | 2 +- pkgs/tools/networking/openntpd/default.nix | 4 ++-- pkgs/tools/networking/openresolv/default.nix | 4 ++-- pkgs/tools/networking/opensm/default.nix | 2 +- pkgs/tools/networking/openssh/default.nix | 4 ++-- pkgs/tools/networking/openvpn/default.nix | 4 ++-- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 6 +++--- pkgs/tools/networking/packetdrill/default.nix | 2 +- pkgs/tools/networking/pacparser/default.nix | 4 ++-- pkgs/tools/networking/par2cmdline/default.nix | 2 +- pkgs/tools/networking/pcapc/default.nix | 2 +- pkgs/tools/networking/philter/default.nix | 4 ++-- pkgs/tools/networking/pingtcp/default.nix | 2 +- pkgs/tools/networking/pixiewps/default.nix | 2 +- pkgs/tools/networking/polysh/default.nix | 4 ++-- pkgs/tools/networking/ppp/default.nix | 4 ++-- pkgs/tools/networking/pptpd/default.nix | 3 +-- pkgs/tools/networking/privoxy/default.nix | 4 ++-- pkgs/tools/networking/proxychains/default.nix | 4 ++-- pkgs/tools/networking/pssh/default.nix | 2 +- pkgs/tools/networking/pykms/default.nix | 2 +- .../tools/networking/qr-filetransfer/default.nix | 2 +- pkgs/tools/networking/quicktun/default.nix | 2 +- pkgs/tools/networking/radsecproxy/default.nix | 2 +- pkgs/tools/networking/radvd/default.nix | 4 ++-- pkgs/tools/networking/ratools/default.nix | 2 +- pkgs/tools/networking/reaver-wps/default.nix | 4 ++-- pkgs/tools/networking/redir/default.nix | 2 +- pkgs/tools/networking/ripmime/default.nix | 3 +-- pkgs/tools/networking/s3gof3r/default.nix | 2 +- pkgs/tools/networking/samplicator/default.nix | 2 +- pkgs/tools/networking/shncpd/default.nix | 2 +- pkgs/tools/networking/simpleproxy/default.nix | 2 +- pkgs/tools/networking/sipcalc/default.nix | 4 ++-- pkgs/tools/networking/sipsak/default.nix | 2 +- pkgs/tools/networking/skydive/default.nix | 2 +- pkgs/tools/networking/slack-cli/default.nix | 2 +- pkgs/tools/networking/slirp4netns/default.nix | 2 +- pkgs/tools/networking/smokeping/default.nix | 2 +- pkgs/tools/networking/snabb/default.nix | 2 +- pkgs/tools/networking/spiped/default.nix | 4 ++-- pkgs/tools/networking/spoofer/default.nix | 3 +-- pkgs/tools/networking/ssh-ident/default.nix | 2 +- pkgs/tools/networking/sshpass/default.nix | 2 +- pkgs/tools/networking/ssldump/default.nix | 2 +- pkgs/tools/networking/sstp/default.nix | 2 +- pkgs/tools/networking/strongswan/default.nix | 4 ++-- pkgs/tools/networking/stubby/default.nix | 1 - pkgs/tools/networking/stun/default.nix | 1 - pkgs/tools/networking/stunnel/default.nix | 4 ++-- pkgs/tools/networking/subfinder/default.nix | 2 +- .../tools/networking/swagger-codegen/default.nix | 1 - pkgs/tools/networking/swaks/default.nix | 4 ++-- pkgs/tools/networking/tcpdump/default.nix | 2 +- pkgs/tools/networking/tcpreplay/default.nix | 2 +- pkgs/tools/networking/tftp-hpa/default.nix | 4 ++-- pkgs/tools/networking/tinc/default.nix | 2 +- pkgs/tools/networking/tinc/pre.nix | 2 +- pkgs/tools/networking/tinyproxy/default.nix | 2 +- pkgs/tools/networking/tracebox/default.nix | 2 +- pkgs/tools/networking/traceroute/default.nix | 4 ++-- pkgs/tools/networking/twa/default.nix | 2 +- pkgs/tools/networking/ua/default.nix | 2 +- pkgs/tools/networking/ubridge/default.nix | 2 +- .../tools/networking/uget-integrator/default.nix | 2 +- pkgs/tools/networking/uget/default.nix | 4 ++-- pkgs/tools/networking/unbound/default.nix | 4 ++-- pkgs/tools/networking/unbound/python.nix | 1 - pkgs/tools/networking/wbox/default.nix | 4 ++-- pkgs/tools/networking/weighttp/default.nix | 2 +- pkgs/tools/networking/wget/default.nix | 4 ++-- pkgs/tools/networking/whois/default.nix | 2 +- pkgs/tools/networking/wicd/default.nix | 4 ++-- pkgs/tools/networking/wireguard-go/default.nix | 2 +- pkgs/tools/networking/wolfebin/default.nix | 2 +- pkgs/tools/networking/wrk/default.nix | 2 +- pkgs/tools/networking/wrk2/default.nix | 2 +- pkgs/tools/networking/wuzz/default.nix | 2 +- pkgs/tools/networking/zap/default.nix | 2 +- pkgs/tools/nix/nix-script/default.nix | 2 +- .../package-management/apt-dater/default.nix | 2 +- pkgs/tools/package-management/apt/default.nix | 2 +- pkgs/tools/package-management/bunny/default.nix | 2 +- pkgs/tools/package-management/cde/default.nix | 2 +- pkgs/tools/package-management/clib/default.nix | 2 +- .../package-management/createrepo_c/default.nix | 2 +- pkgs/tools/package-management/dpkg/default.nix | 2 +- pkgs/tools/package-management/gx/default.nix | 2 +- pkgs/tools/package-management/gx/go/default.nix | 2 +- .../package-management/home-manager/default.nix | 2 +- .../tools/package-management/librepo/default.nix | 2 +- pkgs/tools/package-management/morph/default.nix | 2 +- .../package-management/mynewt-newt/default.nix | 2 +- .../package-management/nix-bundle/default.nix | 1 - .../tools/package-management/nix-pin/default.nix | 2 +- .../package-management/nix-prefetch/default.nix | 1 - .../tools/package-management/nix-top/default.nix | 2 +- .../package-management/nixops/nixops-dns.nix | 2 +- pkgs/tools/package-management/nixui/default.nix | 2 +- pkgs/tools/package-management/opkg/default.nix | 2 +- .../package-management/packagekit/default.nix | 2 +- pkgs/tools/package-management/packagekit/qt.nix | 2 +- pkgs/tools/package-management/pacman/default.nix | 2 +- pkgs/tools/package-management/rpm/default.nix | 2 +- pkgs/tools/security/2fa/default.nix | 2 +- pkgs/tools/security/acsccid/default.nix | 2 +- pkgs/tools/security/aespipe/default.nix | 2 +- pkgs/tools/security/afl/default.nix | 4 ++-- pkgs/tools/security/afl/libdislocator.nix | 2 +- pkgs/tools/security/aide/default.nix | 4 ++-- .../security/asc-key-to-qr-code-gif/default.nix | 2 +- pkgs/tools/security/aws-okta/default.nix | 2 +- pkgs/tools/security/b2sum/default.nix | 2 +- .../tools/security/bash-supergenpass/default.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 2 +- pkgs/tools/security/bruteforce-luks/default.nix | 2 +- pkgs/tools/security/ccid/default.nix | 4 ++-- pkgs/tools/security/certmgr/default.nix | 2 +- pkgs/tools/security/certstrap/default.nix | 2 +- pkgs/tools/security/cfssl/default.nix | 2 +- pkgs/tools/security/chntpw/default.nix | 2 +- .../security/chrome-token-signing/default.nix | 2 +- pkgs/tools/security/cipherscan/default.nix | 2 +- pkgs/tools/security/clamav/default.nix | 4 ++-- pkgs/tools/security/cowpatty/default.nix | 4 ++-- pkgs/tools/security/crackxls/default.nix | 2 +- pkgs/tools/security/crunch/default.nix | 4 ++-- pkgs/tools/security/ctmg/default.nix | 2 +- pkgs/tools/security/default.nix | 2 +- pkgs/tools/security/doas/default.nix | 2 +- pkgs/tools/security/duo-unix/default.nix | 2 +- pkgs/tools/security/ecdsautils/default.nix | 2 +- pkgs/tools/security/ecryptfs/default.nix | 2 +- pkgs/tools/security/ecryptfs/helper.nix | 1 - pkgs/tools/security/efitools/default.nix | 2 +- pkgs/tools/security/eid-mw/default.nix | 2 +- pkgs/tools/security/enchive/default.nix | 2 +- pkgs/tools/security/encryptr/default.nix | 2 +- pkgs/tools/security/enpass/default.nix | 2 +- pkgs/tools/security/eschalot/default.nix | 1 - pkgs/tools/security/fcrackzip/default.nix | 4 ++-- pkgs/tools/security/fpm2/default.nix | 2 +- pkgs/tools/security/fprot/default.nix | 2 +- pkgs/tools/security/fwknop/default.nix | 1 - pkgs/tools/security/gen-oath-safe/default.nix | 2 +- pkgs/tools/security/gencfsm/default.nix | 2 +- pkgs/tools/security/gnu-pw-mgr/default.nix | 4 ++-- pkgs/tools/security/gnupg/20.nix | 4 ++-- pkgs/tools/security/gnupg/22.nix | 4 ++-- pkgs/tools/security/gorilla-bin/default.nix | 2 +- pkgs/tools/security/gpgstats/default.nix | 4 ++-- pkgs/tools/security/hash-slinger/default.nix | 1 - pkgs/tools/security/hash_extender/default.nix | 2 +- pkgs/tools/security/haveged/default.nix | 2 +- pkgs/tools/security/ifdnfc/default.nix | 2 +- pkgs/tools/security/john/default.nix | 4 ++-- pkgs/tools/security/keybase/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- pkgs/tools/security/kpcli/default.nix | 4 ++-- pkgs/tools/security/libacr38u/default.nix | 2 +- pkgs/tools/security/libmodsecurity/default.nix | 2 +- pkgs/tools/security/logkeys/default.nix | 2 +- pkgs/tools/security/lynis/default.nix | 1 - pkgs/tools/security/masscan/default.nix | 2 +- pkgs/tools/security/metasploit/default.nix | 2 +- pkgs/tools/security/mfcuk/default.nix | 2 +- pkgs/tools/security/minisign/default.nix | 2 +- pkgs/tools/security/mkp224o/default.nix | 2 +- pkgs/tools/security/modsecurity/default.nix | 4 ++-- pkgs/tools/security/monkeysphere/default.nix | 2 +- pkgs/tools/security/nasty/default.nix | 4 ++-- pkgs/tools/security/neopg/default.nix | 2 +- pkgs/tools/security/nitrokey-app/default.nix | 2 +- pkgs/tools/security/nmap/qt.nix | 2 +- pkgs/tools/security/notary/default.nix | 2 +- pkgs/tools/security/nsjail/default.nix | 2 +- pkgs/tools/security/nwipe/default.nix | 2 +- pkgs/tools/security/omapd/default.nix | 4 ++-- pkgs/tools/security/onioncircuits/default.nix | 2 +- pkgs/tools/security/opencryptoki/default.nix | 2 +- pkgs/tools/security/opensc/default.nix | 2 +- pkgs/tools/security/p0f/default.nix | 4 ++-- pkgs/tools/security/paperkey/default.nix | 4 ++-- pkgs/tools/security/pass/default.nix | 4 ++-- pkgs/tools/security/pass/extensions/audit.nix | 2 +- .../tools/security/pass/extensions/genphrase.nix | 2 +- pkgs/tools/security/pass/extensions/import.nix | 2 +- pkgs/tools/security/pass/extensions/otp.nix | 2 +- pkgs/tools/security/pass/extensions/tomb.nix | 2 +- pkgs/tools/security/pass/extensions/update.nix | 2 +- pkgs/tools/security/pass/rofi-pass.nix | 2 +- pkgs/tools/security/pcsc-cyberjack/default.nix | 2 +- pkgs/tools/security/pcsc-scm-scl011/default.nix | 2 +- pkgs/tools/security/pcsclite/default.nix | 2 +- pkgs/tools/security/pdfcrack/default.nix | 2 +- pkgs/tools/security/pgpdump/default.nix | 2 +- pkgs/tools/security/prey/default.nix | 2 +- pkgs/tools/security/qdigidoc/default.nix | 2 +- pkgs/tools/security/qesteidutil/default.nix | 2 +- pkgs/tools/security/rarcrack/default.nix | 2 +- pkgs/tools/security/rhash/default.nix | 2 +- pkgs/tools/security/sbsigntool/default.nix | 2 +- pkgs/tools/security/scallion/default.nix | 2 +- pkgs/tools/security/scrypt/default.nix | 4 ++-- pkgs/tools/security/seccure/default.nix | 4 ++-- pkgs/tools/security/secp256k1/default.nix | 2 +- pkgs/tools/security/sedutil/default.nix | 2 +- .../security/sha1collisiondetection/default.nix | 2 +- pkgs/tools/security/shc/default.nix | 2 +- pkgs/tools/security/signify/default.nix | 2 +- pkgs/tools/security/signing-party/default.nix | 1 - pkgs/tools/security/simple-tpm-pk11/default.nix | 2 +- pkgs/tools/security/softhsm/default.nix | 4 ++-- .../spectre-meltdown-checker/default.nix | 2 +- pkgs/tools/security/ssdeep/default.nix | 2 +- pkgs/tools/security/sshguard/default.nix | 4 ++-- pkgs/tools/security/sslscan/default.nix | 2 +- pkgs/tools/security/steghide/default.nix | 2 +- pkgs/tools/security/stoken/default.nix | 1 - pkgs/tools/security/stricat/default.nix | 4 ++-- pkgs/tools/security/su-exec/default.nix | 2 +- pkgs/tools/security/sudolikeaboss/default.nix | 2 +- pkgs/tools/security/tboot/default.nix | 4 ++-- pkgs/tools/security/tcpcrypt/default.nix | 2 +- pkgs/tools/security/thc-hydra/default.nix | 2 +- pkgs/tools/security/tor/tor-arm.nix | 2 +- pkgs/tools/security/tor/torsocks.nix | 2 +- pkgs/tools/security/tpm-luks/default.nix | 2 +- pkgs/tools/security/tpm-quote-tools/default.nix | 4 ++-- pkgs/tools/security/trousers/default.nix | 4 ++-- pkgs/tools/security/vault/default.nix | 2 +- pkgs/tools/security/volatility/default.nix | 4 ++-- pkgs/tools/security/wipe/default.nix | 4 ++-- pkgs/tools/security/yara/default.nix | 2 +- pkgs/tools/system/amtterm/default.nix | 4 ++-- pkgs/tools/system/at/default.nix | 2 +- pkgs/tools/system/augeas/default.nix | 4 ++-- pkgs/tools/system/bfs/default.nix | 2 +- pkgs/tools/system/bootchart/default.nix | 2 +- pkgs/tools/system/chase/default.nix | 2 +- pkgs/tools/system/collectd/data.nix | 2 +- pkgs/tools/system/collectd/default.nix | 4 ++-- pkgs/tools/system/confd/default.nix | 2 +- pkgs/tools/system/consul-template/default.nix | 2 +- pkgs/tools/system/daemonize/default.nix | 2 +- pkgs/tools/system/das_watchdog/default.nix | 2 +- pkgs/tools/system/datefudge/default.nix | 1 - pkgs/tools/system/dd_rescue/default.nix | 4 ++-- pkgs/tools/system/ddrutility/default.nix | 4 ++-- pkgs/tools/system/dfc/default.nix | 4 ++-- pkgs/tools/system/di/default.nix | 4 ++-- pkgs/tools/system/efibootmgr/default.nix | 2 +- pkgs/tools/system/efivar/default.nix | 2 +- pkgs/tools/system/envconsul/default.nix | 2 +- pkgs/tools/system/evemu/default.nix | 2 +- pkgs/tools/system/facter/default.nix | 2 +- pkgs/tools/system/fakeroot/default.nix | 4 ++-- pkgs/tools/system/fcron/default.nix | 4 ++-- pkgs/tools/system/fio/default.nix | 2 +- pkgs/tools/system/foremost/default.nix | 4 ++-- pkgs/tools/system/freeipmi/default.nix | 4 ++-- pkgs/tools/system/gohai/default.nix | 2 +- pkgs/tools/system/goreman/default.nix | 2 +- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- pkgs/tools/system/hardinfo/default.nix | 2 +- pkgs/tools/system/hardlink/default.nix | 2 +- pkgs/tools/system/htop/default.nix | 4 ++-- pkgs/tools/system/hwinfo/default.nix | 2 +- pkgs/tools/system/illum/default.nix | 2 +- pkgs/tools/system/inxi/default.nix | 2 +- pkgs/tools/system/ioping/default.nix | 2 +- pkgs/tools/system/iops/default.nix | 4 ++-- pkgs/tools/system/journalbeat/default.nix | 2 +- pkgs/tools/system/logcheck/default.nix | 2 +- pkgs/tools/system/logrotate/default.nix | 2 +- pkgs/tools/system/lr/default.nix | 2 +- pkgs/tools/system/memtester/default.nix | 2 +- pkgs/tools/system/netdata/default.nix | 2 +- pkgs/tools/system/nq/default.nix | 2 +- pkgs/tools/system/nvtop/default.nix | 2 +- pkgs/tools/system/pcstat/default.nix | 2 +- pkgs/tools/system/plan9port/default.nix | 1 - pkgs/tools/system/psensor/default.nix | 2 +- pkgs/tools/system/psstop/default.nix | 2 +- pkgs/tools/system/rofi-systemd/default.nix | 2 +- pkgs/tools/system/runit/default.nix | 6 +++--- pkgs/tools/system/s-tui/default.nix | 1 - pkgs/tools/system/safe-rm/default.nix | 4 ++-- pkgs/tools/system/setserial/default.nix | 4 ++-- pkgs/tools/system/sleuthkit/default.nix | 4 ++-- pkgs/tools/system/socklog/default.nix | 2 +- pkgs/tools/system/suid-chroot/default.nix | 4 ++-- pkgs/tools/system/supervise/default.nix | 2 +- pkgs/tools/system/symlinks/default.nix | 2 +- .../tools/system/syslog-ng-incubator/default.nix | 4 ++-- pkgs/tools/system/testdisk-photorec/default.nix | 2 +- pkgs/tools/system/thermald/default.nix | 2 +- pkgs/tools/system/thinkfan/default.nix | 2 +- pkgs/tools/system/uptimed/default.nix | 2 +- pkgs/tools/system/vbetool/default.nix | 4 ++-- pkgs/tools/system/vboot_reference/default.nix | 2 +- pkgs/tools/system/wsmancli/default.nix | 2 +- pkgs/tools/system/xe/default.nix | 2 +- pkgs/tools/text/agrep/default.nix | 2 +- pkgs/tools/text/aha/default.nix | 2 +- pkgs/tools/text/ansifilter/default.nix | 2 +- pkgs/tools/text/ascii/default.nix | 4 ++-- pkgs/tools/text/catdoc/default.nix | 4 ++-- pkgs/tools/text/codesearch/default.nix | 2 +- pkgs/tools/text/copyright-update/default.nix | 4 ++-- pkgs/tools/text/dadadodo/default.nix | 4 ++-- pkgs/tools/text/diction/default.nix | 4 ++-- pkgs/tools/text/dos2unix/default.nix | 4 ++-- pkgs/tools/text/enca/default.nix | 4 ++-- pkgs/tools/text/esh/default.nix | 2 +- pkgs/tools/text/glogg/default.nix | 4 ++-- pkgs/tools/text/gnused/default.nix | 2 +- pkgs/tools/text/groff/default.nix | 4 ++-- pkgs/tools/text/gucci/default.nix | 2 +- pkgs/tools/text/highlight/default.nix | 2 +- pkgs/tools/text/html-tidy/default.nix | 2 +- pkgs/tools/text/icdiff/default.nix | 2 +- pkgs/tools/text/jsawk/default.nix | 2 +- pkgs/tools/text/jumanpp/default.nix | 3 +-- pkgs/tools/text/kytea/default.nix | 4 ++-- pkgs/tools/text/languagetool/default.nix | 4 ++-- pkgs/tools/text/link-grammar/default.nix | 3 +-- pkgs/tools/text/mb2md/default.nix | 2 +- pkgs/tools/text/mecab/ipadic.nix | 2 +- pkgs/tools/text/miller/default.nix | 2 +- pkgs/tools/text/mir-qualia/default.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 2 +- pkgs/tools/text/odt2txt/default.nix | 2 +- pkgs/tools/text/peco/default.nix | 2 +- pkgs/tools/text/platinum-searcher/default.nix | 2 +- pkgs/tools/text/podiff/default.nix | 2 +- pkgs/tools/text/poedit/default.nix | 2 +- pkgs/tools/text/proselint/default.nix | 4 ++-- pkgs/tools/text/qshowdiff/default.nix | 2 +- pkgs/tools/text/reckon/default.nix | 4 ++-- pkgs/tools/text/rpl/default.nix | 1 - pkgs/tools/text/rst2html5/default.nix | 4 +--- pkgs/tools/text/schema2ldif/default.nix | 2 +- pkgs/tools/text/shfmt/default.nix | 2 +- pkgs/tools/text/shocco/default.nix | 2 +- pkgs/tools/text/sift/default.nix | 2 +- pkgs/tools/text/silver-searcher/default.nix | 2 +- pkgs/tools/text/txt2tags/default.nix | 4 ++-- pkgs/tools/text/unrtf/default.nix | 4 ++-- pkgs/tools/text/untex/default.nix | 4 ++-- pkgs/tools/text/vale/default.nix | 2 +- pkgs/tools/text/wgetpaste/default.nix | 4 ++-- pkgs/tools/text/xidel/default.nix | 2 +- pkgs/tools/text/xml/basex/default.nix | 2 +- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- pkgs/tools/text/xml/jing-trang/default.nix | 2 +- pkgs/tools/text/xml/rnv/default.nix | 2 +- pkgs/tools/text/xml/rxp/default.nix | 2 +- pkgs/tools/text/xml/xmlformat/default.nix | 2 +- pkgs/tools/text/xurls/default.nix | 2 +- pkgs/tools/text/zimwriterfs/default.nix | 4 ++-- pkgs/tools/typesetting/djvu2pdf/default.nix | 2 +- pkgs/tools/typesetting/fop/default.nix | 4 ++-- pkgs/tools/typesetting/git-latexdiff/default.nix | 2 +- pkgs/tools/typesetting/htmldoc/default.nix | 2 +- pkgs/tools/typesetting/mmark/default.nix | 2 +- pkgs/tools/typesetting/multimarkdown/default.nix | 2 +- pkgs/tools/typesetting/odpdown/default.nix | 2 +- pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++-- pkgs/tools/typesetting/pdf2odt/default.nix | 2 +- pkgs/tools/typesetting/pdfgrep/default.nix | 4 ++-- pkgs/tools/typesetting/satysfi/default.nix | 2 +- pkgs/tools/typesetting/scdoc/default.nix | 2 +- pkgs/tools/typesetting/sile/default.nix | 4 ++-- pkgs/tools/typesetting/skribilo/default.nix | 4 ++-- pkgs/tools/typesetting/sshlatex/default.nix | 2 +- pkgs/tools/typesetting/ted/default.nix | 3 +-- pkgs/tools/typesetting/tex/auctex/default.nix | 3 +-- pkgs/tools/typesetting/tikzit/default.nix | 2 +- pkgs/tools/typesetting/xmlroff/default.nix | 4 ++-- pkgs/tools/video/atomicparsley/default.nix | 2 +- pkgs/tools/video/bento4/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 2 +- pkgs/tools/video/swftools/default.nix | 4 ++-- pkgs/tools/video/untrunc/default.nix | 2 +- pkgs/tools/video/yamdi/default.nix | 2 +- .../virtualization/amazon-ecs-cli/default.nix | 2 +- pkgs/tools/virtualization/awless/default.nix | 2 +- .../tools/virtualization/cloudmonkey/default.nix | 2 -- .../virtualization/distrobuilder/default.nix | 2 +- .../virtualization/ec2-ami-tools/default.nix | 4 ++-- .../google-compute-engine-oslogin/default.nix | 2 +- .../google-compute-engine/default.nix | 2 +- pkgs/tools/virtualization/govc/default.nix | 2 +- .../tools/virtualization/marathonctl/default.nix | 2 +- .../tools/virtualization/rootlesskit/default.nix | 2 +- .../xe-guest-utilities/default.nix | 1 - pkgs/top-level/lua-packages.nix | 2 +- 4616 files changed, 5674 insertions(+), 6081 deletions(-) diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix index 3a65cb800a9..4d7af138292 100644 --- a/nixos/modules/hardware/raid/hpsa.nix +++ b/nixos/modules/hardware/raid/hpsa.nix @@ -4,11 +4,11 @@ with lib; let hpssacli = pkgs.stdenv.mkDerivation rec { - name = "hpssacli-${version}"; + pname = "hpssacli"; version = "2.40-13.0"; src = pkgs.fetchurl { - url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb"; + url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb"; sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw"; }; diff --git a/nixos/tests/common/letsencrypt/default.nix b/nixos/tests/common/letsencrypt/default.nix index 8fe59bf4e70..58d87c64e34 100644 --- a/nixos/tests/common/letsencrypt/default.nix +++ b/nixos/tests/common/letsencrypt/default.nix @@ -56,11 +56,11 @@ let softhsm = pkgs.stdenv.mkDerivation rec { - name = "softhsm-${version}"; + pname = "softhsm"; version = "1.3.8"; src = pkgs.fetchurl { - url = "https://dist.opendnssec.org/source/${name}.tar.gz"; + url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz"; sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif"; }; diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 481e19c66cd..a8846431f1e 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "clightning-${version}"; + pname = "clightning"; version = "0.7.1"; src = fetchurl { diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index b2f2a457a99..03dcd6cb54e 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/pkgs/applications/altcoins/dashpay.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dashpay-${version}"; + pname = "dashpay"; version = "0.12.2.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix index cc3e83befa6..16d39e85da1 100644 --- a/pkgs/applications/altcoins/dcrd.nix +++ b/pkgs/applications/altcoins/dcrd.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: buildGoPackage rec { - name = "dcrd-${version}"; + pname = "dcrd"; version = "1.1.2"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/decred/dcrd"; diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix index 8d966684b23..163ed2615d3 100644 --- a/pkgs/applications/altcoins/dcrwallet.nix +++ b/pkgs/applications/altcoins/dcrwallet.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: buildGoPackage rec { - name = "dcrwallet-${version}"; + pname = "dcrwallet"; version = "1.1.2"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/decred/dcrwallet"; diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix index 8405ea8f842..0ab63bb5395 100644 --- a/pkgs/applications/altcoins/dero.nix +++ b/pkgs/applications/altcoins/dero.nix @@ -2,7 +2,7 @@ , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { - name = "dero-${version}"; + pname = "dero"; version = "0.11.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index 78ce074eafd..1f9fc3f9f96 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.6-2"; - name = "freicoin-${version}"; + pname = "freicoin"; src = fetchFromGitHub { owner = "freicoin"; diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix index 7461e4c376a..ed8086f742f 100644 --- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-ethereum-classic-${version}"; + pname = "go-ethereum-classic"; version = "4.0.0"; goPackagePath = "github.com/ethereumproject/go-ethereum"; diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/altcoins/masari.nix index 02a6d25df51..dfa005abb6e 100644 --- a/pkgs/applications/altcoins/masari.nix +++ b/pkgs/applications/altcoins/masari.nix @@ -2,7 +2,7 @@ , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { - name = "masari-${version}"; + pname = "masari"; version = "0.1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index aaff39f1c6b..8adab50a09c 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { - name = "monero-gui-${version}"; + pname = "monero-gui"; version = "0.14.1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index f351c9fa504..b6f07452861 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,7 +11,7 @@ assert stdenv.isDarwin -> IOKit != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "monero-${version}"; + pname = "monero"; version = "0.14.1.0"; src = fetchgit { diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 58ab367c020..a8d29ae149d 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "nano-wallet-${version}"; + pname = "nano-wallet"; version = "18.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix index c59b2ccb8ac..0615aed2ca0 100644 --- a/pkgs/applications/altcoins/parity-ui/default.nix +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -5,13 +5,13 @@ let uiEnv = pkgs.callPackage ./env.nix { }; in stdenv.mkDerivation rec { - name = "parity-ui-${version}"; + pname = "parity-ui"; version = "0.3.4"; src = fetchurl { url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73"; - name = "${name}.deb"; + name = "${pname}-${version}.deb"; }; nativeBuildInputs = [ makeWrapper nodePackages.asar ]; diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index f5efa0bb52c..613d57cd9c8 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "particl-core-${version}"; + pname = "particl-core"; version = "0.17.1.2"; src = fetchurl { diff --git a/pkgs/applications/altcoins/pivx.nix b/pkgs/applications/altcoins/pivx.nix index 995b8deccd9..7b51538d063 100644 --- a/pkgs/applications/altcoins/pivx.nix +++ b/pkgs/applications/altcoins/pivx.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pivx-${version}"; + pname = "pivx"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix index 026008b2761..ad65da057ae 100644 --- a/pkgs/applications/altcoins/sumokoin.nix +++ b/pkgs/applications/altcoins/sumokoin.nix @@ -2,7 +2,7 @@ , libunwind, lmdb, miniupnpc }: stdenv.mkDerivation rec { - name = "sumokoin-${version}"; + pname = "sumokoin"; version = "0.2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/wownero.nix b/pkgs/applications/altcoins/wownero.nix index 7aed3297832..365afb5a241 100644 --- a/pkgs/applications/altcoins/wownero.nix +++ b/pkgs/applications/altcoins/wownero.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "wownero-${version}"; + pname = "wownero"; version = "0.6.1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index 3ea7b90f84a..720fd0b88be 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -2,10 +2,10 @@ }: stdenv.mkDerivation rec { - name = "AMB-plugins-${version}"; + pname = "AMB-plugins"; version = "0.8.1"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl"; }; diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index b9322c37df0..ed1f05eaf5c 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -2,10 +2,10 @@ }: stdenv.mkDerivation rec { - name = "FIL-plugins-${version}"; + pname = "FIL-plugins"; version = "0.3.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw"; }; diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index ed7a8481f69..92f46abddd5 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "16.06"; - name = "mma-${version}"; + pname = "mma"; src = fetchurl { url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 70709ae4ac4..b94fed41341 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -5,7 +5,7 @@ let inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "a2jmidid-${version}"; + pname = "a2jmidid"; version = "8"; src = fetchurl { diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 7b80b32331b..389052d30e1 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "aeolus-${version}"; + pname = "aeolus"; version = "0.9.7"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k"; }; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index d6064e80e3f..0750c38550b 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -2,7 +2,7 @@ , wafHook }: stdenv.mkDerivation rec { - name = "ams-lv2-${version}"; + pname = "ams-lv2"; version = "1.2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 02d818410df..4b48f5f1eea 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "ario-${version}"; + pname = "ario"; src = fetchurl { - url = "mirror://sourceforge/ario-player/${name}.tar.gz"; + url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz"; sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 91a0a1f140c..4b76ebdf605 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: stdenv.mkDerivation rec { - name = "artyFX-${version}"; + pname = "artyFX"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 9c42c98ba5e..e4c145b35c7 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -13,9 +13,9 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.9.3"; - name = "asunder-${version}"; + pname = "asunder"; src = fetchurl { - url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; + url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5"; }; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 68660b5d054..12e8237d485 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "audacious-${version}"; + pname = "audacious"; version = "3.9"; src = fetchurl { diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index b685fda7683..6be40a7b93a 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.3.2"; - name = "audacity-${version}"; + pname = "audacity"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index 7b84cd02a62..534b87e9fa7 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -5,11 +5,11 @@ , pulseaudioSupport ? true, libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "audio-recorder-${version}"; + pname = "audio-recorder"; version = "2.1.3"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz"; sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r"; }; diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix index c49470b76e2..7ca5d83b48b 100644 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ b/pkgs/applications/audio/avldrums-lv2/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "avldrums.lv2"; version = "0.3.5"; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index e3f1b6acf87..7f551304df1 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0.12-2"; - name = "axoloti-${version}"; + pname = "axoloti"; src = fetchFromGitHub { owner = "axoloti"; diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix index 07a78260991..e9fa6daecfe 100644 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libusb1-axoloti }: stdenv.mkDerivation rec { - name="dfu-util-${version}"; + pname = "dfu-util"; version = "0.8"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1-axoloti ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; }; diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 6827d12b321..c35df95b24c 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -7,7 +7,7 @@ let [ libXmu libXt libX11 libXext libXxf86vm libjack2 ]; in stdenv.mkDerivation rec { - name = "baudline-${version}"; + pname = "baudline"; version = "1.08"; src = diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index fbe2c97042f..6f471f3a028 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -1,11 +1,11 @@ { stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }: stdenv.mkDerivation rec { - name = "bitmeter-${version}"; + pname = "bitmeter"; version = "1.2"; src = fetchurl { - url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz"; + url = "https://devel.tlrmx.org/audio/source/${pname}-${version}.tar.gz"; sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 31716fce1c2..83586847190 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -6,7 +6,7 @@ , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { - name = "bitwig-studio-${version}"; + pname = "bitwig-studio"; version = "1.3.16"; src = fetchurl { diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index e1ed12b9bd2..504900d6595 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: stdenv.mkDerivation rec { - name = "bristol-${version}"; + pname = "bristol"; version = "0.60.11"; src = fetchurl { - url = "mirror://sourceforge/bristol/${name}.tar.gz"; + url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz"; sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index adda9235364..2dee463aeee 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ffmpeg, sox }: stdenv.mkDerivation rec { - name = "bs1770gain-${version}"; + pname = "bs1770gain"; version = "0.5.2"; src = fetchurl { - url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; + url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz"; sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; }; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 7d7d25ea88a..0106e8b4584 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -2,11 +2,11 @@ , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "calf-${version}"; + pname = "calf"; version = "0.90.3"; src = fetchurl { - url = "https://calf-studio-gear.org/files/${name}.tar.gz"; + url = "https://calf-studio-gear.org/files/${pname}-${version}.tar.gz"; sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3"; }; diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 1f53809e905..eabbf866837 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "caps-${version}"; + pname = "caps"; version = "0.9.26"; src = fetchurl { url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 439175b090a..5c5c262056e 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -2,7 +2,7 @@ libpulseaudio, ncurses }: stdenv.mkDerivation rec { - name = "cava-${version}"; + pname = "cava"; version = "0.6.1"; buildInputs = [ diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 382d4a1b667..76f76c1e750 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -2,11 +2,11 @@ , IOKit ? null }: stdenv.mkDerivation rec { - name = "cd-discid-${version}"; + pname = "cd-discid"; version = "1.4"; src = fetchurl { - url = "http://linukz.org/download/${name}.tar.gz"; + url = "http://linukz.org/download/${pname}-${version}.tar.gz"; sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"; }; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index da26a718835..692485d0dcf 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.4.0.0"; - name = "chuck-${version}"; + pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index b574993338d..b88951c0fc5 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -101,7 +101,7 @@ let in stdenv.mkDerivation rec { - name = "cmus-${version}"; + pname = "cmus"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 2147a84f24b..51b88607208 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2018-10-11"; - name = "cmusfm-unstable-${version}"; + pname = "cmusfm-unstable"; src = fetchFromGitHub { owner = "Arkq"; repo = "cmusfm"; diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix index c3b3b944135..0b8afada020 100644 --- a/pkgs/applications/audio/csa/default.nix +++ b/pkgs/applications/audio/csa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "csa-${version}"; + pname = "csa"; version = "0.5.100810"; src = fetchurl { - url = "mirror://sourceforge/csa/${name}.tar.gz"; + url = "mirror://sourceforge/csa/${pname}-${version}.tar.gz"; sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3"; }; diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index e97341acbb4..86e200ab252 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -3,7 +3,7 @@ qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: stdenv.mkDerivation rec { - name = "csound-qt-${version}"; + pname = "csound-qt"; version = "0.9.6-beta3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index cb968ee9e00..758448c2fb3 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "csound-${version}"; + pname = "csound"; # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index dab3a97f6e7..b26360f0c46 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: stdenv.mkDerivation rec { - name = "deadbeef-headerbar-gtk3-plugin-${version}"; + pname = "deadbeef-headerbar-gtk3-plugin"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index d2355681b72..8a81101983f 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: stdenv.mkDerivation rec { - name = "deadbeef-infobar-plugin-${version}"; + pname = "deadbeef-infobar-plugin"; version = "1.4"; src = fetchurl { diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 4d5367087c1..5b27f3c3f32 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, deadbeef, glib }: stdenv.mkDerivation rec { - name = "deadbeef-mpris2-plugin-${version}"; + pname = "deadbeef-mpris2-plugin"; version = "1.12"; src = fetchurl { - url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; }; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index d01e7879335..331e3fb9698 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -5,7 +5,7 @@ , portaudio, portmidi, fftw, makeWrapper }: stdenv.mkDerivation rec { - name = "denemo-${version}"; + pname = "denemo"; version = "2.3.0"; src = fetchurl { diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index d16534b03d3..1785ca60060 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -27,7 +27,7 @@ let }; in stdenv.mkDerivation rec { - name = "dfasma-${version}"; + pname = "dfasma"; version = "1.4.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 1c41451b08f..054fc758d64 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -8,7 +8,7 @@ let else if stdenv.hostPlatform.isWindows then "mingw" else "linux"; in stdenv.mkDerivation rec { - name = "distrho-ports-${version}"; + pname = "distrho-ports"; version = "2018-04-16"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index e5354b06094..11b214f6bb3 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.9.17"; - name = "drumgizmo-${version}"; + pname = "drumgizmo"; src = fetchurl { - url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; + url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1"; }; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index f8e1db4814c..8f1f79169d7 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: stdenv.mkDerivation rec { - name = "drumkv1-${version}"; + pname = "drumkv1"; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; + url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983"; }; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 1013b8a560c..6c9cd628a51 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -14,7 +14,7 @@ # TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. stdenv.mkDerivation rec { - name = "ecasound-${version}"; + pname = "ecasound"; version = "2.9.2"; src = fetchurl { diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 4138a07ec06..2338c0ed376 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: stdenv.mkDerivation rec { - name = "eflite-${version}"; + pname = "eflite"; version = "0.4.1"; src = fetchurl { - url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz"; + url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz"; sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci"; }; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 651604c71a1..0308fad831d 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig , xorg }: stdenv.mkDerivation rec { - name = "eq10q-${version}"; + pname = "eq10q"; version = "2.2"; src = fetchurl { - url = "mirror://sourceforge/project/eq10q/${name}.tar.gz"; + url = "mirror://sourceforge/project/eq10q/${pname}-${version}.tar.gz"; sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 5d0af8cf17a..043d5b9d2d3 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -4,7 +4,7 @@ , sonicSupport ? true, sonic }: stdenv.mkDerivation rec { - name = "espeak-ng-${version}"; + pname = "espeak-ng"; version = "1.49.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix index 28e4879efdc..bbfe1ad5623 100644 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "eteroj.lv2"; version = "0.4.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "OpenMusicKontrollers"; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 754c4807060..4268a783c8d 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "faustlive-${version}"; + pname = "faustlive"; version = "2017-12-05"; src = fetchFromGitHub { owner = "grame-cncm"; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index f0863bfc50b..19ed2352355 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: stdenv.mkDerivation rec { - name = "flac123-${version}"; + pname = "flac123"; version = "0.0.12"; src = fetchurl { - url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz"; + url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz"; sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr"; }; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 2d2d88308cc..02317fee15f 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "flacon-${version}"; + pname = "flacon"; version = "5.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index a61f7dc0a90..d1b1cddd011 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -10,7 +10,7 @@ assert portaudioSupport -> portaudio != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "fmit-${version}"; + pname = "fmit"; version = "1.1.14"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index 58d095080fe..dc163de8ade 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: stdenv.mkDerivation rec { - name = "fmsynth-unstable-${version}"; + pname = "fmsynth-unstable"; version = "2015-02-07"; src = fetchFromGitHub { owner = "Themaister"; diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 680fab4ca64..a92d331baad 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }: stdenv.mkDerivation rec { - name = "fomp-${version}"; + pname = "fomp"; version = "1.0.0"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 28b2cd98e02..330ae56f13f 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "git-2015-05-21"; - name = "foo-yc20-${version}"; + pname = "foo-yc20"; src = fetchFromGitHub { owner = "sampov2"; repo = "foo-yc20"; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index efb832ae625..a2588093309 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "freewheeling-${version}"; + pname = "freewheeling"; version = "0.6.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index a0a79785283..d95b3eea596 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.6.1"; - name = "game-music-emu-${version}"; + pname = "game-music-emu"; src = fetchurl { - url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2"; sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"; }; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index e9ce20f6c80..d8fada45eb1 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gigedit-${version}"; + pname = "gigedit"; version = "1.1.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; }; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 099e4428016..66e9b6545a4 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gmpc-${version}"; + pname = "gmpc"; version = "11.8.16"; libmpd = stdenv.mkDerivation { diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 3981bc79276..3406f317884 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -5,7 +5,7 @@ # rustPlatform.buildRustPackage rec { stdenv.mkDerivation rec { version = "0.4.6"; - name = "gnome-podcasts-${version}"; + pname = "gnome-podcasts"; src = fetchurl { url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz; diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index e7a23b6f204..e027680f5fe 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -3,7 +3,6 @@ with pythonPackages; buildPythonApplication rec { pname = "greg"; version = "0.4.7"; - name = pname + "-" + version; disabled = !isPy3k; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index e01dbc1d30f..fd3632ee155 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "2.1.5"; - name = "gtkpod-${version}"; + pname = "gtkpod"; src = fetchurl { - url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; + url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz"; sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 9df4308131e..91f4b1dcdfe 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { - name = "guitarix-${version}"; + pname = "guitarix"; version = "0.38.1"; src = fetchurl { diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 04cb57800f9..1f4323eb9d5 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "GxPlugins.lv2"; version = "0.7"; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index fa76a1a26e8..d32c55122c5 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "helm-${version}"; + pname = "helm"; src = fetchFromGitHub { owner = "mtytel"; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index d68bfbf2ae4..50093f8a61d 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.7"; - name = "hydrogen-${version}"; + pname = "hydrogen"; src = fetchurl { url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index 69fc4b419c0..2cc39e64943 100644 --- a/pkgs/applications/audio/i-score/default.nix +++ b/pkgs/applications/audio/i-score/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "1.0.0-b31"; - name = "i-score-${version}"; + pname = "i-score"; src = fetchFromGitHub { owner = "OSSIA"; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index c26980e1bb2..1fd8531fb7f 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "iannix-${version}"; + pname = "iannix"; version = "2016-01-31"; src = fetchFromGitHub { owner = "iannix"; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index d2720fcace6..0fdb3b2a4a1 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, id3lib, groff, zlib}: stdenv.mkDerivation rec { - name = "id3v2-${version}"; + pname = "id3v2"; version = "0.1.12"; src = fetchurl { - url = "mirror://sourceforge/id3v2/${name}.tar.gz"; + url = "mirror://sourceforge/id3v2/${pname}-${version}.tar.gz"; sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1"; }; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 2b8c041a074..341c4181842 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { - name = "infamousPlugins-${version}"; + pname = "infamousPlugins"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 84be6b866fa..0ca5988383a 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: stdenv.mkDerivation rec { - name = "ir.lv2-${version}"; + pname = "ir.lv2"; version = "1.2.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 33c74f2b044..92b2f8ac515 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { - name = "jaaa-${version}"; + pname = "jaaa"; version = "0.9.2"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1czksxx2g8na07k7g57qlz0vvkkgi5bzajcx7vc7jhb94hwmmxbc"; }; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index f11bba34c74..c62ccc4fc88 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libjack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { - name = "jack_capture-${version}"; + pname = "jack_capture"; version = "0.9.73"; src = fetchurl { - url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz"; + url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz"; sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 75a8a6a4b1a..d31bc981e0c 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }: stdenv.mkDerivation rec { - name = "jack_oscrolloscope-${version}"; + pname = "jack_oscrolloscope"; version = "0.7"; src = fetchurl { - url = "http://das.nasophon.de/download/${name}.tar.gz"; + url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 0f1ed143ddd..a40d5101b34 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -2,11 +2,11 @@ , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { - name = "jalv-${version}"; + pname = "jalv"; version = "1.6.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa"; }; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index 18b7bcd1d56..a9eb15aabf3 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "japa-${version}"; + pname = "japa"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897"; }; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 344e6894baf..4bb1d63a1e7 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libav, libkeyfinder }: stdenv.mkDerivation rec { - name = "keyfinder-cli-${version}"; + pname = "keyfinder-cli"; version = "2015-09-13"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 55039e8508b..d47fc3b6190 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: stdenv.mkDerivation rec { - name = "keyfinder-${version}"; + pname = "keyfinder"; version = "2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 04d0349c88f..dfb07c4f456 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { - name = "kid3-${version}"; + pname = "kid3"; version = "3.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8"; }; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 5e54609f8bf..f33245d8f1c 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -2,11 +2,11 @@ , libsamplerate, libsndfile, liblo, libjack2, boost }: stdenv.mkDerivation rec { - name = "klick-${version}"; + pname = "klick"; version = "0.12.2"; src = fetchurl { - url = "http://das.nasophon.de/download/${name}.tar.gz"; + url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index a60b3db2fb8..44186abc3c4 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -2,7 +2,7 @@ , perlPackages }: stdenv.mkDerivation rec { - name = "swh-plugins-${version}"; + pname = "swh-plugins"; version = "0.4.17"; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 72bb7010b62..a7779ee8aee 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ladspa-sdk-${version}"; + pname = "ladspa-sdk"; version = "1.15"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index b57b7283b85..3fad5de1de5 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ladspa.h-${version}"; + pname = "ladspa.h"; version = "1.15"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 7fb5a01e2c8..e96972b0d1b 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -4,11 +4,11 @@ assert libuuid != null; stdenv.mkDerivation rec { - name = "lash-${version}"; + pname = "lash"; version = "0.5.4"; src = fetchurl { - url = "mirror://savannah/lash/${name}.tar.gz"; + url = "mirror://savannah/lash/${pname}-${version}.tar.gz"; sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh"; }; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index a8e33c23dc0..b5a99150cb2 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -4,10 +4,10 @@ let inherit (python2Packages) pyGtkGlade pygtksourceview python; in stdenv.mkDerivation rec { version = "12.02.1"; - name = "linuxband-${version}"; + pname = "linuxband"; src = fetchurl { - url = "http://linuxband.org/assets/sources/${name}.tar.gz"; + url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index f173e41321f..26fc2408d8a 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -2,11 +2,11 @@ , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { - name = "linuxsampler-${version}"; + pname = "linuxsampler"; version = "2.1.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; }; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 59e94e0bdad..d22065eb9fe 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -4,7 +4,7 @@ , qtbase, qtx11extras, qttools, SDL ? null }: stdenv.mkDerivation rec { - name = "lmms-${version}"; + pname = "lmms"; version = "1.2.0-rc7"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index c80485734ca..3d5c6f699dd 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -6,12 +6,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; version = "1.1.9"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sadko4u"; repo = "${pname}"; - rev = "${name}"; + rev = "${pname}-${version}"; sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2"; }; diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index 81db133ff9a..c986e3af288 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}: stdenv.mkDerivation rec { - name = "ltc-tools-${version}"; + pname = "ltc-tools"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index d3821c51fbc..7288d39ce77 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }: stdenv.mkDerivation rec { - name = "lv2bm-${version}"; + pname = "lv2bm"; version = "git-2015-11-29"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index f355c540f30..6488d1bd65e 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "CharacterCompressor-${version}"; + pname = "CharacterCompressor"; version = "0.3.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 90e4eabeef0..c5728b6e8b7 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "CompBus-${version}"; + pname = "CompBus"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 73dd7b48e9c..331e58c4bd2 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "constant-detune-chorus-${version}"; + pname = "constant-detune-chorus"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 39065db6ede..046ee70e990 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "LazyLimiter-${version}"; + pname = "LazyLimiter"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 362451988d3..aa7da17dafd 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "MBdistortion-${version}"; + pname = "MBdistortion"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 3f809aa7847..ae05866e57d 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "RhythmDelay-${version}"; + pname = "RhythmDelay"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 740763889ff..718bbdaf49e 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: stdenv.mkDerivation rec { - name = "VoiceOfFaust-${version}"; + pname = "VoiceOfFaust"; version = "1.1.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 6237628e600..356e95bf97c 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "pluginUtils-${version}"; + pname = "pluginUtils"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index cb9247fd3d0..292cd3dfd86 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "shelfMultiBand-${version}"; + pname = "shelfMultiBand"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 26290e5bf88..901be5a23d0 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "mda-lv2-${version}"; + pname = "mda-lv2"; version = "1.2.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index d16107e4c29..4d2fa0e15b4 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "0.9.3"; - name = "meterbridge-${version}"; + pname = "meterbridge"; src = fetchurl { - url = "http://plugin.org.uk/meterbridge/${name}.tar.gz"; + url = "http://plugin.org.uk/meterbridge/${pname}-${version}.tar.gz"; sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz"; }; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index db70e59218b..e4d6c0293df 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -3,7 +3,7 @@ , vorbis-tools }: stdenv.mkDerivation rec { - name = "mhwaveedit-${version}"; + pname = "mhwaveedit"; version = "1.4.24"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 6b3abeb1e23..7f86e2c2071 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.02.00"; - name = "milkytracker-${version}"; + pname = "milkytracker"; src = fetchFromGitHub { owner = "milkytracker"; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index dcaffe3eb9b..e91b2c9360d 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -3,7 +3,7 @@ , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { - name = "mimic-${version}"; + pname = "mimic"; version = "1.2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 6d186cccde3..58a75ac44ce 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -7,7 +7,7 @@ }: mkDerivation rec { - name = "mixxx-${version}"; + pname = "mixxx"; version = "2.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 3ed330cc743..89d062d584e 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { - name = "moc-${version}"; + pname = "moc"; version = "2.5.2"; src = fetchurl { diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index c66f7837322..3fbe927be4b 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - name = "mod-distortion-git-${version}"; + pname = "mod-distortion-git"; version = "2016-08-19"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 1b3e89d4885..58bb4d3e327 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "3.99-u4-b5"; pname = "monkeys-audio"; - name = pname + "-" + version; patches = [ ./buildfix.diff ]; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index eb5aa7c036c..727133be78d 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.2.6"; - name = "mp3blaster-${version}"; + pname = "mp3blaster"; src = fetchFromGitHub { owner = "stragulus"; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index f2922e7eecf..f067c5af6df 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -3,11 +3,10 @@ stdenv.mkDerivation rec { pname = "mp3splt"; version = "2.6.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry"; }; diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 7477bea7602..6c35779f6c4 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mp3val-${version}"; + pname = "mp3val"; version = "0.1.8"; src = fetchurl { - url = "mirror://sourceforge/mp3val/${name}-src.tar.gz"; + url = "mirror://sourceforge/mp3val/${pname}-${version}-src.tar.gz"; sha256 = "17y3646ghr38r620vkrxin3dksxqig5yb3nn4cfv6arm7kz6x8cm"; }; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 220e72b568a..b13e1cc037a 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }: stdenv.mkDerivation rec { - name = "mpc-${version}"; + pname = "mpc"; version = "0.28"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 3ffc5265f7a..65dfe3484b6 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "mpg321-${version}"; + pname = "mpg321"; version = "0.3.2"; src = fetchurl { diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index b3efa82ead4..8582fd78192 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -17,7 +17,7 @@ }: stdenv.mkDerivation rec { - name = "muse-sequencer-${version}"; + pname = "muse-sequencer"; version = "3.1pre1"; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index e14594ae3b2..6f81ebbb8f1 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -8,7 +8,7 @@ in with lib; stdenv.mkDerivation rec { - name = "musescore-darwin-${version}"; + pname = "musescore-darwin"; version = "${concatStringsSep "." versionComponents}"; src = fetchurl { diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index a595bb06900..2e69c3cda7a 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "musescore-${version}"; + pname = "musescore"; version = "3.0.5"; src = fetchzip { diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index a35d9c670fe..d89b61aa21f 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -2,7 +2,7 @@ , mpd_clientlib, gettext, boost }: stdenv.mkDerivation rec { - name = "ncmpc-${version}"; + pname = "ncmpc"; version = "0.34"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index d35cefb8841..2ba36b4a50d 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -11,11 +11,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "ncmpcpp-${version}"; + pname = "ncmpcpp"; version = "0.8.2"; src = fetchurl { - url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; + url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2"; sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; }; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 8b715a24e3c..53ed9b3297c 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "ncpamixer-${version}"; + pname = "ncpamixer"; version = "1.3.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 44dd0d2d4ec..94cf32f8f82 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "non-${version}"; + pname = "non"; version = "2018-02-15"; src = fetchFromGitHub { owner = "original-male"; diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index 85c902d3839..490ecc967bb 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libmad }: stdenv.mkDerivation rec { - name = "normalize-${version}"; + pname = "normalize"; version = "0.7.7"; src = fetchurl { - url = "mirror://savannah/normalize/${name}.tar.gz"; + url = "mirror://savannah/normalize/${pname}-${version}.tar.gz"; sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; }; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index bb186687c66..91443bb1ef7 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2-2"; - name = "nova-filters-${version}"; + pname = "nova-filters"; src = fetchurl { url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index e503793ab39..b34db81981f 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftw }: stdenv.mkDerivation rec { - name = "padthv1-${version}"; + pname = "padthv1"; version = "0.9.8"; src = fetchurl { - url = "mirror://sourceforge/padthv1/${name}.tar.gz"; + url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; sha256 = "1k4p2ir12qjcs62knvw2s6qyvb46203yx22fnwp341cjk171cxji"; }; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index cc4a781ef66..2507f08e9e5 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -3,7 +3,7 @@ , libpulseaudio, ncurses }: stdenv.mkDerivation rec { - name = "pamix-${version}"; + pname = "pamix"; version = "1.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 322a4e23846..2d518aad285 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }: stdenv.mkDerivation rec { - name = "pamixer-${version}"; + pname = "pamixer"; version = "1.3.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 7f3940e0ae9..4f76aefb5ed 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "patchage-${version}"; + pname = "patchage"; version = "1.0.1"; src = fetchsvn { url = http://svn.drobilla.net/lad/trunk/patchage/; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index ae43bad5b2c..6440f6e787f 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { - name = "cyclone-${version}"; + pname = "cyclone"; version = "0.3beta-2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 0eb75d77c68..21ba375200b 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { - name = "maxlib-${version}"; + pname = "maxlib"; version = "1.5.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 972a162b73f..9e7de39218d 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, puredata }: stdenv.mkDerivation rec { - name = "mrpeach-${version}"; + pname = "mrpeach"; version = "1.1"; # this was to only usable url I could find: diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 37d692a3ab5..c214d3fcf40 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation rec { - name = "puremapping-${version}"; + pname = "puremapping"; version = "20160130"; src = fetchurl { diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index f2e54b327fc..fa9660fbbf6 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; - name = "timbreid-${version}"; + pname = "timbreid"; src = fetchurl { url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index d56462ccc84..cc307417c06 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, puredata }: stdenv.mkDerivation rec { - name = "zexy-${version}"; + pname = "zexy"; version = "2.2.4"; src = fetchurl { - url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + url = "https://puredata.info/downloads/zexy/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; }; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index d86e5aae2cd..8bbeffb1f7a 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -3,11 +3,11 @@ , pkgconfig, openssl }: stdenv.mkDerivation rec { - name = "petri-foo-${version}"; + pname = "petri-foo"; version = "0.1.87"; src = fetchurl { - url = "mirror://sourceforge/petri-foo/${name}.tar.bz2"; + url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2"; sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 53afcdd2306..c2c4672be12 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: stdenv.mkDerivation rec { - name = "pianobooster-${version}"; + pname = "pianobooster"; version = "0.6.4b"; src = fetchurl { diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index 16d5eb69cb9..8c21dc8f2ad 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "playbar2-${version}"; + pname = "playbar2"; version = "2.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index 5529998803c..346387be7e3 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: stdenv.mkDerivation rec { - name = "plugin-torture-${version}"; + pname = "plugin-torture"; version = "2016-07-25"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index 5cfbb7bf5a4..6d168ec5661 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: stdenv.mkDerivation rec { - name = "ponymix-${version}"; + pname = "ponymix"; version = "5"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 5db5035c835..9414f4211d7 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: stdenv.mkDerivation rec { - name = "praat-${version}"; + pname = "praat"; version = "6.0.43"; src = fetchurl { diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 9989f75c0bd..b8082c12c64 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -23,7 +23,7 @@ let ''; in stdenv.mkDerivation rec { - name = "pulseaudio-modules-bt-${version}"; + pname = "pulseaudio-modules-bt"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 6ade9042b53..5886a465409 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "puredata-${version}"; + pname = "puredata"; version = "0.49-0"; src = fetchurl { diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 9b8c8035239..0b50d3098aa 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { version = "0.5.9"; - name = "qjackctl-${version}"; + pname = "qjackctl"; # some dependencies such as killall have to be installed additionally src = fetchurl { - url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; + url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk"; }; diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 16e76bb631c..d627f352e73 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.5.5"; - name = "qmidinet-${version}"; + pname = "qmidinet"; src = fetchurl { - url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; + url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y"; }; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 7f5191a02c2..2a83d98b6ea 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.0"; - name = "qmidiroute-${version}"; + pname = "qmidiroute"; src = fetchurl { - url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz"; sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 4e6df82a32a..a878f4edad8 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -2,11 +2,11 @@ , liblscp, libgig, qtbase }: stdenv.mkDerivation rec { - name = "qsampler-${version}"; + pname = "qsampler"; version = "0.5.6"; src = fetchurl { - url = "mirror://sourceforge/qsampler/${name}.tar.gz"; + url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz"; sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs"; }; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 82e003b2bea..81b7e35b630 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }: stdenv.mkDerivation rec { - name = "qsynth-${version}"; + pname = "qsynth"; version = "0.5.7"; src = fetchurl { - url = "mirror://sourceforge/qsynth/${name}.tar.gz"; + url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6"; }; diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index 453da89953e..68e8e6402ac 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "qtscrobbler-${version}"; + pname = "qtscrobbler"; version = "0.11"; src = fetchurl { diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index ec71cfb427c..36302458a75 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -2,11 +2,11 @@ libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { - name = "rakarrack-${version}"; + pname = "rakarrack"; version = "0.6.1"; src = fetchurl { - url = "mirror://sourceforge/rakarrack/${name}.tar.bz2"; + url = "mirror://sourceforge/rakarrack/${pname}-${version}.tar.bz2"; sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn"; }; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 2e4658a68c9..334656ecc9a 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "reaper-${version}"; + pname = "reaper"; version = "5.980"; src = fetchurl { diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix index 1918fa9e3a9..e32fd42af32 100644 --- a/pkgs/applications/audio/redoflacs/default.nix +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -2,7 +2,7 @@ , flac, sox }: stdenv.mkDerivation rec { - name = "redoflacs-${version}"; + pname = "redoflacs"; version = "0.30.20150202"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index ddbefd129ff..62625aa421d 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "renoise-${version}"; + pname = "renoise"; version = "3.1.0"; src = diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 313227f7798..9445bf3723c 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation (rec { version = "19.06"; - name = "rosegarden-${version}"; + pname = "rosegarden"; src = fetchurl { - url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; + url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; sha256 = "169qb58v2s8va59hzkih8nqb2aipsqlrbfs8q39ywqa8w5d60gcc"; }; diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index 9e0a3712c97..82aa86f795b 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: stdenv.mkDerivation rec { version = "0.6.2"; - name = "rubyripper-${version}"; + pname = "rubyripper"; src = fetchurl { url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2"; sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1"; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index f9b1fe6afe0..5a62a8a4292 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: stdenv.mkDerivation rec { - name = "samplv1-${version}"; + pname = "samplv1"; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/samplv1/${name}.tar.gz"; + url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; sha256 = "1y61wb0bzm1cz7y8xxv6hp8mrkfb9zm9irg6zs4g6aanw539r6l8"; }; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index ab1a6e38738..f902b2dd41b 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "20120105"; - name = "schismtracker-${version}"; + pname = "schismtracker"; src = fetchurl { - url = "http://schismtracker.org/dl/${name}.tar.bz2"; + url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2"; sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii"; }; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index d47ede27ece..9bab024f021 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: stdenv.mkDerivation rec { - name = "seq24-${version}"; + pname = "seq24"; version = "0.9.3"; src = fetchurl { - url = "https://launchpad.net/seq24/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/seq24/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3"; }; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 1047734a2c1..9502cb7b7e7 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "setbfree-${version}"; + pname = "setbfree"; version = "0.8.8"; src = fetchurl { diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index a98d1431d65..5708ef0ce0a 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "sfxr-qt-${version}"; + pname = "sfxr-qt"; version = "1.2.0"; src = fetchFromGitHub { owner = "agateau"; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index 8645251b384..dc8d95d2c49 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.0.10"; - name = "shntool-${version}"; + pname = "shntool"; src = fetchurl { url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index b857c5b6835..aff8c173d9f 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.4.4"; - name = "sidplayfp-${version}"; + pname = "sidplayfp"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz"; + url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz"; sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m"; }; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 5730dec6b99..21a36cecbe5 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { - name = "snapcast-${version}"; + pname = "snapcast"; version = "0.15.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index ee72b6cdb1a..7934af8aad8 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "3.1.0"; - name = "sonic-pi-${version}"; + pname = "sonic-pi"; src = fetchFromGitHub { owner = "samaaron"; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index d5f613b4594..501d097f29f 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "sonic-visualiser-${version}"; + pname = "sonic-visualiser"; version = "2.4.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; + url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz"; sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; }; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index bf4d96c6fc4..8dcca85a25c 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "sooperlooper-git-${version}"; + pname = "sooperlooper-git"; version = "2016-07-19"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index cf0b5db81f6..5d8ae0928c9 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: stdenv.mkDerivation rec { - name = "sorcer-${version}"; + pname = "sorcer"; version = "1.1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index babe4edff9d..01f0708d115 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { - name = "soundscape-renderer-unstable-${version}"; + pname = "soundscape-renderer-unstable"; version = "2016-11-03"; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 64deede535b..7544a3520c7 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: stdenv.mkDerivation rec { - name = "spectmorph-${version}"; + pname = "spectmorph"; version = "0.5.0"; src = fetchurl { - url = "http://spectmorph.org/files/releases/${name}.tar.bz2"; + url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn"; }; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 6614e370224..4c1682b1e0b 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: stdenv.mkDerivation rec { - name = "spectrojack-${version}"; + pname = "spectrojack"; version = "0.4.1"; src = fetchurl { - url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; + url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz"; sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 8af7888f74b..f4922e388c4 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }: stdenv.mkDerivation rec { - name = "spek-${version}"; + pname = "spek"; version = "0.8.3"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz"; sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; }; diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix index 372e507ed0e..3c9565df919 100644 --- a/pkgs/applications/audio/split2flac/default.nix +++ b/pkgs/applications/audio/split2flac/default.nix @@ -18,7 +18,7 @@ let ''; in stdenv.mkDerivation rec { - name = "split2flac-${version}"; + pname = "split2flac"; version = "122"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index 64ae9491535..3447049099b 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: stdenv.mkDerivation rec { - name = "spotifywm-unstable-${version}"; + pname = "spotifywm-unstable"; version = "2016-11-28"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 19386b47794..9eb71835caa 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "ssrc"; - name = "${pname}-${version}"; version = "1.33"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 39d1c266a37..efa87a2f72c 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { - name = "streamripper-${version}"; + pname = "streamripper"; version = "1.64.6"; src = fetchurl { - url = "mirror://sourceforge/streamripper/${name}.tar.gz"; + url = "mirror://sourceforge/streamripper/${pname}-${version}.tar.gz"; sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"; }; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 957ee50ca7a..1a3d1a96c85 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -12,7 +12,7 @@ let else "x86"; in stdenv.mkDerivation rec { - name = "SunVox-${version}"; + pname = "SunVox"; version = "1.9.4c"; src = fetchurl { diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 5e26b6c1cdb..d25e61c37f5 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "svox-${version}"; + pname = "svox"; version = "2017-07-18"; src = fetchgit { diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 6fa0eb7f8f2..b59752d7cc3 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "swh-lv2-${version}"; + pname = "swh-lv2"; version = "1.0.16"; src = fetchurl { diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index d28329b0117..1c373aefb4f 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }: stdenv.mkDerivation rec { - name = "synthv1-${version}"; + pname = "synthv1"; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/synthv1/${name}.tar.gz"; + url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; sha256 = "0cvamqzg74qfr7kzk3skimskmv0j3d1rmmpbpsmfcrg8srvyx9r2"; }; diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix index a739d72898e..2438cf68536 100644 --- a/pkgs/applications/audio/tambura/default.nix +++ b/pkgs/applications/audio/tambura/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "Tambura"; - name = "${pname}-${version}"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 257963de256..40362fdd496 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "tetraproc-${version}"; + pname = "tetraproc"; version = "0.8.6"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7"; }; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 78bd4338353..c983123ca38 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -12,11 +12,11 @@ assert enableKDE -> kdelibs4 != null; assert enableTelepathy -> telepathy-qt != null; stdenv.mkDerivation rec { - name = "tomahawk-${version}"; + pname = "tomahawk"; version = "0.8.4"; src = fetchurl { - url = "http://download.tomahawk-player.org/${name}.tar.bz2"; + url = "http://download.tomahawk-player.org/${pname}-${version}.tar.bz2"; sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g"; }; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 74079041948..8eb846ac9c5 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -2,7 +2,7 @@ , glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: stdenv.mkDerivation rec { - name = "transcribe-${version}"; + pname = "transcribe"; version = "8.72"; src = if stdenv.hostPlatform.system == "i686-linux" then diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 0c432acf4af..0f70f956713 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -3,7 +3,7 @@ , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: stdenv.mkDerivation rec { - name = "traverso-${version}"; + pname = "traverso"; version = "0.49.6"; src = fetchurl { diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 2e55306029f..066767c293c 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -27,7 +27,7 @@ let }; in with stdenv.lib; stdenv.mkDerivation rec { - name = "VCV-Rack-${version}"; + pname = "VCV-Rack"; version = "1.1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index ce561b5db31..7f02ea9cefe 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.09.2"; - name = "vimpc-${version}"; + pname = "vimpc"; src = fetchFromGitHub { owner = "boysetsfrog"; diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index b7b0fba2d54..485edaa1ff2 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }: stdenv.mkDerivation rec { - name = "vkeybd-${version}"; + pname = "vkeybd"; version = "0.1.18d"; src = fetchurl { - url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${name}.tar.bz2"; + url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${pname}-${version}.tar.bz2"; sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a"; }; diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index 735e4eb632c..13bf1d674c7 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: stdenv.mkDerivation rec { - name = "wolf-shaper-${version}"; + pname = "wolf-shaper"; version = "0.1.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index ece2f567791..22594d3ec85 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "20190714"; - name = "x42-plugins-${version}"; + pname = "x42-plugins"; src = fetchurl { - url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; + url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4"; }; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index a55b47a6c16..c0803ffa418 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -2,11 +2,11 @@ ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { - name = "xsynth-dssi-${version}"; + pname = "xsynth-dssi"; version = "0.9.4"; src = fetchurl { - url = "mirror://sourceforge/dssi/${name}.tar.gz"; + url = "mirror://sourceforge/dssi/${pname}-${version}.tar.gz"; sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index ca6d6240688..c8902f1dda4 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -1,12 +1,12 @@ {stdenv,fetchurl}: stdenv.mkDerivation rec { - name = "yasr-${version}"; + pname = "yasr"; version = "0.6.9"; src = fetchurl { - url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz"; + url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${pname}-${version}.tar.gz"; sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1"; }; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index b800df016c9..7976f747717 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: stdenv.mkDerivation rec { - name = "ympd-${version}"; + pname = "ympd"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 00a22ac711e..0936fe5a8ed 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -5,11 +5,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "yoshimi-${version}"; + pname = "yoshimi"; version = "1.5.11.3"; src = fetchurl { - url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; + url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2"; sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154"; }; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 69906b81438..cc04632cfb5 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { - name = "zam-plugins-${version}"; + pname = "zam-plugins"; version = "3.11"; src = fetchgit { diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix index faa90e684ae..1ec6946cf38 100644 --- a/pkgs/applications/audio/zita-njbridge/default.nix +++ b/pkgs/applications/audio/zita-njbridge/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.4"; - name = "zita-njbridge-${version}"; + pname = "zita-njbridge"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j"; }; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 7bc1c07befa..e22bf9ed653 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "zynaddsubfx-${version}"; + pname = "zynaddsubfx"; version = "3.0.5"; src = fetchurl { diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/applications/backup/vdmfec/default.nix index 3a480f70d4b..1366bb484a9 100644 --- a/pkgs/applications/backup/vdmfec/default.nix +++ b/pkgs/applications/backup/vdmfec/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "vdmfec-${version}"; + pname = "vdmfec"; version = "1.0"; src = fetchurl { - url = "http://members.tripod.com/professor_tom/archives/${name}.tgz"; + url = "http://members.tripod.com/professor_tom/archives/${pname}-${version}.tgz"; sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm"; }; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 45fd3cb8cbb..8302303a08e 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.2.1"; - name = "lightdm-enso-os-greeter-${version}"; + pname = "lightdm-enso-os-greeter"; src = fetchgit { url = https://github.com/nick92/Enso-OS; diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 91446f73507..69635718e3b 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: stdenv.mkDerivation rec { - name = "lightdm-mini-greeter-${version}"; + pname = "lightdm-mini-greeter"; version = "0.3.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index e8edcc3f634..2f0a770bc71 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, linux-pam }: stdenv.mkDerivation rec { - name = "ly-${version}"; + pname = "ly"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 214b435429a..1bd73bebe03 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, ncurses }: stdenv.mkDerivation rec { - name = "aewan-${version}"; + pname = "aewan"; version = "1.0.01"; src = fetchurl { - url = "mirror://sourceforge/aewan/${name}.tar.gz"; + url = "mirror://sourceforge/aewan/${pname}-${version}.tar.gz"; sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817"; }; diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 7db4d3e947b..170fde7b9ca 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -10,7 +10,7 @@ let skia = callPackage ./skia.nix {}; in stdenv.mkDerivation rec { - name = "aseprite-${version}"; + pname = "aseprite"; version = if unfree then "1.2.11" else "1.1.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index 9f1db146448..a12ccd257f8 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -1,7 +1,6 @@ { stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "bonzomatic"; version = "2018-03-29"; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 17ae4052198..439b721632d 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -8,13 +8,13 @@ let ]; in stdenv.mkDerivation rec { - name = "brackets-${version}"; + pname = "brackets"; version = "1.9"; src = fetchurl { url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp"; - name = "${name}.deb"; + name = "${pname}-${version}.deb"; }; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index f5e14ff1e09..3237c543ee6 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "bvi-${version}"; + pname = "bvi"; version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/bvi/${name}.src.tar.gz"; + url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz"; sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1"; }; diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index d08e006ec5b..2c6b153370e 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "bviplus-${version}"; + pname = "bviplus"; version = "0.9.4"; src = fetchurl { diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index 4ab11064eae..65ec4393912 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017-10-27"; - name = "deadpixi-sam-unstable-${version}"; + pname = "deadpixi-sam-unstable"; src = fetchFromGitHub { owner = "deadpixi"; diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index f4581c4bece..efb3a2f9ffa 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "dhex-${version}"; + pname = "dhex"; version = "0.69"; src = fetchurl { diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index 12ca7a07140..2f83b0b8d99 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -1,11 +1,11 @@ { lib, fetchurl, stdenv, libiconv, ncurses, lua }: stdenv.mkDerivation rec { - name = "dit-${version}"; + pname = "dit"; version = "0.5"; src = fetchurl { - url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz"; + url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc"; }; diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 0b6e28434f5..0de514233f8 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }: stdenv.mkDerivation rec { - name = "edbrowse-${version}"; + pname = "edbrowse"; version = "3.7.4"; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index 17fa75fe634..acda484ba3a 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: stdenv.mkDerivation rec { - name = "edit-nightly-${version}"; + pname = "edit-nightly"; version = "20160425"; src = fetchgit { diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 34120db6aa7..8c9b7771b0f 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.4"; - name = "cask-${version}"; + pname = "cask"; src = fetchFromGitHub { owner = "cask"; diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix index 2d1cbb75981..ce9f57ef40b 100644 --- a/pkgs/applications/editors/emacs-modes/cedille/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix @@ -1,7 +1,7 @@ { stdenv, cedille, emacs }: stdenv.mkDerivation rec { - name = "cedille-mode-${version}"; + pname = "cedille-mode"; version = cedille.version; src = cedille.src; diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix index 5b408ad7999..108d23ce233 100644 --- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix +++ b/pkgs/applications/editors/emacs-modes/cryptol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, emacs }: stdenv.mkDerivation rec { - name = "cryptol-mode-${version}"; + pname = "cryptol-mode"; version = "0.1.0"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix index c32669239f8..ce13c3042b9 100644 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn }: stdenv.mkDerivation rec { - name = "hol_light-mode-${version}"; + pname = "hol_light-mode"; version = "73"; src = fetchsvn { diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 17cf213a799..27dcd1063bf 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "2019-02-22"; - name = "icicles-${version}"; + pname = "icicles"; srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; + installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/"; meta = { homepage = https://www.emacswiki.org/emacs/Icicles; diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 2e168b3abf7..18e2e8ec168 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, emacs }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "idris-mode"; version = "0.9.18"; diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix index c0ddbc88cf2..c8b64130872 100644 --- a/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix @@ -2,9 +2,8 @@ stdenv.mkDerivation rec { pname = "emacs-jabber"; version = "0.8.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix index 0f7ac1d1dc8..1f59a355da3 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }: stdenv.mkDerivation rec { - name = "ProofGeneral-${version}"; + pname = "ProofGeneral"; version = "4.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index de72b24f87a..99d7f641eac 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: stdenv.mkDerivation (rec { - name = "ProofGeneral-unstable-${version}"; + pname = "ProofGeneral-unstable"; version = "2018-01-30"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 6d420599152..e48fba1551e 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -4,7 +4,7 @@ with qt5; stdenv.mkDerivation rec { version = "0.10.0"; - name = "featherpad-${version}"; + pname = "featherpad"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 104206a1491..b8b11e5e831 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fltk13, ghostscript }: stdenv.mkDerivation rec { - name = "flpsed-${version}"; + pname = "flpsed"; version = "0.7.3"; src = fetchurl { - url = "http://www.flpsed.org/${name}.tar.gz"; + url = "http://www.flpsed.org/${pname}-${version}.tar.gz"; sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp"; }; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index ce553fa8b28..e1155cb098c 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }: stdenv.mkDerivation rec { - name = "focuswriter-${version}"; + pname = "focuswriter"; version = "1.7.2"; src = fetchurl { diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix index 8aea8508aef..de57fb09215 100644 --- a/pkgs/applications/editors/hecate/default.nix +++ b/pkgs/applications/editors/hecate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "0.0.1"; - name = "hecate-${version}"; + pname = "hecate"; src = fetchFromGitHub { owner = "evanmiller"; diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix index dce02b56890..4e67fc304b1 100644 --- a/pkgs/applications/editors/heme/default.nix +++ b/pkgs/applications/editors/heme/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "heme-${version}"; + pname = "heme"; version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 22cc4d47e68..a6437f070b9 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }: stdenv.mkDerivation rec { - name = "hexcurse-${version}"; + pname = "hexcurse"; version = "1.60.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 4671df77554..09191b38e1b 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "hexedit-${version}"; + pname = "hexedit"; version = "1.2.13"; src = fetchurl { - url = "http://rigaux.org/${name}.src.tgz"; + url = "http://rigaux.org/${pname}-${version}.src.tgz"; sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka"; }; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index e7f200a4c07..5e5f2f8563c 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "howl-${version}"; + pname = "howl"; version = "0.6"; # Use the release tarball containing pre-downloaded dependencies sources diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 63864bc581d..fc1fe969bdc 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ht-${version}"; + pname = "ht"; version = "2.1.0"; src = fetchurl { diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index b2ace8accd8..6f5839b3d06 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.6"; - name = "joe-${version}"; + pname = "joe"; src = fetchurl { - url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; + url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz"; sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9"; }; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 9547b82efa1..cb9f10281c7 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "juicipp-${version}"; + pname = "juicipp"; version = "1.2.3"; meta = { diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index 5e6406e33f2..4a44b35a0fa 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "jupp-${version}"; + pname = "jupp"; version = "3.1"; srcName = "joe-3.1jupp31"; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index c3b46cf61df..795342fba5d 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "0.8.18.1"; - name = "leafpad-${version}"; + pname = "leafpad"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz"; sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index a2274be463e..ff824d8b45b 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { - name = "leo-editor-${version}"; + pname = "leo-editor"; version = "5.7.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index c3a280aed92..90e8c73e075 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { - name = "lighttable-${version}"; + pname = "lighttable"; version = "0.8.1"; src = fetchurl { name = "LightTableLinux64.tar.gz"; - url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz"; + url = "https://github.com/LightTable/LightTable/releases/download/${version}/${pname}-${version}-linux.tar.gz"; sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { installPhase = '' tar xf ${src} mkdir -p $out/{bin,share/LightTable} - mv ./${name}-linux/* $out/share/LightTable + mv ./${pname}-${version}-linux/* $out/share/LightTable patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 4fb8d51b969..de1a5ce7879 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }: stdenv.mkDerivation rec { - name = "mg-${version}"; + pname = "mg"; version = "20171014"; src = fetchurl { - url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; + url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz"; sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; }; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index fab3646efdf..e6b93f20c48 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "micro-${version}"; + pname = "micro"; version = "1.4.1"; goPackagePath = "github.com/zyedidia/micro"; diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index a027242c5ee..9cfcf95e78b 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qmake, qtbase, qtwebkit }: stdenv.mkDerivation rec { - name = "mindforger-${version}"; + pname = "mindforger"; version = "1.48.2"; src = fetchurl { diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 3f7eba73ca4..4e960524b94 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "moe-${version}"; + pname = "moe"; version = "1.10"; src = fetchurl { - url = "mirror://gnu/moe/${name}.tar.lz"; + url = "mirror://gnu/moe/${pname}-${version}.tar.lz"; sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc"; }; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index c2917aa394f..3a21eec07f4 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { version = "5.9.4.5"; revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b"; - name = "monodevelop-${version}"; + pname = "monodevelop"; src = fetchurl { - url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2"; sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; }; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 1b1c6eaf9e5..70f99fa749b 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -7,10 +7,10 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostP { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; }; in stdenv.mkDerivation rec { version = "1.2"; - name = "tuxguitar-${version}"; + pname = "tuxguitar"; src = fetchurl { - url = "mirror://sourceforge/tuxguitar/${name}-linux-${metadata.arch}.tar.gz"; + url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz"; sha256 = metadata.sha256; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 6bbdaf77a69..6072cb62b59 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -19,11 +19,11 @@ let }; in stdenv.mkDerivation rec { - name = "nano-${version}"; + pname = "nano"; version = "3.2"; src = fetchurl { - url = "mirror://gnu/nano/${name}.tar.xz"; + url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi"; }; diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index fb30036e146..7902ddc410c 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nanorc-${version}"; + pname = "nanorc"; version = "2018-09-05"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 9bc6425bc41..96687ab81d6 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "ne-${version}"; + pname = "ne"; version = "3.1.2"; src = fetchFromGitHub { owner = "vigna"; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 6fff6df8cdd..b1b3a416178 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xlibsWrapper, motif, libXpm }: stdenv.mkDerivation rec { - name = "nedit-${version}"; + pname = "nedit"; version = "5.7"; src = fetchurl { - url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; + url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz"; sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd"; }; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 0d0877015ee..7d558dfb893 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -20,7 +20,7 @@ let )); in stdenv.mkDerivation rec { - name = "neovim-unwrapped-${version}"; + pname = "neovim-unwrapped"; version = "0.3.8"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 03bdd5e0882..287758e0fd8 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -3,11 +3,11 @@ , qca-qt5, shared-mime-info }: stdenv.mkDerivation rec { - name = "okteta-${version}"; + pname = "okteta"; version = "0.26.2"; src = fetchurl { - url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv"; }; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 2f4693982a9..2dceee0a37d 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { - name = "scite-${version}"; + pname = "scite"; version = "4.0.5"; src = fetchurl { diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 90d89ce7799..ac171f60ead 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "sigil-${version}"; + pname = "sigil"; version = "0.9.14"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index a6d624d4b1e..efbca2949dd 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation rec { version = "git-2014-08-20"; - name = "supertux-editor-${version}"; + pname = "supertux-editor"; src = fetchFromGitHub { owner = "SuperTux"; diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index dd986b346a3..48af4a99dad 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "tecoc-git-${version}"; + pname = "tecoc-git"; version = "20150606"; src = fetchFromGitHub { @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ]; installPhase = '' - mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros + mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros cp src/tecoc $out/bin - cp src/aaout.txt doc/* $out/share/doc/${name} + cp src/aaout.txt doc/* $out/share/doc/${pname}-${version} cp lib/* lib2/* $out/lib/teco/macros (cd $out/bin ln -s tecoc Make diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 79ece9d62a9..2a4459ddc3e 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "texmaker"; version = "5.0.3"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; + url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30"; }; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 50113dd1566..04e2cb45e28 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "texstudio"; version = "2.12.16"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "${pname}-org"; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 79cad6a9782..85006e51b66 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "10.2"; - name = "textadept-${version}"; + pname = "textadept"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 86904c11f74..8042363f73c 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -4,7 +4,7 @@ , withPython ? true, python3 }: stdenv.mkDerivation rec { - name = "texworks-${version}"; + pname = "texworks"; version = "0.6.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index aa3b4b99d7a..6bfce921d0f 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "tweak-${version}"; + pname = "tweak"; version = "3.02"; src = fetchurl { - url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${pname}-${version}.tar.gz"; sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v"; }; diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix index 551fa67d986..fad4e82d37f 100644 --- a/pkgs/applications/editors/uemacs/default.nix +++ b/pkgs/applications/editors/uemacs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ncurses }: stdenv.mkDerivation rec { - name = "uemacs-${version}"; + pname = "uemacs"; version = "2014-12-08"; src = fetchgit { diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index 8d3a5353c98..d1aa59569e6 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "vbindiff-${version}"; + pname = "vbindiff"; version = "3.0_beta5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz"; + url = "https://www.cjmweb.net/vbindiff/${pname}-${version}.tar.gz"; sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh"; }; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 4d37b77f61b..1d65be3e73d 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -68,7 +68,7 @@ let in stdenv.mkDerivation rec { - name = "vim_configurable-${version}"; + pname = "vim_configurable"; inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 26cd61d182b..732bfbf0bfd 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -13,7 +13,7 @@ let common = callPackage ./common.nix {}; in stdenv.mkDerivation rec { - name = "vim-${version}"; + pname = "vim"; inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index ec2d75ffaf6..4c24c5f48d8 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { - name = "macvim-${version}"; + pname = "macvim"; version = "8.1.1517"; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 7825188fea9..5b9548df7f1 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "vis-${version}"; + pname = "vis"; version = "0.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index ce67cc2d648..aab3aecd7d6 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.13.42"; - name = "wily-${version}"; + pname = "wily"; src = fetchurl { - url = "mirror://sourceforge/wily/${name}.tar.gz"; + url = "mirror://sourceforge/wily/${pname}-${version}.tar.gz"; sha256 = "1jy4czk39sh365b0mjpj4d5wmymj98x163vmwzyx3j183jqrhm2z"; }; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index c345e8a95d5..09ccbad6cd7 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { - name = "wxHexEditor-${version}"; + pname = "wxHexEditor"; version = "0.24"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix index d91403bc54f..eeda097db25 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: stdenv.mkDerivation rec { - name = "xmlcopyeditor-${version}"; + pname = "xmlcopyeditor"; version = "1.2.1.3"; src = fetchurl { - name = "${name}.tar.gz"; - url = "mirror://sourceforge/xml-copy-editor/${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz"; sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v"; }; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index a90275638dc..100e64fc197 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -9,7 +9,7 @@ let (self: [ self.yi ] ++ extraPackages self); in stdenv.mkDerivation rec { - name = "yi-custom-${version}"; + pname = "yi-custom"; version = "0.0.0.1"; dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 38aeee6d13e..244f37b10df 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "OpenOrienteering-Mapper-${version}"; + pname = "OpenOrienteering-Mapper"; version = "0.8.4"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 7440e2633a3..1ae1221a330 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "saga"; version = "7.3.0"; - name = "${pname}-${version}"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 2bd2207a97a..c5a6210878b 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -20,7 +20,7 @@ let in stdenv.mkDerivation rec { - name = "imagemagick-${version}"; + pname = "imagemagick"; inherit (cfg) version; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index ecc6a5b00de..59f471ab4e3 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { - name = "imagemagick-${version}"; + pname = "imagemagick"; inherit (cfg) version; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index 938df76e257..e35a0190d8b 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }: stdenv.mkDerivation rec { - name = "pythonmagick-${version}"; + pname = "pythonmagick"; version = "0.9.16"; src = fetchurl { diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 5210af4df7a..fb06266cdc5 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -7,7 +7,7 @@ assert useUnrar -> unrar != null; stdenv.mkDerivation rec { - name = "ahoviewer-${version}"; + pname = "ahoviewer"; version = "1.6.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 09664889f35..5132d5950aa 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { - name = "alchemy-${version}"; + pname = "alchemy"; version = "008"; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix index c918e4b302b..c4f1b4218d0 100644 --- a/pkgs/applications/graphics/animbar/default.nix +++ b/pkgs/applications/graphics/animbar/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "animbar"; version = "1.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9"; }; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 0257a109568..7d800d57b63 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -9,7 +9,7 @@ let gitTag = "0.9.3"; in stdenv.mkDerivation rec { - name = "antimony-${version}"; + pname = "antimony"; version = "2018-10-20"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index c98c323fc79..5ce36f4f10e 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: stdenv.mkDerivation rec { - name = "apitrace-${version}"; + pname = "apitrace"; version = "7.1-572-g${builtins.substring 0 8 src.rev}"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index cc08dce906c..57e95dfef10 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -6,11 +6,11 @@ # libpng16.so.16 rather than libpng12. stdenv.mkDerivation rec { - name = "autotrace-${version}"; + pname = "autotrace"; version = "0.31.1"; src = fetchurl { - url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${name}.tar.gz"; + url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${pname}-${version}.tar.gz"; sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js"; }; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 52fd3cebec2..a8a7ec5dd57 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "avocode-${version}"; + pname = "avocode"; version = "3.9.0"; src = fetchurl { diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 7e1c6d7c8c4..4e864d953df 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchgit, cmake, itk, Cocoa }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "c3d"; version = "2018-10-04"; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index e16ef45fe1e..6565db2c42a 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2.6.2"; - name = "darktable-${version}"; + pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index 71e2d82ea7c..c35aaa044ae 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "deskew-${version}"; + pname = "deskew"; version = "1.25"; src = fetchFromBitbucket { diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 0ce160242e5..b0e32678a14 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -4,7 +4,7 @@ libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-them gtk-mac-integration-gtk2 }: stdenv.mkDerivation rec { - name = "dia-${version}"; + pname = "dia"; version = "0.97.3.20170622"; src = fetchgit { diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index d90fb41c03b..1917640fd2e 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -3,11 +3,11 @@ , darwin }: stdenv.mkDerivation rec { - name = "djview-${version}"; + pname = "djview"; version = "4.10.6"; src = fetchurl { - url = "mirror://sourceforge/djvu/${name}.tar.gz"; + url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; }; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index eca3740f975..5db104f031c 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -58,7 +58,7 @@ let ]; in stdenv.mkDerivation rec { - name = "drawpile-${version}"; + pname = "drawpile"; version = "2.1.11"; src = fetchurl { diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index 7980d09fed1..c8928540bb6 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { - name = "exrtools-${version}"; + pname = "exrtools"; version = "0.4"; src = fetchurl { - url = "http://scanline.ca/exrtools/${name}.tar.gz"; + url = "http://scanline.ca/exrtools/${pname}-${version}.tar.gz"; sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 3eff3360a6c..503feee3d65 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "feh-${version}"; + pname = "feh"; version = "3.2.1"; src = fetchurl { - url = "https://feh.finalrewind.org/${name}.tar.bz2"; + url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg"; }; diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 8ca093b90c3..3b866297603 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "fontmatrix-${version}"; + pname = "fontmatrix"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index b8f4d544503..5f866d00b3e 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -8,7 +8,7 @@ assert mpi != null; let pythonPackages = python3Packages; in mkDerivation rec { - name = "freecad-${version}"; + pname = "freecad"; version = "0.18.3"; src = fetchurl { diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index bdb1e87d70e..1d712a63fbd 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }: mkDerivation rec { - name = "fstl-${version}"; + pname = "fstl"; version = "0.9.3"; buildInputs = [qtbase mesa_glu]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 08b2757dd6e..62e2ebfa4b1 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "geeqie-${version}"; + pname = "geeqie"; version = "1.4"; src = fetchurl { - url = "http://geeqie.org/${name}.tar.xz"; + url = "http://geeqie.org/${pname}-${version}.tar.xz"; sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index ec708ad971a..9ba7dbed37b 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -2,7 +2,7 @@ , pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }: stdenv.mkDerivation rec { - name = "giv-${version}"; + pname = "giv"; version = "0.9.26"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index b3671ead377..eb48333997c 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "gnuclad-${version}"; + pname = "gnuclad"; version = "0.2.4"; src = fetchurl { - url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${pname}-${version}.tar.gz"; sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index b25ba8f567d..e4ab5639ba6 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -2,7 +2,7 @@ , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { - name = "goxel-${version}"; + pname = "goxel"; version = "0.10.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index b1580d73b64..039bb1917d3 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "2.4.2035"; - name = "grafx2-${version}"; + pname = "grafx2"; src = fetchurl { - url = "https://grafx2.googlecode.com/files/${name}-src.tgz"; + url = "https://grafx2.googlecode.com/files/${pname}-${version}-src.tgz"; sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; }; diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix index fedcafc5978..be8885caff1 100644 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -1,7 +1,7 @@ { stdenv, graphicsmagick }: stdenv.mkDerivation rec { - name = "graphicsmagick-imagemagick-compat-${version}"; + pname = "graphicsmagick-imagemagick-compat"; inherit (graphicsmagick) version; dontUnpack = true; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 84d1450da82..403a5285e15 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -3,7 +3,7 @@ , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: stdenv.mkDerivation rec { - name = "graphicsmagick-${version}"; + pname = "graphicsmagick"; version = "1.3.32"; src = fetchurl { diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 0bbd543a307..7d5a9013035 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -8,7 +8,7 @@ let imagej150 = stdenv.mkDerivation rec { - name = "imagej-${version}"; + pname = "imagej"; version = "150"; src = fetchurl { diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index a881c0fc1f9..5fdd20825cd 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXinerama, imlib2 }: stdenv.mkDerivation rec { - name = "imlibsetroot-${version}"; + pname = "imlibsetroot"; version = "1.2"; src = fetchurl { url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 89712d4d1f7..38e536c70cb 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "imv-${version}"; + pname = "imv"; version = "3.1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 42ed667dee9..4eb7518cc10 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -3,7 +3,7 @@ let inherit (pythonPackages) python; in pythonPackages.buildPythonApplication rec { - name = "jbrout-${version}"; + pname = "jbrout"; version = "338"; src = fetchsvn { diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix index ed583490c90..b5664d51a14 100644 --- a/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: stdenv.mkDerivation rec { - name = "jpeg-archive-${version}"; + pname = "jpeg-archive"; version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15 # update with diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix index f438bf6f7ed..e15aedd77e1 100644 --- a/pkgs/applications/graphics/jpeginfo/default.nix +++ b/pkgs/applications/graphics/jpeginfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - name = "jpeginfo-${version}"; + pname = "jpeginfo"; version = "1.6.1"; src = fetchurl { - url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz"; + url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2"; }; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index b24b14698e6..cc1ca3a0ff2 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.4.6"; - name = "jpegoptim-${version}"; + pname = "jpegoptim"; src = fetchurl { - url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz"; + url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; }; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 301dc902dce..1487fb8adba 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { version = "0.8.0.6"; - name = "k3d-${version}"; + pname = "k3d"; src = fetchFromGitHub { owner = "K-3D"; repo = "k3d"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa"; }; diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index e70fafa24b6..9b96b30c62b 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { - name = "kgraphviewer-${version}"; + pname = "kgraphviewer"; version = "2.4.3"; src = fetchurl { - url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/kgraphviewer/${version}/${pname}-${version}.tar.xz"; sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"; }; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 4f86e573689..201a4fe113e 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -6,7 +6,7 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ { stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { - name = "leocad-${version}"; + pname = "leocad"; version = "19.07.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix index 2fddc39e0d0..5f8a0bb6eed 100644 --- a/pkgs/applications/graphics/meme/default.nix +++ b/pkgs/applications/graphics/meme/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "meme-unstable-${version}"; + pname = "meme-unstable"; version = "2017-09-10"; owner = "nomad-software"; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index 515b834b41e..3d1fc52637f 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages, libX11, gettext }: pythonPackages.buildPythonApplication rec { - name = "mirage-${version}"; + pname = "mirage"; version = "0.9.5.2"; src = fetchurl { - url = "mirror://sourceforge/mirageiv/${name}.tar.bz2"; + url = "mirror://sourceforge/mirageiv/${pname}-${version}.tar.bz2"; sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c"; }; diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index b48fd891a6a..63cc4a3a8d3 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.3.1"; - name = "mozjpeg-${version}"; + pname = "mozjpeg"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 466ab3e26fb..5ad5ab6acc6 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -4,7 +4,7 @@ let inherit (python2Packages) python pycairo pygobject3 numpy; in stdenv.mkDerivation rec { - name = "mypaint-${version}"; + pname = "mypaint"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index d0838070262..e4393726483 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -17,7 +17,7 @@ }: stdenv.mkDerivation rec { - name = "nomacs-${version}"; + pname = "nomacs"; version = "3.12"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index cf13c6fb05e..13a00991265 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -5,7 +5,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper }: stdenv.mkDerivation rec { - name = "paraview-${version}"; + pname = "paraview"; version = "5.6.0"; # fetching from GitHub instead of taking an "official" source diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 3cc7166b4e4..a0aaed49c9c 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2018-08-15"; - name = "pbrt-v3-${version}"; + pname = "pbrt-v3"; src = fetchFromGitHub { rev = "86b5821308088deea70b207bc8c22219d0103d65"; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index f622d3f388e..37857fc459e 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.0.4"; - name = "pencil-${version}"; + pname = "pencil"; src = fetchurl { url = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb"; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 7da1d4b612f..5e7fb5cf7a0 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: stdenv.mkDerivation rec { - name = "phototonic-${version}"; + pname = "phototonic"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 132136da658..f50af2925a3 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "potrace-${version}"; + pname = "potrace"; version = "1.15"; src = fetchurl { diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index ec4ce69d5e8..1ad51e92d47 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation (rec { - name = "pqiv-${version}"; + pname = "pqiv"; version = "2.11"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 6f90131db12..9399d760f0d 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.4"; - name = "processing3-${version}"; + pname = "processing3"; src = fetchFromGitHub { owner = "processing"; @@ -39,16 +39,16 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - cp -dpR build/linux/work $out/${name} + cp -dpR build/linux/work $out/${pname}-${version} - rmdir $out/${name}/java - ln -s ${jdk} $out/${name}/java + rmdir $out/${pname}-${version}/java + ln -s ${jdk} $out/${pname}-${version}/java - makeWrapper $out/${name}/processing $out/bin/processing \ + makeWrapper $out/${pname}-${version}/processing $out/bin/processing \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + makeWrapper $out/${pname}-${version}/processing-java $out/bin/processing-java \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index c37e21ec898..4d416a7c106 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: stdenv.mkDerivation rec { - name = "qcomicbook-${version}"; + pname = "qcomicbook"; version = "0.9.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index ce08e2b1be9..750217d9918 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation (rec { version = "2.3.2"; - name = "qiv-${version}"; + pname = "qiv"; src = fetchurl { - url = "https://spiegl.de/qiv/download/${name}.tgz"; + url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz"; sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; }; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index b300c0071fa..7e9547c1067 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.9.8"; - name = "rapcad-${version}"; + pname = "rapcad"; src = fetchFromGitHub { owner = "gilesbathgate"; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 3fd4521d7cd..594429503a3 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { version = "1.4"; - name = "renderdoc-${version}"; + pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 01c203b407c..d4165be3784 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, rpmextract }: stdenv.mkDerivation rec { - name = "libsane-dsseries-${version}"; + pname = "libsane-dsseries"; version = "1.0.5-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf100974/${name}.x86_64.rpm"; + url = "https://download.brother.com/welcome/dlf100974/${pname}-${version}.x86_64.rpm"; sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq"; }; nativeBuildInputs = [ rpmextract ]; unpackCmd = '' - mkdir ${name} && pushd ${name} + mkdir ${pname}-${version} && pushd ${pname}-${version} rpmextract $curSrc popd ''; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index f6994db81e4..66473c4a155 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }: stdenv.mkDerivation rec { - name = "sane-frontends-${version}"; + pname = "sane-frontends"; version = "1.0.14"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz"; + url = "https://alioth.debian.org/frs/download.php/latestfile/175/${pname}-${version}.tar.gz"; sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7"; }; diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index d55441e39fa..63f16f688ac 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -3,7 +3,7 @@ , qtbase, qttools }: stdenv.mkDerivation rec { - name = "scantailor-advanced-${version}"; + pname = "scantailor-advanced"; version = "1.0.16"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 292ae9c8faa..88bbbd9d864 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "screencloud-${version}"; + pname = "screencloud"; version = "1.2.0"; # API Keys. According to the author of the AUR package, these are only used diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index d0f2a48c589..f56646e5aed 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }: stdenv.mkDerivation rec { - name = "swingsane-${version}"; + pname = "swingsane"; version = "0.2"; src = fetchurl { diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 23713271c40..157c0b9742b 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -2,7 +2,7 @@ , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { - name = "tesseract-${version}"; + pname = "tesseract"; version = "3.05.00"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index af0063301f1..548f58a50fb 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -2,7 +2,7 @@ , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { - name = "tesseract-${version}"; + pname = "tesseract"; version = "4.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix index b4ddb143685..8355545e8dd 100644 --- a/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - name = "timelapse-deflicker-${version}"; + pname = "timelapse-deflicker"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 48930ccbbb9..4f5fb12faa6 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -2,13 +2,13 @@ , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { - name = "viewnior-${version}"; + pname = "viewnior"; version = "1.6"; src = fetchFromGitHub { owner = "xsisqox"; repo = "Viewnior"; - rev = name; + rev = "${pname}-${version}"; sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p"; }; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index e11bc3dd5bb..232eeeb0115 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: stdenv.mkDerivation rec { - name = "write_stylus-${version}"; + pname = "write_stylus"; version = "209"; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 182f68f3112..e80362c386b 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -2,11 +2,11 @@ , libXt, zlib, gettext, intltool, perl }: stdenv.mkDerivation rec { - name = "xaos-${version}"; + pname = "xaos"; version = "3.6"; src = fetchurl { - url = "mirror://sourceforge/xaos/${name}.tar.gz"; + url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz"; sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; }; diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index 2269f1c18f1..ae4765fc9e7 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xfractint"; version = "20.04p14"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 2487b093148..41539f32b07 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -23,7 +23,7 @@ }: stdenv.mkDerivation rec { - name = "xournalpp-${version}"; + pname = "xournalpp"; version = "1.0.12"; src = fetchFromGitHub { diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 69ab67dffb7..de3f3a78988 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: stdenv.mkDerivation rec { - name = "xzgv-${version}"; + pname = "xzgv"; version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 3cf42343658..e545dd5a723 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "yacreader-${version}"; + pname = "yacreader"; version = "9.5.0"; src = fetchurl { - url = "https://github.com/YACReader/yacreader/releases/download/${version}/${name}-src.tar.xz"; + url = "https://github.com/YACReader/yacreader/releases/download/${version}/${pname}-${version}-src.tar.xz"; sha256 = "0cv5y76kjvsqsv4fp99j8np5pm4m76868i1nn40q6hy573dmxwm6"; }; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 799ceef1bed..0038d41475f 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-${version}"; + pname = "yEd"; version = "3.19"; src = fetchzip { - url = "https://www.yworks.com/resources/yed/demo/${name}.zip"; + url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; sha256 = "0l70pc7wl2ghfkjab9w2mbx7crwha7xwkrpmspsi5c6q56dw7s33"; }; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index ac3d303a7a6..db07b9e1db4 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -2,9 +2,8 @@ stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; - name="${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip"; + url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip"; sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23"; }; buildInputs = [jre unzip]; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 7a49e5b2cb7..8ef705f7ef4 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { - name = "zgv-${version}"; + pname = "zgv"; version = "5.9"; src = fetchurl { - url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz"; + url = "https://www.svgalib.org/rus/zgv/${pname}-${version}.tar.gz"; sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 50582d94ff4..465c72d73f5 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -14,7 +14,6 @@ let libPath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "airtame"; version = "3.3.0"; - name = "${pname}-${version}"; longName = "${pname}-application"; src = fetchurl { diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix index 8cb014bb021..8c5aded5ed9 100644 --- a/pkgs/applications/misc/aminal/default.nix +++ b/pkgs/applications/misc/aminal/default.nix @@ -10,7 +10,7 @@ }: buildGoPackage rec { - name = "aminal-${version}"; + pname = "aminal"; version = "0.8.6"; goPackagePath = "github.com/liamg/aminal"; diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix index 37d140e19ba..c680ffe9678 100644 --- a/pkgs/applications/misc/ape/clex.nix +++ b/pkgs/applications/misc/ape/clex.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "attempto-clex-${version}"; + pname = "attempto-clex"; version = "5133afe"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 2da0de9ead8..b5af1af91f3 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.1.5"; - name = "apvlv-${version}"; + pname = "apvlv"; src = fetchFromGitHub { owner = "naihe2010"; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index 202c1669f85..791e2d0f52e 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { - name = "artha-${version}"; + pname = "artha"; version = "1.0.3"; src = fetchurl { diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 2dd151c1a6c..444a8da7036 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "autospotting-${version}"; + pname = "autospotting"; version = "unstable-2018-11-17"; goPackagePath = "github.com/AutoSpotting/AutoSpotting"; diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index abb3eb33536..8b994c55de3 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -7,11 +7,11 @@ let inherit (pythonPackages) dbus-python pygtk python; in stdenv.mkDerivation rec { - name = "batti-${version}"; + pname = "batti"; version = "0.3.8"; src = fetchurl { - url = "https://batti-gtk.googlecode.com/files/${name}.tar.gz"; + url = "https://batti-gtk.googlecode.com/files/${pname}-${version}.tar.gz"; sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6"; }; diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index f085e4bd7dd..06df1df9f76 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }: stdenv.mkDerivation rec { - name = "bb-${version}"; + pname = "bb"; version = "1.3rc1"; src = fetchurl { - url = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz"; sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr"; }; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 41184d6e949..a3f0a3b84f2 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "2.10.1"; - name = "bibletime-${version}"; + pname = "bibletime"; src = fetchurl { - url = "mirror://sourceforge/bibletime/${name}.tar.xz"; + url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz"; sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6"; }; diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index a1581408201..402198a9732 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }: stdenv.mkDerivation rec { - name = "calcurse-${version}"; + pname = "calcurse"; version = "4.5.0"; src = fetchurl { - url = "https://calcurse.org/files/${name}.tar.gz"; + url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3"; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0b66be1f84c..a949f0400cb 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { - name = "calibre-${version}"; + pname = "calibre"; version = "3.45.2"; src = fetchurl { - url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; + url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05"; }; diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 35aa681df4b..77cabc409c7 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: stdenv.mkDerivation rec { - name = "candle-${version}"; + pname = "candle"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index e48b32a783d..dae6e404a9d 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit version; - name = "cataract-${version}"; + pname = "cataract"; src = fetchgit { url = "git://git.bzatek.net/cataract"; diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 1bbb7d61b01..20bfe727f6d 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, libcap, Carbon, IOKit }: stdenv.mkDerivation rec { - name = "cdrtools-${version}"; + pname = "cdrtools"; version = "3.02a06"; src = fetchurl { - url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; + url = "mirror://sourceforge/cdrtools/${pname}-${version}.tar.bz2"; sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd"; }; diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index 9d63b5aedcb..04f32a67b84 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.7.2"; - name = "cgminer-${version}"; + pname = "cgminer"; src = fetchgit { url = "https://github.com/ckolivas/cgminer.git"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 41660bc7f2b..357dd9bcb8a 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -2,7 +2,6 @@ with python3.pkgs; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "cheat"; version = "2.5.1"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 0578393dfca..856853e3b1c 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cherrytree-${version}"; + pname = "cherrytree"; version = "0.38.8"; src = fetchurl { - url = "https://www.giuspen.com/software/${name}.tar.xz"; + url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz"; sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg"; }; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 6602adb2f2a..4986661e2f6 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.8"; - name = "cli-visualizer-${version}"; + pname = "cli-visualizer"; src = fetchFromGitHub { owner = "dpayne"; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 4477cbbcc06..693ce84c97a 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "clipit-${version}"; + pname = "clipit"; version = "1.4.2"; src = fetchurl { - url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz"; + url = "https://github.com/downloads/shantzu/ClipIt/${pname}-${version}.tar.gz"; sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index e6e4ede6ac1..7577c0a3db9 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -3,7 +3,7 @@ let runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; in stdenv.mkDerivation rec { - name = "clipmenu-${version}"; + pname = "clipmenu"; version = "5.6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index bd49323b03f..c9dcc97d5cd 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -3,7 +3,7 @@ mkDerivation rec { version = "1.1.1"; - name = "cool-retro-term-${version}"; + pname = "cool-retro-term"; src = fetchFromGitHub { owner = "Swordfish90"; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 3ee357ce151..2aad4d352c9 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "CopyQ-${version}"; + pname = "CopyQ"; version = "3.9.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 4d997519246..0e9ff40cffa 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -17,7 +17,7 @@ , extraCmakeFlags ? [] }: stdenv.mkDerivation rec { - name = "cpp-ethereum-${version}"; + pname = "cpp-ethereum"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 0123e0c38d7..72918a40733 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, ncurses, readline }: stdenv.mkDerivation rec { - name = "ctodo-${version}"; + pname = "ctodo"; version = "1.3"; src = fetchurl { diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix index e44f43d22bf..90f5f307d85 100644 --- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix +++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: stdenv.mkDerivation rec { - name = "curaengine-lulzBot-${version}"; + pname = "curaengine-lulzBot"; version = "3.6.18"; src = fetchgit { diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index 4e620425d5c..a367efaaef3 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -14,7 +14,7 @@ # If, however, someone needs it, we certainly can find a solution. stdenv.mkDerivation rec { - name = "curabydagoma-${version}"; + pname = "curabydagoma"; # Version is the date, UNIX format version = "1520506579"; # Hash of the user's choice: os, arch, package type... diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 823e6d6e2e9..3e4c77aafc6 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }: stdenv.mkDerivation rec { - name = "curaengine-${version}"; + pname = "curaengine"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 82d77b65f66..d8cf86461ac 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -6,7 +6,7 @@ # See `pkgs/applications/editors/eclipse/*.nix` stdenv.mkDerivation rec { - name = "dbeaver-ce-${version}"; + pname = "dbeaver-ce"; version = "6.1.4"; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index b010e5401b8..3cbb091a4e2 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "ddgr-${version}"; + pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix index 7f4629100d5..a1fdabd8ccb 100644 --- a/pkgs/applications/misc/deco/default.nix +++ b/pkgs/applications/misc/deco/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "deco"; version = "0.0.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 4fb9ca5fa71..5699396a084 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }: stdenv.mkDerivation rec { - name = "devilspie2-${version}"; + pname = "devilspie2"; version = "0.43"; src = fetchurl { diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 467c2b3c2d5..283b66318ea 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -8,7 +8,7 @@ let [ wxGTK ]; in stdenv.mkDerivation rec { - name = "diff-pdf-${version}"; + pname = "diff-pdf"; version = "2017-12-30"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index daea20835c8..37ed8eb23fb 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.1.3"; - name = "diffpdf-${version}"; + pname = "diffpdf"; src = fetchurl { - url = "http://www.qtrac.eu/${name}.tar.gz"; + url = "http://www.qtrac.eu/${pname}-${version}.tar.gz"; sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566"; }; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { install -Dpm755 -D diffpdf $out/bin/diffpdf install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1 - install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications - install -Dpm644 CHANGES README help.html $out/share/doc/${name}/ - install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/ + install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications + install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/ + install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/ install -Dpm644 images/icon.png $out/share/icons/diffpdf.png install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 58bc483d43f..13539169dec 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -47,7 +47,7 @@ let copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; in stdenv.mkDerivation rec { - name = "digitalbitbox-${version}"; + pname = "digitalbitbox"; version = "2.2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index f1e33ea5357..8f7dbd2d2ed 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "direwolf-${version}"; + pname = "direwolf"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index fd08ed9c391..8cfadd77ece 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: stdenv.mkDerivation rec { - name = "doomseeker-${version}"; + pname = "doomseeker"; version = "2018-03-05"; src = fetchFromBitbucket { diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 1d3c405b703..5150f13fb80 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -2,7 +2,6 @@ pythonPackages.buildPythonApplication rec { pname = "dotfiles"; - name = "${pname}-${version}"; version = "0.6.4"; src = pythonPackages.fetchPypi { diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index b5ae9fb567c..226bdea0301 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "12010904"; - name = "dozenal-${version}"; + pname = "dozenal"; src = fetchFromGitHub { owner = "dgoodmaniii"; repo = "dozenal"; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 6c802e683ce..ae83802a7b4 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -2,11 +2,11 @@ librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { - name = "eaglemode-${version}"; + pname = "eaglemode"; version = "0.94.1"; src = fetchurl { - url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; + url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2"; sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89"; }; diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index d447e7f50d5..62358d41cc5 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "emem"; version = "0.2.50"; - name = "${pname}-${version}"; inherit jdk; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index b6c10dbebca..1a87b7f5c8b 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { - name = "epdfview-${version}"; + pname = "epdfview"; version = "0.1.8"; src = fetchurl { diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index bf1ae3037fc..d0d3c2b424d 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { - name = "et-${version}"; + pname = "et"; version = "0.1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix index 98b47990314..56cac7ca918 100644 --- a/pkgs/applications/misc/eterm/default.nix +++ b/pkgs/applications/misc/eterm/default.nix @@ -3,7 +3,7 @@ , pkgconfig, imlib2, libast }: stdenv.mkDerivation rec { - name = "eterm-${version}"; + pname = "eterm"; version = "0.9.6"; srcName = "Eterm-${version}"; diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index b8bd0a59bea..e9d1317390e 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: stdenv.mkDerivation rec { - name = "eureka-editor-${version}"; + pname = "eureka-editor"; version = "1.21"; shortver = "121"; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 4746f4ead1b..d1161aa6822 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "evilvte-${version}"; + pname = "evilvte"; version = "0.5.2-20140827"; src = fetchgit { diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 21fed2e28de..6d04cef76ce 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "exercism-${version}"; + pname = "exercism"; version = "3.0.11"; goPackagePath = "github.com/exercism/cli"; diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix index 2b7888c9cd0..f96d3f0f57c 100644 --- a/pkgs/applications/misc/extract_url/default.nix +++ b/pkgs/applications/misc/extract_url/default.nix @@ -10,7 +10,7 @@ let ++ lib.optional uriFindSupport perlPackages.URIFind; in stdenv.mkDerivation rec { - name = "extract_url-${version}"; + pname = "extract_url"; version = "1.6.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index f70042884a8..06cf3c06ffa 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.3.1"; - name = "flamerobin-${version}"; + pname = "flamerobin"; src = fetchFromGitHub { owner = "mariuz"; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 4e786bfb36f..2ca059820ef 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec{ - name = "fme-${version}"; + pname = "fme"; version = "1.1.3"; src = fetchurl { diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 5152c8aa3f7..aee3937689b 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jdk, jre, ant }: stdenv.mkDerivation rec { - name = "freemind-${version}"; + pname = "freemind"; version = "1.0.1"; src = fetchurl { diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 9a34694e2f2..67d4bd65a9f 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -15,7 +15,7 @@ let pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] ); in stdenv.mkDerivation rec { - name = "gImageReader-${version}"; + pname = "gImageReader"; version = "3.3.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 44071b32875..ecf8ae9da8d 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -3,7 +3,7 @@ , gtk, pkgconfig, flex }: stdenv.mkDerivation rec { - name = "galculator-${version}"; + pname = "galculator"; version = "2.1.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 739df59b31c..fb6902634da 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gammu-${version}"; + pname = "gammu"; version = "1.40.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index dd0a5c9a4f6..96d3d34046e 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ganttproject-bin-${version}"; + pname = "ganttproject-bin"; version = "2.8.10"; src = let build = "r2364"; in fetchzip { diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index a3aebf22733..f5eb6e188b7 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "gcal-${version}"; + pname = "gcal"; version = "4.1"; src = fetchurl { - url = "mirror://gnu/gcal/${name}.tar.xz"; + url = "mirror://gnu/gcal/${pname}-${version}.tar.xz"; sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"; }; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index a77f87f6f1f..983a210c163 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "getxbook-${version}"; + pname = "getxbook"; version = "1.2"; src = fetchurl { - url = "https://njw.me.uk/getxbook/${name}.tar.xz"; + url = "https://njw.me.uk/getxbook/${pname}-${version}.tar.xz"; sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 4af776674e6..b5d008579ac 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -5,10 +5,9 @@ stdenv.mkDerivation rec { version = "2.0.2"; pname = "gksu"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${name}.tar.gz"; + url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; }; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 3831780c791..6f5146161a6 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -21,7 +21,7 @@ let ''; in stdenv.mkDerivation rec { - name = "glava-${version}"; + pname = "glava"; version = "1.6.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index b80ddb8f303..f8da250dbc7 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-jira-${version}"; + pname = "go-jira"; version = "1.0.17"; goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1"; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index d4ff7269987..dd0c24e2e29 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -14,10 +14,10 @@ let categories = "Application;Utility;"; }; in mkDerivation rec { - name = "golden-cheetah-${version}"; + pname = "golden-cheetah"; version = "3.4"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz"; sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf"; }; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 62f2d7a069d..e9a177ee193 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -2,7 +2,6 @@ , git }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "gollum"; # nix-shell -p bundix icu zlib version = (import ./gemset.nix).gollum.version; @@ -10,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; inherit pname ruby; gemdir = ./.; }; diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 3dcbcaf38b8..12eb8839b8a 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.9"; - name = "googler-${version}"; + pname = "googler"; src = fetchFromGitHub { owner = "jarun"; diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index 7b23fca2121..c1c2a44bd7f 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }: stdenv.mkDerivation rec { - name = "gphoto2fs-${version}"; + pname = "gphoto2fs"; version = "0.5.0"; src = fetchurl { url="mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2"; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index aa0ed5f6463..9d244ca18f3 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: stdenv.mkDerivation rec { - name = "gpsbabel-${version}"; + pname = "gpsbabel"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 4f0c1864677..9c0dc48d42e 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }: stdenv.mkDerivation rec { - name = "gpsprune-${version}"; + pname = "gpsprune"; version = "19.2"; src = fetchurl { diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 735818171e8..04ab062c1a1 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gpx-viewer-${version}"; + pname = "gpx-viewer"; version = "0.4.0"; src = fetchurl { - url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80"; }; diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index 9fef9381949..a341a212a37 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "gpx-${version}"; + pname = "gpx"; version = "2.5.2"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index e9026ded470..84be50ccb5e 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -10,7 +10,7 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { version = "5.0.1"; - name = "gramps-${version}"; + pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] @@ -48,7 +48,7 @@ in buildPythonApplication rec { eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth if [ -e "$eapth" ]; then # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${name}.pth + mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth fi rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index cb4f4748eec..308f084bd58 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: stdenv.mkDerivation rec { - name = "green-pdfviewer-${version}"; + pname = "green-pdfviewer"; version = "nightly-2014-04-22"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 9274c2d0521..87e636b9c03 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -1,7 +1,7 @@ { fetchzip, stdenv, makeWrapper, openjdk }: stdenv.mkDerivation rec { - name = "gremlin-console-${version}"; + pname = "gremlin-console"; version = "3.3.4"; src = fetchzip { url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 7f3b3a8d6dc..ea78331e476 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: stdenv.mkDerivation rec { - name = "gsimplecal-${version}"; + pname = "gsimplecal"; version = "2.1"; src = fetchurl { diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 8f683272e12..204624f2439 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.1"; - name = "gtk2fontsel-${version}"; + pname = "gtk2fontsel"; src = fetchurl { - url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz"; + url = "mirror://sourceforge/gtk2fontsel/${pname}-${version}.tar.gz"; sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; }; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 1e237923d05..f0026cac52e 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.6"; - name = "gummi-${version}"; + pname = "gummi"; src = pkgs.fetchFromGitHub { owner = "alexandervdm"; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index a9e6d905c28..a7313e7c969 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gxmessage-${version}"; + pname = "gxmessage"; version = "3.4.3"; src = fetchurl { - url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz"; + url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz"; sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix index e2f5f653d47..989dfb886ec 100644 --- a/pkgs/applications/misc/hdate/default.nix +++ b/pkgs/applications/misc/hdate/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.02"; - name = "hdate-${version}"; + pname = "hdate"; src = fetchurl { url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2"; sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762"; diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index 1647a09edfd..a2d2e8ad735 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -1,7 +1,7 @@ { stdenv, runtimeShell }: stdenv.mkDerivation rec { - name = "example-unfree-package-${version}"; + pname = "example-unfree-package"; version = "1.0"; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 63a8af99f7c..8bae8ce373c 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-${version}"; + pname = "hello"; version = "2.10"; src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; + url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; }; diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index 0431f35057b..84f5bad24d2 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "hivemind-${version}"; + pname = "hivemind"; version = "1.0.4"; goPackagePath = "github.com/DarthSim/hivemind"; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 500f1df36a0..88c87eaca87 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { version = "17.0.352"; - name = "houdini-runtime-${version}"; + pname = "houdini-runtime"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; sha256 = "0cl5fkgaplb0cvv7mli06ffc9j4ngpy8hl5zqabj3d645gcgafjg"; diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 2fd56e3c555..437c42b0331 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hr-${version}"; + pname = "hr"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 7cdf1a319f6..0d25d3d686c 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, pkgconfig, gettext }: stdenv.mkDerivation rec { - name = "hstr-${version}"; + pname = "hstr"; version = "2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0bb3f15fdc1..9e26e44a4f7 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "hugo-${version}"; + pname = "hugo"; version = "0.55.4"; goPackagePath = "github.com/gohugoio/hugo"; diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index f8d808a49c2..f21675e60b2 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { version = "2.1.2"; - name = "hyper-${version}"; + pname = "hyper"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm"; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index c0c1faef09d..c197e1a8fd3 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -3,7 +3,7 @@ let lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; in stdenv.mkDerivation rec { - name = "iceSL-${version}"; + pname = "iceSL"; version = "2.1.10"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index d9bccee889a..7daa2704e22 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "ipmicfg-${version}"; + pname = "ipmicfg"; version = "1.29.0"; buildVersion = "181029"; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index b5fa9143ddb..64e0f0d325b 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - name = "IPMIView-${version}"; + pname = "IPMIView"; version = "2.14.0"; buildVersion = "180213"; diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix index e493226be60..d63576d5cbd 100644 --- a/pkgs/applications/misc/iterm2/default.nix +++ b/pkgs/applications/misc/iterm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "iterm2-${version}"; + pname = "iterm2"; version = "3.0.14"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 5939d7789b4..c8951059d4c 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "jbidwatcher"; version = "2.5.6"; - name = "${pname}-${version}"; - src = fetchurl { url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar"; sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 8838de9ac96..56b28dbc8db 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }: stdenv.mkDerivation rec { - name = "josm-${version}"; + pname = "josm"; version = "15238"; src = fetchurl { diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 138ee397d3f..2a9e162e7ea 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.7"; - name = "jp2a-${version}"; + pname = "jp2a"; src = fetchFromGitHub { owner = "cslarsen"; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 7c5845b3541..9391fe88c5e 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "k2pdfopt-${version}"; + pname = "k2pdfopt"; version = "2.51a"; src = (fetchzip { diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index ecfcc771728..0a42d5e4f28 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "kanboard-${version}"; + pname = "kanboard"; version = "1.2.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index b518481e29a..2af091b0df3 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -7,7 +7,7 @@ let [ stdenv.cc.libc stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "kdbplus-${version}"; + pname = "kdbplus"; version = "3.3"; src = requireFile { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; phases = "unpackPhase installPhase"; - unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}"; + unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}"; installPhase = '' mkdir -p $out/bin $out/libexec diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 8a3aaf202a7..36734a97516 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: stdenv.mkDerivation rec { - name = "keepassx2-${version}"; + pname = "keepassx2"; version = "2.0.3"; src = fetchurl { diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 85dfda405b0..dc73f2b27bb 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -31,7 +31,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "keepassxc-${version}"; + pname = "keepassxc"; version = "2.4.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index 05ad9b05abb..7adbcb86c50 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: stdenv.mkDerivation rec { - name = "keepassx-${version}"; + pname = "keepassx"; version = "0.4.4"; src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/${name}.tar.gz"; + url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry"; }; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 4fb2227ee20..99b9c38d53f 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -18,7 +18,7 @@ let in with python.pkgs; buildPythonApplication rec { version = "0.14.0"; - name = "khard-${version}"; + pname = "khard"; namePrefix = ""; src = fetchurl { diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 01aef93e5e5..89778f670ff 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -31,10 +31,10 @@ let pugixml = stdenv.mkDerivation rec { version = "1.2"; - name = "pugixml-${version}"; + pname = "pugixml"; src = fetchurl { - url = "http://download.kiwix.org/dev/${name}.tar.gz"; + url = "http://download.kiwix.org/dev/${pname}-${version}.tar.gz"; sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; }; @@ -42,8 +42,8 @@ let unpackPhase = '' # not a nice src archive: all the files are in the root :( - mkdir ${name} - cd ${name} + mkdir ${pname}-${version} + cd ${pname}-${version} tar -xf ${src} # and the build scripts are in there :'( @@ -54,7 +54,7 @@ let in stdenv.mkDerivation rec { - name = "kiwix-${version}"; + pname = "kiwix"; version = "0.9"; src = fetchurl { diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index bdbdef45fe7..0bd91994418 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -4,12 +4,11 @@ mkDerivation rec { pname = "latte-dock"; version = "0.8.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj"; - name = "${name}.tar.xz"; + name = "${pname}-${version}.tar.xz"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 9018a592642..76abe7c9b4b 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "lenmus-${version}"; + pname = "lenmus"; version = "5.4.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index c9583961de4..9667c7466cb 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libosmocore-${version}"; + pname = "libosmocore"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index c049ed2374f..09089a072b3 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { version = "2.1.3"; - name = "librecad-${version}"; + pname = "librecad"; src = fetchurl { url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; - name = name + ".tar.gz"; + name = "${pname}-${version}" + ".tar.gz"; sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx"; }; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 948ae7b14a1..38078d11931 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { - name = "lilyterm-${version}"; + pname = "lilyterm"; inherit (stuff) src version; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 5ae652d750d..c66ef21416b 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -4,7 +4,7 @@ libGLU_combined, freetype, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { - name = "llpp-${version}"; + pname = "llpp"; version = "30"; src = fetchgit { diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 4972aa28e58..42905fa3cb4 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "ltwheelconf"; version = "0.2.7"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "thk"; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 7ccd4d6e5e9..5435080e831 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -30,7 +30,7 @@ let ]; in buildPythonApplication rec { - name = "lutris-original-${version}"; + pname = "lutris-original"; version = "0.5.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index ad3bd499cde..744d124f84d 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "2.3.0"; - name = "lyx-${version}"; + pname = "lyx"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz"; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri"; }; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index f2dacb7890f..9a134343d29 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "madonctl-${version}"; + pname = "madonctl"; version = "1.1.0"; goPackagePath = "github.com/McKael/madonctl"; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index a6af1762e28..f2585f78146 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; - name = "makeself-${version}"; + pname = "makeself"; src = fetchFromGitHub { owner = "megastep"; @@ -15,15 +15,15 @@ stdenv.mkDerivation rec { patches = [ ./Use-rm-from-PATH.patch ]; postPatch = '' - sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh + sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh ''; installPhase = '' - mkdir -p $out/{bin,share/{${name},man/man1}} - cp makeself.lsm README.md $out/share/${name} + mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} + cp makeself.lsm README.md $out/share/${pname}-${version} cp makeself.sh $out/bin/makeself cp makeself.1 $out/share/man/man1/ - cp makeself-header.sh $out/share/${name} + cp makeself-header.sh $out/share/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 6c58dde00d3..03f30d64fb2 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.15"; - name = "mdp-${version}"; + pname = "mdp"; src = fetchFromGitHub { owner = "visit1985"; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 8e6965bfc4f..9eb4a0897d4 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "19.07"; - name = "mediainfo-gui-${version}"; + pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 8bbb179d9d5..78c2506ff00 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "19.04"; - name = "mediainfo-${version}"; + pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5"; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index b3e73986417..ee6cfdb729f 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -24,7 +24,7 @@ }: stdenv.mkDerivation rec { - name = "megasync-${version}"; + pname = "megasync"; version = "4.1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 0b802bedf8d..ed0bbc4cb48 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -7,7 +7,7 @@ assert pandocSupport -> pandoc != null; stdenv.mkDerivation rec { - name = "memo-${version}"; + pname = "memo"; version = "0.8"; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 718f2e46fa0..e06f2a88ade 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "menumaker-${version}"; + pname = "menumaker"; version = "0.99.11"; src = fetchurl { - url = "mirror://sourceforge/menumaker/${name}.tar.gz"; + url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz"; sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx"; }; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index dec55e9c1e5..3023a5b5930 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -2,7 +2,7 @@ , qtbase, qtsvg, qtwebkit }: stdenv.mkDerivation rec { - name = "merkaartor-${version}"; + pname = "merkaartor"; version = "0.18.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 602d4a032ef..318c7c25242 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "metamorphose2-${version}"; + pname = "metamorphose2"; version = "0.9.0beta"; # exif-py vendored via submodule diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 09c4d1db290..6c1dcd5e150 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: stdenv.mkDerivation rec { - name = "milu-nightly-${version}"; + pname = "milu-nightly"; version = "2016-05-09"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 6aa7eea3d7e..95ceaddb4f0 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.2"; - name = "minergate-cli-${version}"; + pname = "minergate-cli"; src = fetchurl { url = "https://minergate.com/download/ubuntu-cli"; sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8"; diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index d11e889e932..fdd1238d870 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.1"; - name = "minergate-${version}"; + pname = "minergate"; src = fetchurl { url = "https://minergate.com/download/ubuntu"; sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 46ba9d450c8..d3e7f9e8cd4 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "mlterm-${version}"; + pname = "mlterm"; version = "3.8.8"; src = fetchurl { - url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k"; }; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 920c1c3f095..08f510a2840 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "moonlight-embedded-${version}"; + pname = "moonlight-embedded"; version = "2.4.10"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index b9179bbe546..c0d41cda02d 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "mop-${version}"; + pname = "mop"; version = "0.2.0"; rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix index eea166d8df7..0e8cc2ebcea 100644 --- a/pkgs/applications/misc/mqtt-bench/default.nix +++ b/pkgs/applications/misc/mqtt-bench/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "mqtt-bench-${version}"; + pname = "mqtt-bench"; version = "0.3.0"; rev = "v${version}"; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 38f5075d10f..9219c4e2e42 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -15,10 +15,10 @@ let in stdenv.mkDerivation rec { version = "1.14.0"; - name = "mupdf-${version}"; + pname = "mupdf"; src = fetchurl { - url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; + url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4"; }; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index c08a21e8797..249d9ff1d40 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.7.7"; - name = "mwic-${version}"; + pname = "mwic"; src = fetchurl { - url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0l4anwiiqclymx0awwn4hzaj8n26ycg8nz76wjphsyscn7z2awad"; }; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index cccd36d7ead..172f999223a 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -14,7 +14,6 @@ let in stdenv.mkDerivation rec { pname = "mysql-workbench"; version = "8.0.15"; - name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 45b83b72748..deecc92d993 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mystem-${version}"; + pname = "mystem"; version = "3.1"; src = fetchurl { - url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz"; + url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz"; sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10"; }; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index 022829040b8..b4d97c368ea 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.5-rc1"; - name = "nanoblogger-${version}"; + pname = "nanoblogger"; src = fetchurl { - url = "mirror://sourceforge/nanoblogger/${name}.tar.gz"; + url = "mirror://sourceforge/nanoblogger/${pname}-${version}.tar.gz"; sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq"; }; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index e8497dbc7bd..4d95f0b5238 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -17,7 +17,7 @@ assert speechdSupport -> speechd != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "navit-${version}"; + pname = "navit"; version = "0.5.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix index 21a5ab0cd0f..4104d35cf10 100644 --- a/pkgs/applications/misc/neap/default.nix +++ b/pkgs/applications/misc/neap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { - name = "neap-${version}"; + pname = "neap"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix index 0bb86fdca95..c1ba5ba23b1 100644 --- a/pkgs/applications/misc/netsurf/browser/default.nix +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { - name = "netsurf-${version}"; + pname = "netsurf"; version = "3.9"; src = fetchurl { diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index 882bb75219d..24377028ce7 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "netsurf-buildsystem-${version}"; + pname = "netsurf-buildsystem"; version = "1.7"; src = fetchurl { diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix index f343a886283..88ac4f0c3eb 100644 --- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix +++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "netsurf-nsgenbind-${version}"; + pname = "netsurf-nsgenbind"; version = "0.7"; src = fetchurl { diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 1cc7f419aa2..31afed3061a 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, electron, runtimeShell } : stdenv.mkDerivation rec { - name = "nix-tour-${version}"; + pname = "nix-tour"; version = "0.0.1"; buildInputs = [ electron ]; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 145abfba5d5..dec8b4ba0a7 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -2,7 +2,7 @@ , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { - name = "nixnote2-${version}"; + pname = "nixnote2"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index bcf2edd8f2f..db8139122ba 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "noice-${version}"; + pname = "noice"; version = "0.6"; src = fetchgit { diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index d4f3db4ca6f..4568c3e8acc 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -13,7 +13,7 @@ let baseURI = "https://launchpad.net/~leolik/+archive/leolik"; in stdenv.mkDerivation rec { - name = "notify-osd-${version}"; + pname = "notify-osd"; version = "0.9.35+16.04.20160415"; src = fetchurl { diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 5c60c7412c4..484ff62e9e6 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "notify-osd-${version}"; + pname = "notify-osd"; version = "0.9.34"; src = fetchurl { diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index e16d9354bb4..b9529981c7c 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ola-${version}"; + pname = "ola"; version = "0.10.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index b87f11d7b05..3a0a548be0b 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version_name = "1.2.sakura.5"; version = "1.2.5"; - name = "oneko-${version}"; + pname = "oneko"; src = fetchurl { url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 8ff9a2f44d5..8f7f74f7123 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { - name = "openbox-menu-${version}"; + pname = "openbox-menu"; version = "0.8.0"; src = fetchurl { - url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${pname}-${version}.tar.bz2"; sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index e4f2fd7ce8b..5c7e7355c66 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -2,7 +2,7 @@ gettext, glib, portaudio }: stdenv.mkDerivation rec { - name = "opencpn-${version}"; + pname = "opencpn"; version = "5.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index bc6aa242f33..e404da974c4 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages, ncurses, gsl }: stdenv.mkDerivation rec { - name = "orpie-${version}"; + pname = "orpie"; version = "1.5.2"; src = fetchurl { - url = "http://pessimization.com/software/orpie/${name}.tar.gz"; + url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz"; sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy"; }; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 9d0fb3fdeb7..8ffc8ec69fe 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : stdenv.mkDerivation rec { - name = "osm2xmap-${version}"; + pname = "osm2xmap"; version = "2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index bb53782fb7d..4cbd7cb7119 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { - name = "osmctools-${version}"; + pname = "osmctools"; version = "0.8.5plus1.4.0"; buildInputs = [ zlib ]; diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 2b35cb77038..616949af883 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }: stdenv.mkDerivation rec { - name = "osmium-tool-${version}"; + pname = "osmium-tool"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 7fdfbd84d2f..482ac7ad066 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "pcmanx-gtk2-${version}"; + pname = "pcmanx-gtk2"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index f604684b19a..bc6f5965e89 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: pythonPackages.buildPythonApplication rec { - name = "pdf-quench-${version}"; + pname = "pdf-quench"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index d55c7a2af12..fc4e5229c9c 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "pell"; version = "0.0.4"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 7e7850668b8..86e10ae0943 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { - name = "pgadmin3-${version}"; + pname = "pgadmin3"; version = "1.22.2"; src = fetchurl { diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 113a63f7fe1..241d5786468 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, openssl } : stdenv.mkDerivation rec { - name = "pgmanage-${version}"; + pname = "pgmanage"; version = "11.0.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 0cee74522ab..e8ddec91e62 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pythonPackages }: stdenv.mkDerivation rec { - name = "phwmon-${version}"; + pname = "phwmon"; version = "2017-04-10"; src = fetchFromGitLab { diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index b44169adea8..3ecace18f92 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "plasma-applet-volumewin7mixer-${version}"; + pname = "plasma-applet-volumewin7mixer"; version = "24"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 0bd28811d55..8021ffdc8f5 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -2,7 +2,7 @@ { stable = with python27Packages; buildPythonPackage rec { - name = "plover-${version}"; + pname = "plover"; version = "3.1.1"; meta = with stdenv.lib; { @@ -24,7 +24,7 @@ }; dev = with python36Packages; buildPythonPackage rec { - name = "plover-${version}"; + pname = "plover"; version = "4.0.0.dev8"; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 4b39e9291a8..16c49d5f946 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, python2Packages, gnome-menus }: stdenv.mkDerivation rec { - name = "pmenu-${version}"; + pname = "pmenu"; version = "2018-01-01"; src = fetchFromGitLab { diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 81e3d80f516..8413f8c8f10 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { - name = "polar-bookshelf-${version}"; + pname = "polar-bookshelf"; version = "1.13.10"; # fetching a .deb because there's no easy way to package this Electron app diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix index 5ba8e1b6e31..344c3d7168a 100644 --- a/pkgs/applications/misc/projectlibre/default.nix +++ b/pkgs/applications/misc/projectlibre/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }: stdenv.mkDerivation rec { - name = "projectlibre-${version}"; + pname = "projectlibre"; version = "1.7.0"; src = fetchgit { diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index cc6f63c0960..e5d73672eb7 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -8,7 +8,7 @@ let else "2.4"; in stdenv.mkDerivation rec { - name = "prusa-slicer-${version}"; + pname = "prusa-slicer"; version = "2.0.0"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index ae0fd61c33d..aae38f7d0f1 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -3,11 +3,11 @@ , garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }: mkDerivation rec { - name = "qlandkartegt-${version}"; + pname = "qlandkartegt"; version = "1.8.1"; src = fetchurl { - url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz"; sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly"; }; diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index f12a3021a19..a679a4f1112 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, libusb }: stdenv.mkDerivation rec { - name = "garmindev-${version}"; + pname = "garmindev"; version = "0.3.4"; src = fetchurl { - url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz"; sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6"; }; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index df5f35102e0..8fc890f4243 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -4,7 +4,7 @@ }: mkDerivation rec { - name = "qlcplus-${version}"; + pname = "qlcplus"; version = "4.12.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 99a0acbcc8c..335c583998f 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -1,11 +1,11 @@ { mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }: mkDerivation rec { - name = "qmapshack-${version}"; + pname = "qmapshack"; version = "1.13.1"; src = fetchurl { - url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz"; sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9"; }; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index e395ae9c070..ecc372dc674 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -2,7 +2,7 @@ , qtmultimedia, qttools, qtwebengine }: stdenv.mkDerivation rec { - name = "qolibri-${version}"; + pname = "qolibri"; version = "2018-11-14"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 6ae8f380fe2..71a433bded7 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -7,7 +7,7 @@ mkDerivation rec { version = "0.5.8"; - name = "qsyncthingtray-${version}"; + pname = "qsyncthingtray"; src = fetchFromGitHub { owner = "sieren"; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index b2616bf7b77..948bcf33d37 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, gtk2, synergy}: stdenv.mkDerivation rec { - name = "quicksynergy-${version}"; + pname = "quicksynergy"; version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index bf4559e9117..25f9c6ed4c7 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "redis-desktop-manager-${version}"; + pname = "redis-desktop-manager"; version = "0.9.1"; src = fetchgit { diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index d8512754f6a..d91eccdf8a4 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { - name = "redshift-${version}"; + pname = "redshift"; version = "1.12"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 703d7862124..ca362bab2ec 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -14,7 +14,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "regextester-${version}"; + pname = "regextester"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index be365cb94e4..6c4522d81c8 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -2,7 +2,7 @@ freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { - name = "robo3t-${version}"; + pname = "robo3t"; version = "1.1.1"; src = fetchurl { diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index 76593eba5fc..8df4e960c18 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -2,7 +2,7 @@ freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { - name = "robomongo-${version}"; + pname = "robomongo"; version = "0.9.0"; src = fetchurl { diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index 8e63cdb6d16..acdd21a1c21 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -3,11 +3,11 @@ , libX11, libXt, libXpm }: stdenv.mkDerivation rec { - name = "rxvt-${version}"; + pname = "rxvt"; version = "2.7.10"; src = fetchurl { - url = "mirror://sourceforge/rxvt/${name}.tar.gz"; + url = "mirror://sourceforge/rxvt/${pname}-${version}.tar.gz"; sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix index f872e800836..a4e03fa347f 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "urxvt-autocomplete-all-the-things-${version}"; + pname = "urxvt-autocomplete-all-the-things"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index 544789e865b..b976388ae2c 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "urxvt-perls-${version}"; + pname = "urxvt-perls"; version = "2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index e8e5c524a35..2982c02cce9 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "urxvt-tabbedex-${version}"; + pname = "urxvt-tabbedex"; version = "19.21"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 30f54cdee7e..125170d36c2 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -4,7 +4,6 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "safeeyes"; version = "2.0.9"; namePrefix = ""; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 33df8e8f0a2..8510d501942 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }: stdenv.mkDerivation rec { - name = "sakura-${version}"; + pname = "sakura"; version = "3.6.0"; src = fetchurl { - url = "https://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1"; }; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 280a42fde14..c95eba48bdf 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; - name = "sc-im-${version}"; + pname = "sc-im"; src = fetchFromGitHub { owner = "andmarti1424"; diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index cc8c30043b2..3cebcc0101f 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: stdenv.mkDerivation rec { - name = "sdcv-${version}"; + pname = "sdcv"; version = "0.5.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index fc63745ebb8..114404c2597 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, undmg }: stdenv.mkDerivation rec { - name = "sequel-pro-${version}"; + pname = "sequel-pro"; version = "1.1.2"; src = fetchurl { diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index fc6be074a07..d2d5e9548a0 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation rec { - name = "slade-${version}"; + pname = "slade"; version = "3.1.1.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index e012c3763b3..cf9e93b87b3 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "slic3r-${version}"; + pname = "slic3r"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index f4a2e889cd4..bfb3d010a3c 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "slstatus-${version}"; + pname = "slstatus"; version = "unstable-2018-04-16"; src = fetchgit { diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 9f20b20f7f3..c116b587406 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -3,7 +3,7 @@ , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { - name = "spacefm-${version}"; + pname = "spacefm"; version = "1.0.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index a1d5ef153bb..103075024dd 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: stdenv.mkDerivation rec { - name = "sqliteman-${version}"; + pname = "sqliteman"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index aee486ddf0c..eb408eaf6ee 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, imlib2, libX11 }: stdenv.mkDerivation rec { - name = "ssocr-${version}"; + pname = "ssocr"; version = "unstable-2018-08-11"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index d3cd81f7f13..8c47de3afac 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "stog-${version}"; + pname = "stog"; version = "0.18.0"; src = fetchFromGitLab { domain = "framagit.org"; diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index d545447cb13..340b59d5ff2 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -3,7 +3,7 @@ , perlPackages, python27 }: stdenv.mkDerivation rec { - name = "styx-${version}"; + pname = "styx"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 7bac1db813f..5967fa3ad77 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -30,7 +30,7 @@ let }; googlemaps = stdenv.mkDerivation rec { - name = "googlemaps-${version}"; + pname = "googlemaps"; version = "2017-12-18"; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index f16a0d29c40..a07fe0c7510 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: buildGoPackage rec { - name = "syncthing-tray-${version}"; + pname = "syncthing-tray"; version = "0.7"; goPackagePath = "github.com/alex2108/syncthing-tray"; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 5f12bdb4dfc..377d83e5962 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -3,7 +3,7 @@ , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { - name = "synergy-${version}"; + pname = "synergy"; version = "1.8.8"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index 52e39b98a3b..fbb1832735b 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "tabula-${version}"; + pname = "tabula"; version = "1.2.1"; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 7ca421b49a3..0450cb40a55 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017-05-15"; - name = "tasknc-${version}"; + pname = "tasknc"; src = fetchFromGitHub { owner = "lharding"; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 6a30adb23da..feb06368de4 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, readline }: stdenv.mkDerivation rec { - name = "tasksh-${version}"; + pname = "tasksh"; version = "1.2.0"; enableParallelBuilding = true; src = fetchurl { - url = "https://taskwarrior.org/download/${name}.tar.gz"; + url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; }; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index dc632f3ed75..ba919fbc626 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libuuid, gnutls }: stdenv.mkDerivation rec { - name = "taskwarrior-${version}"; + pname = "taskwarrior"; version = "2.5.1"; src = fetchurl { diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 7edb8dd5d1e..94eacb1fe06 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; buildPythonApplication rec { - name = "termdown-${version}"; + pname = "termdown"; version = "1.16.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 3599bd0030b..00300e65abb 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -1,7 +1,7 @@ { stdenv, runtimeShell, lib, fetchzip }: stdenv.mkDerivation rec { - name = "terminal-notifier-${version}"; + pname = "terminal-notifier"; version = "2.0.0"; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index bdbea571790..6cacb621517 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "terminal-parrot-${version}"; + pname = "terminal-parrot"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index 8518b72bc95..fce46d120de 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { version = "1.0.0-alpha.42"; - name = "terminus-${version}"; + pname = "terminus"; src = fetchurl { url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index d4191a875bd..6a9de364446 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "termite-${version}"; + pname = "termite"; version = "15"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 4172660182d..39f54156fef 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { - name = "tilda-${version}"; + pname = "tilda"; version = "1.4.1"; src = fetchzip { - url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; + url = "https://github.com/lanoxx/tilda/archive/${pname}-${version}.tar.gz"; sha256 = "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj"; }; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index ca049ba04c9..d0419c414d7 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "timewarrior-${version}"; + pname = "timewarrior"; version = "1.1.1"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 63bb7f4bb4a..e612fb10ff8 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "tint2-${version}"; + pname = "tint2"; version = "16.7"; src = fetchFromGitLab { diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index 6cf1f27a104..cb70d57869c 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.17"; - name = "tnef-${version}"; + pname = "tnef"; src = fetchFromGitHub { owner = "verdammelt"; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index d4735c0baf5..d9dcee762cf 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "todoist-${version}"; + pname = "todoist"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix index 122567de2e1..240ad6e5fca 100644 --- a/pkgs/applications/misc/todolist/default.nix +++ b/pkgs/applications/misc/todolist/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "todolist-${version}"; + pname = "todolist"; version = "v0.8.1"; goPackagePath = "github.com/gammons/todolist"; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index b268bdd0962..bf22cb0181d 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -12,7 +12,7 @@ let }; bugsnag-qt = stdenv.mkDerivation rec { - name = "bugsnag-qt-${version}"; + pname = "bugsnag-qt"; version = "20180522.005732"; src = fetchzip { @@ -25,7 +25,7 @@ let }; qxtglobalshortcut = stdenv.mkDerivation rec { - name = "qxtglobalshortcut-${version}"; + pname = "qxtglobalshortcut"; version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; src = fetchzip { @@ -38,7 +38,7 @@ let }; qt-oauth-lib = stdenv.mkDerivation rec { - name = "qt-oauth-lib-${version}"; + pname = "qt-oauth-lib"; version = "20190125.190943"; src = fetchzip { diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 34952b9c0f4..eb3894c7b47 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -5,7 +5,6 @@ with python3Packages; buildPythonApplication rec { pname = "topydo"; version = "0.13"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bram85"; diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 09322b47506..b955711d003 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.1"; - name = "tpmmanager-${version}"; + pname = "tpmmanager"; src = fetchgit { url = "https://github.com/Sirrix-AG/TPMManager"; diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index dbac56abaa1..76ac3f75b26 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tthsum-${version}"; + pname = "tthsum"; version = "1.3.2"; src = fetchurl { diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix index d12120ca2f1..344c07d845b 100644 --- a/pkgs/applications/misc/usync/default.nix +++ b/pkgs/applications/misc/usync/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "usync"; version = "0.0.3"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 6752b0182fe..5a12465c4c4 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "valentina-${version}"; + pname = "valentina"; version = "0.6.1"; src = fetchhg { diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index 5cd8de43729..b25e7f76cef 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, perl }: stdenv.mkDerivation rec { - name = "vcal-${version}"; + pname = "vcal"; version = "2.8"; src = fetchurl { diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 8b64bcca667..f0900a99e5d 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -4,7 +4,6 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "veracrypt"; - name = "${pname}-${version}"; version = "1.23"; src = fetchurl { diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 05862444556..b6a8b567a50 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: stdenv.mkDerivation rec { - name = "verbiste-${version}"; + pname = "verbiste"; version = "0.1.46"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0"; }; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 50f2012d34a..cda3b1a6f85 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -4,7 +4,7 @@ , geoclue2, liboauth }: stdenv.mkDerivation rec { - name = "viking-${version}"; + pname = "viking"; version = "1.7"; src = fetchurl { diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 5ebc98b5712..64645e00bd8 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,6 @@ , dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp }: buildPythonApplication rec { - name = "${pname}-${version}"; pname = "visidata"; version = "1.5.2"; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 47b0385be68..e482e7e7c02 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -3,7 +3,7 @@ , dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "volnoti-unstable-${version}"; + pname = "volnoti-unstable"; version = "2013-09-23"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index e794b82e2f6..a59a25a144e 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }: stdenv.mkDerivation rec { - name = "vp-${version}"; + pname = "vp"; version = "1.8"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 1feec9e4550..d6404ca6596 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { - name = "vue-${version}"; + pname = "vue"; version = "3.3.0"; src = fetchurl { url = "http://releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1"; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 48818ca3b8b..6dfe8e713c6 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, qmake, qtsvg }: stdenv.mkDerivation rec { - name = "vym-${version}"; + pname = "vym"; version = "2.6.11"; src = fetchurl { - url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2"; + url = "mirror://sourceforge/project/vym/2.6.0/${pname}-${version}.tar.bz2"; sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl"; }; diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index 1c6dc8f63c2..ff770f516bc 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, mpfr, readline }: stdenv.mkDerivation rec { - name = "wcalc-${version}"; + pname = "wcalc"; version = "2.5"; src = fetchurl { - url = "mirror://sourceforge/w-calc/${name}.tar.bz2"; + url = "mirror://sourceforge/w-calc/${pname}-${version}.tar.bz2"; sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f"; }; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 90fa0166154..2748d576c69 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.3"; - name = "weather-${version}"; + pname = "weather"; src = fetchurl { - url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz"; + url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546"; }; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index a3d3ace009e..03f3caa4c15 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "wego-${version}"; + pname = "wego"; version = "20170403-${stdenv.lib.strings.substring 0 7 rev}"; rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c"; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index d8628b794d7..d38383c30ec 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { version = "1.4"; - name = "wikicurses-${version}"; + pname = "wikicurses"; src = fetchFromGitHub { owner = "ids1024"; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 5d153a0e417..5a1093b4779 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.0"; - name = "wordnet-${version}"; + pname = "wordnet"; src = fetchurl { url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2"; sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 69421e288d3..bfc414c61c9 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -1,11 +1,11 @@ { stdenv, libX11, fetchurl }: stdenv.mkDerivation rec { - name = "worker-${version}"; + pname = "worker"; version = "4.0.0"; src = fetchurl { - url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; + url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; sha256 = "0cs1sq7zpp787r1irhqk5pmxa26rjz55mbgda4823z9zkzwfxy19"; }; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 1547d296211..a3c9d735ff8 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -6,7 +6,7 @@ , gst-plugins-good, libsigcxx }: stdenv.mkDerivation rec { - name = "workrave-${version}"; + pname = "workrave"; version = "1.10.31"; src = let diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index bf3d9b737a9..9040bb4318d 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.31"; - name = "xautoclick-${version}"; + pname = "xautoclick"; src = fetchurl { url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 280b3012872..8c5a2e3d2db 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -2,7 +2,7 @@ , libtool, openssl, qtbase, qttools }: mkDerivation rec { - name = "xca-${version}"; + pname = "xca"; version = "2.1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index ed7f2b27c38..b7f8cfce2fb 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, txt2tags, python2Packages }: stdenv.mkDerivation rec { - name = "xdgmenumaker-${version}"; + pname = "xdgmenumaker"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 88ab52313b0..b7c6f938b19 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "xiphos-${version}"; + pname = "xiphos"; version = "4.0.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix index 3023e830dc7..d6709ecc1a6 100644 --- a/pkgs/applications/misc/xkbd/default.nix +++ b/pkgs/applications/misc/xkbd/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "xkbd-${version}"; + pname = "xkbd"; version = "0.8.18"; src = fetchFromGitHub { owner = "mahatma-kaganovich"; repo = "xkbd"; - rev = name; + rev = "${pname}-${version}"; sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9"; }; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 3f3865d7688..abc808477a3 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xkblayout-state"; version = "1b"; diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix index 4fa1c833df5..dc618e4561e 100644 --- a/pkgs/applications/misc/xkbmon/default.nix +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { - name = "xkbmon-${version}"; + pname = "xkbmon"; version = "0.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index fc5abf10989..ca1d104fb46 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }: stdenv.mkDerivation rec { - name = "xmind-${version}"; + pname = "xmind"; version = "8-update8"; src = fetchzip { - url = "https://xmind.net/xmind/downloads/${name}-linux.zip"; + url = "https://xmind.net/xmind/downloads/${pname}-${version}-linux.zip"; stripRoot = false; sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn"; }; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 9afe3cae07b..69e8c3d330f 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xmrig-${version}"; + pname = "xmrig"; version = "2.14.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 4922d3c6aed..5aa52ff4dd7 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xmrig-proxy-${version}"; + pname = "xmrig-proxy"; version = "2.14.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 1cce7b155fd..0661a625e97 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -2,7 +2,7 @@ , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation rec { - name = "xneur-${version}"; + pname = "xneur"; version = "0.20.0"; src = fetchurl { diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 5db4a250839..bc91083892d 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -3,7 +3,7 @@ , glib, intltool, gtk3, gtksourceview, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "xpad-${version}"; + pname = "xpad"; version = "5.4.0"; src = fetchurl { diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index bb3385ad016..41071012ae9 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.01"; - name = "xrandr-invert-colors-${version}"; + pname = "xrandr-invert-colors"; src = fetchurl { url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz"; sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 28ce4a0d500..517105d7e1f 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, libXt }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xscope"; version = "1.4.1"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/${pname}-${version}.tar.bz2"; sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; }; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index ef9ce339361..55ecd358c6c 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -4,7 +4,7 @@ with lib; stdenv.mkDerivation rec { - name = "xsuspender-${version}"; + pname = "xsuspender"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index 3e8acff00f8..aa851e14ab5 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -4,7 +4,7 @@ let makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); in stdenv.mkDerivation rec { - name = "xsw-${version}"; + pname = "xsw"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix index 6bc492833cc..856ddb8ff50 100644 --- a/pkgs/applications/misc/xteddy/default.nix +++ b/pkgs/applications/misc/xteddy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }: stdenv.mkDerivation rec { - name = "xteddy-${version}"; + pname = "xteddy"; version = "2.2-5"; src = fetchFromGitLab { domain = "salsa.debian.org"; diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index 21f95c65fa5..51575d62ed5 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.7"; - name = "xtermcontrol-${version}"; + pname = "xtermcontrol"; src = fetchurl { url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index d273d27944a..2135c7fd617 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.9"; - name = "yaft-${version}"; + pname = "yaft"; src = fetchFromGitHub { owner = "uobikiemukot"; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 8f8494ac45b..a3d32f1597f 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -21,10 +21,9 @@ mkDerivation rec { pname = "yakuake"; version = "3.0.5"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "http://download.kde.org/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8"; }; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index a47fb93512d..06e12416baa 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { version = "git-2017-12-01"; - name = "yarssr-${version}"; + pname = "yarssr"; src = fetchFromGitHub { owner = "JGRennison"; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 53d427e61c2..dc4f9429eea 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }: stdenv.mkDerivation rec { - name = "yate-${version}"; + pname = "yate"; version = "6.0.0-1"; src = fetchurl { - url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz"; + url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz"; sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa"; }; diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index eb2a0f1c1e1..7c2c8fb31ca 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -2,11 +2,11 @@ , girara, gettext, libarchive }: stdenv.mkDerivation rec { - name = "zathura-cb-${version}"; + pname = "zathura-cb"; version = "0.1.8"; src = fetchurl { - url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz"; sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; }; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 585b4eef9ea..79a277d9835 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "zathura-core-${version}"; + pname = "zathura-core"; version = "0.4.3"; src = fetchurl { diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index f3cacd21236..2ebc640d683 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; - name = "zathura-pdf-mupdf-${version}"; + pname = "zathura-pdf-mupdf"; # pwmt.org server was down at the time of last update # src = fetchurl { diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 30ab053f923..5b38555eda1 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.2.9"; - name = "zathura-pdf-poppler-${version}"; + pname = "zathura-pdf-poppler"; src = fetchurl { - url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${name}.tar.gz"; + url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz"; sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l"; }; diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 05dee5b6154..ce5c7fb41f1 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { - name = "apache-directory-studio-${version}"; + pname = "apache-directory-studio"; version = "2.0.0.v20170904-M13"; src = diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 8b7bc0bb899..31eb4dd7378 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "brig-${version}"; + pname = "brig"; version = "0.4.1"; rev = "v${version}"; diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index 32de4871186..57db827169e 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "arora-${version}"; + pname = "arora"; version = "0.11.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index 0797eea6f3b..c3f5cb13164 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -14,7 +14,7 @@ let in buildGoPackage rec { inherit version; - name = "browsh-${version}"; + pname = "browsh"; goPackagePath = "browsh"; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index eca2bc0d99f..aecebb08e0d 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -99,7 +99,7 @@ let }; flash = stdenv.mkDerivation rec { - name = "flashplayer-ppapi-${version}"; + pname = "flashplayer-ppapi"; version = "32.0.0.223"; src = fetchzip { diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 671ab03a2e2..8d6c99d2468 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { version = "3.0.5"; - name = "dillo-${version}"; + pname = "dillo"; src = fetchurl { - url = "https://www.dillo.org/download/${name}.tar.bz2"; + url = "https://www.dillo.org/download/${pname}-${version}.tar.bz2"; sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"; }; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index c721a61591a..b6b5670ab55 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "falkon-${version}"; + pname = "falkon"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 59ba69c1c4d..f2cc277f3da 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.19"; - name = "links2-${version}"; + pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index d6b775107d0..3f4f96d33ef 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -7,7 +7,7 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { - name = "lynx-${version}"; + pname = "lynx"; version = "2.8.9rel.1"; src = fetchurl { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index 32e4366a4e4..e8841a0ab6f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "bluejeans-${version}"; + pname = "bluejeans"; version = "2.180.71.8"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix index 48d06d644dd..a2585758276 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.12.1.1142"; - name = "esteidfirefoxplugin-${version}"; + pname = "esteidfirefoxplugin"; src = fetchurl { url = "https://installer.id.ee/media/ubuntu/pool/main/e/esteidfirefoxplugin/esteidfirefoxplugin_3.12.1.1142.orig.tar.xz"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 8aa51366e47..04c98881215 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let ""; in stdenv.mkDerivation rec { - name = "flashplayer-${version}"; + pname = "flashplayer"; version = "32.0.0.223"; src = fetchurl { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index c9081ee3d69..e9431866047 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,7 +49,7 @@ }: stdenv.mkDerivation rec { - name = "flashplayer-standalone-${version}"; + pname = "flashplayer-standalone"; version = "32.0.0.223"; src = fetchurl { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 30bae8792c2..101ae99d665 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: stdenv.mkDerivation rec { - name = "fribid-${version}"; + pname = "fribid"; version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "https://fribid.se/releases/source/${name}.tar.bz2"; + url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2"; sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 8a25036c70a..bde4ce15d7c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -46,7 +46,7 @@ let in stdenv.mkDerivation rec { - name = "google-talk-plugin-${version}"; + pname = "google-talk-plugin"; # You can get the upstream version and SHA-1 hash from the following URLs: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1' diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index c6c1d6a334c..fd956f62327 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, firefox, libX11, xorgproto }: stdenv.mkDerivation rec { - name = "mozplugger-${version}"; + pname = "mozplugger"; version = "2.1.6"; src = fetchurl { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { cp mozplugger.so "$out/lib/mozilla/plugins" cp mozplugger.7 "$out/share/man/man7" - mkdir -p "$out/share/${name}/plugin" - ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin" + mkdir -p "$out/share/${pname}-${version}/plugin" + ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin" ''; meta = { diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 1519c382ebb..083383f0ef5 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }: stdenv.mkDerivation rec { - name = "qtchan-${version}"; + pname = "qtchan"; version = "0.100"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 3a7612bb0fb..a4979d3bcf2 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "surf-${version}"; + pname = "surf"; version = "2.0"; src = fetchurl { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 6632b116fc3..8471c0c97c7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -113,7 +113,7 @@ let in stdenv.mkDerivation rec { - name = "tor-browser-bundle-bin-${version}"; + pname = "tor-browser-bundle-bin"; inherit version; src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index dbe4ddca10f..f15bf165e82 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -72,7 +72,7 @@ let ]; in stdenv.mkDerivation rec { - name = "tor-browser-bundle-${version}"; + pname = "tor-browser-bundle"; version = tor-browser-unwrapped.version; buildInputs = [ tor-browser-unwrapped tor ]; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index bddac77d1d6..7356768f397 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -15,7 +15,7 @@ { https-everywhere = stdenv.mkDerivation rec { - name = "https-everywhere-${version}"; + pname = "https-everywhere"; version = "2017.10.4"; extid = "https-everywhere-eff@eff.org"; @@ -46,7 +46,7 @@ }; noscript = stdenv.mkDerivation rec { - name = "noscript-${version}"; + pname = "noscript"; version = "5.1.2"; extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; @@ -64,7 +64,7 @@ }; torbutton = stdenv.mkDerivation rec { - name = "torbutton-${version}"; + pname = "torbutton"; version = "1.9.8.1"; extid = "torbutton@torproject.org"; @@ -87,7 +87,7 @@ }; tor-launcher = stdenv.mkDerivation rec { - name = "tor-launcher-${version}"; + pname = "tor-launcher"; version = "0.2.13"; extid = "tor-launcher@torproject.org"; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 1d08895f1b0..f86c4a84e58 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -5,7 +5,7 @@ # but Python 2 + packages during runtime. stdenv.mkDerivation rec { - name = "uzbl-${version}"; + pname = "uzbl"; version = "0.9.0"; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index cc9bc38bc4d..f82cc3535f2 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "vimb-${version}"; + pname = "vimb"; version = "3.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 678f226816a..8a2e164b363 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.4.2"; - name = "vimprobable2-${version}"; + pname = "vimprobable2"; src = fetchurl { url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2"; sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr"; diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 242abc2ece7..4495fc09579 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "c14-cli-${version}"; + pname = "c14-cli"; version = "0.3"; goPackagePath = "github.com/online-net/c14-cli"; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 3946bf88625..09be379b240 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -21,7 +21,7 @@ let }; in stdenv.mkDerivation rec { - name = "charles-${version}"; + pname = "charles"; inherit version; src = fetchurl { diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 1bc7cea54eb..6712dcd486b 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cloudflared-${version}"; + pname = "cloudflared"; version = "2019.7.0"; goPackagePath = "github.com/cloudflare/cloudflared"; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 647261a138f..92db34417f4 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "argo-${version}"; + pname = "argo"; version = "2.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix index bc9023a222f..78be19cd81e 100644 --- a/pkgs/applications/networking/cluster/chronos/default.nix +++ b/pkgs/applications/networking/cluster/chronos/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }: stdenv.mkDerivation rec { - name = "chronos-${version}"; + pname = "chronos"; version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22"; src = fetchgit { @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,libexec/chronos} - cp target/chronos*.jar $out/libexec/chronos/${name}.jar + cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \ - --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${name}.jar com.airbnb.scheduler.Main" \ + --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \ --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" ''; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 876630c559a..115dc3835fc 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "machine-${version}"; + pname = "machine"; version = "0.16.1"; goPackagePath = "github.com/docker/machine"; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 181663513d3..de122dd2a5a 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: buildGoPackage rec { - name = "docker-machine-kvm-${version}"; + pname = "docker-machine-kvm"; version = "0.10.0"; goPackagePath = "github.com/dhiltgen/docker-machine-kvm"; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index d8fa1a04507..36c26001afc 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -2,7 +2,6 @@ buildGoPackage rec { pname = "docker-machine-kvm2"; - name = "${pname}-${version}"; version = minikube.version; goPackagePath = "k8s.io/minikube"; diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 6b0440eb84a..1c2caff50d5 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }: buildGoPackage rec { - name = "docker-machine-xhyve-${version}"; + pname = "docker-machine-xhyve"; version = "0.3.3"; goPackagePath = "github.com/zchee/docker-machine-driver-xhyve"; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index c116e46684c..b32862bb4d6 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "2.14.2"; - name = "helm-${version}"; + pname = "helm"; src = fetchFromGitHub { owner = "helm"; diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index cd0ef728f83..b9413577b10 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "heptio-ark-${version}"; + pname = "heptio-ark"; version = "0.10.0"; goPackagePath = "github.com/heptio/ark"; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 5eaf1d13d61..7938265d1b8 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "hetzner-kube-${version}"; + pname = "hetzner-kube"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index 6274168b3da..52abc318990 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.2"; - name = "kanif-${version}"; + pname = "kanif"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/26773/${pname}-${version}.tar.gz"; sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879"; }; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 19194c2d087..1a14e1ed273 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kompose-${version}"; + pname = "kompose"; version = "1.18.0"; goPackagePath = "github.com/kubernetes/kompose"; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 1e03efddc06..e38dc355d24 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kontemplate-${version}"; + pname = "kontemplate"; version = "1.7.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 190711e3096..e4adabd7581 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -14,7 +14,7 @@ with lib; stdenv.mkDerivation rec { - name = "kubernetes-${version}"; + pname = "kubernetes"; version = "1.14.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 171ce3d3a54..ab8b7deae72 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lib, ... }: stdenv.mkDerivation rec { - name = "kubetail-${version}"; + pname = "kubetail"; version = "1.6.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 55a827f9cf9..982f36def69 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -22,7 +22,7 @@ let in buildGoPackage rec { - name = "kubeval-${version}"; + pname = "kubeval"; version = "0.7.3"; goPackagePath = "github.com/garethr/kubeval"; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 49cac6d5063..72bd82be6c1 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, jdk, mesos, fetchurl }: stdenv.mkDerivation rec { - name = "marathon-${version}"; + pname = "marathon"; version = "1.4.2"; src = fetchurl { @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,libexec/marathon} - cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar + cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ - --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \ + --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \ --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY" ''; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 8cff2494bf8..0ffc7a1fb6f 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { version = "1.4.1"; - name = "mesos-${version}"; + pname = "mesos"; enableParallelBuilding = true; dontDisableStatic = true; src = fetchurl { - url = "mirror://apache/mesos/${version}/${name}.tar.gz"; + url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz"; sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr"; }; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 5551f635bc3..43e960d9403 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -11,7 +11,7 @@ let openshiftVersion = "v3.11.0"; in buildGoPackage rec { - name = "minishift-${version}"; + pname = "minishift"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index fec737ddb2a..ce7b9beb4f8 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "nomad-${version}"; + pname = "nomad"; version = "0.9.4"; rev = "v${version}"; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index dd57add14af..758786f586a 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -21,7 +21,7 @@ let k8sgitMajor = "0"; k8sgitMinor = "1"; in buildGoPackage rec { - name = "openshift-origin-${version}"; + pname = "openshift-origin"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 618bea36de8..de0bb015852 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "pachyderm-${version}"; + pname = "pachyderm"; version = "1.8.5"; rev = "v${version}"; diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 052797db2f3..0835d268cd7 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "amazon-ssm-agent"; version = "2.0.633.0"; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 3218e6a25b3..8e9e6691a79 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -3,7 +3,7 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoPackage rec { - name = "stern-${version}"; + pname = "stern"; version = "1.11.0"; goPackagePath = "github.com/wercker/stern"; diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index c61896d8921..3423163f590 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "3.7.7"; - name = "taktuk-${version}"; + pname = "taktuk"; buildInputs = [ perl ]; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/33412/${pname}-${version}.tar.gz"; sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr"; }; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 2b39cebbbeb..606cd0370aa 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,6 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "terraform-docs"; version = "0.6.0"; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index dd4a36807ea..1bb8df88d01 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub}: buildGoPackage rec { - name = "terraform-inventory-${version}"; + pname = "terraform-inventory"; version = "0.7-pre"; rev = "v${version}"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix index 2b2c3caba86..bb634a78e23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "terraform-provider-ansible-${version}"; + pname = "terraform-provider-ansible"; version = "1.0.3"; goPackagePath = "github.com/nbering/terraform-provider-ansible"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index ae456185a80..1aadbbc5ccd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { - name = "terraform-provider-elasticsearch-${version}"; + pname = "terraform-provider-elasticsearch"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix index 291698f3065..4571d368991 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "terraform-provider-gandi-${version}"; + pname = "terraform-provider-gandi"; version = "1.0.0"; goPackagePath = "github.com/tiramiseb/terraform-provider-gandi"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix index fddf13795f3..06d7b8a9f07 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix @@ -11,7 +11,7 @@ # buildGoPackage rec { - name = "terraform-provider-ibm-${version}"; + pname = "terraform-provider-ibm"; version = "0.11.1"; goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 96b5c8a0fa1..23c4f4bfa8b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -18,7 +18,7 @@ # https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples buildGoPackage rec { - name = "terraform-provider-libvirt-${version}"; + pname = "terraform-provider-libvirt"; version = "0.5.1"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 56c30df37c5..ddeb5851037 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: buildGoPackage rec { - name = "terragrunt-${version}"; + pname = "terragrunt"; version = "0.17.4"; goPackagePath = "github.com/gruntwork-io/terragrunt"; diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 1ee2c694e0b..6dbc6954ef5 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.7.4"; - name = "corebird-${version}"; + pname = "corebird"; src = fetchFromGitHub { owner = "baedert"; diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 34ebc84cea2..0967fd95dc0 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "drive-${version}"; + pname = "drive"; version = "0.3.8.1"; goPackagePath = "github.com/odeke-em/drive"; diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 62fe4e2e662..c74f5789d84 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "droopy-${version}"; + pname = "droopy"; version = "20160830"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index f89b8206dbe..5b1ab692abd 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "errbot-${version}"; + pname = "errbot"; version = "5.2.0"; src = fetchurl { - url = "mirror://pypi/e/errbot/${name}.tar.gz"; + url = "mirror://pypi/e/errbot/${pname}-${version}.tar.gz"; sha256 = "0q5fg113s3gnym38d4y5mlnxw6vrm388zw5mlapf7b2zgx34r053"; }; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 4d17cc8bddd..67346d45b9f 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -3,7 +3,6 @@ with pythonPackages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "rss2email"; version = "3.9"; # TODO: on next bump, the manpage will be updated. # Update nixos/modules/services/mail/rss2email.nix to point to it instead of @@ -12,7 +11,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; src = fetchurl { - url = "mirror://pypi/r/rss2email/${name}.tar.gz"; + url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; }; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index c1a9fddb3c2..169b88f2718 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "rssguard"; version = "3.5.9"; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 459aee01f43..c0a6185309a 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: stdenv.mkDerivation rec { - name = "rsstail-${version}"; + pname = "rsstail"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 335f393bc07..ab2ca160152 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "firehol-${version}"; + pname = "firehol"; version = "3.1.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index bb245928f07..194dfc25eba 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iprange-${version}"; + pname = "iprange"; version = "1.0.4"; src = fetchurl { diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 25ec5d29613..e1ba71ff2c8 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -5,8 +5,6 @@ stdenv.mkDerivation rec { pname = "taxi"; version = "0.0.1"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index d5ef1d7beaa..f16b6337d71 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gdrive-${version}"; + pname = "gdrive"; version = "2.1.0"; rev = "${version}"; diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 15e0b5a07b4..830eae1fc28 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -2,7 +2,7 @@ , ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { - name = "google-drive-ocamlfuse-${version}"; + pname = "google-drive-ocamlfuse"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix index 9057fda2e60..4fcdf55777a 100644 --- a/pkgs/applications/networking/gopher/gopher/default.nix +++ b/pkgs/applications/networking/gopher/gopher/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "gopher-${version}"; + pname = "gopher"; version = "3.0.11"; src = fetchurl { diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix index d36533fc9e5..45d9235afc9 100644 --- a/pkgs/applications/networking/gopher/gopherclient/default.nix +++ b/pkgs/applications/networking/gopher/gopherclient/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }: buildGoPackage rec { - name = "gopherclient-${version}"; + pname = "gopherclient"; version = "2016-10-02"; rev = "91c41b5542d08001636708e2a5054521a6004702"; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 0fdfbacb45c..88df3857ec1 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { version = "2.9.11.1"; - name = "snort-${version}"; + pname = "snort"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz"; }; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 163f0ba3f49..716989c7b56 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost166 }: stdenv.mkDerivation rec { - name = "SkypeExport-${version}"; + pname = "SkypeExport"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 75e1791644b..f01b8d387f8 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { version = "0.6.3"; - name = "baresip-${version}"; + pname = "baresip"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index e1e851b13bb..5094a13119f 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-discord-${version}"; + pname = "bitlbee-discord"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index d6c8fae2b58..84067dc5f19 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-facebook-${version}"; + pname = "bitlbee-facebook"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index a034827c4ed..798dab2b646 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.4.2"; - name = "bitlbee-steam-${version}"; + pname = "bitlbee-steam"; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index bbdb2ae79f8..001eadbb01d 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -2,7 +2,7 @@ , gnutls, libvpx, makeDesktopItem }: pythonPackages.buildPythonApplication rec { - name = "blink-${version}"; + pname = "blink"; version = "3.0.3"; src = fetchdarcs { diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index d76cebd11b0..21b21e25349 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "bluejeans-${version}"; + pname = "bluejeans"; version = "1.36.9"; src = diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 350d09078c4..daffb539676 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "5.0.1"; - name = "centerim5-${version}"; + pname = "centerim5"; src = fetchurl { - url = "http://centerim.org/download/cim5/${name}.tar.gz"; + url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz"; sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk"; }; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index fb47d8db8c8..3186009db58 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -2,7 +2,7 @@ cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { - name = "coyim-${version}"; + pname = "coyim"; version = "0.3.11"; goPackagePath = "github.com/coyim/coyim"; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 2c27853c944..cc0bdf60394 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "freetalk-${version}"; + pname = "freetalk"; version = "4.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 6878c9a870b..57b745057dc 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -20,7 +20,6 @@ let gitterDirectorySuffix = "opt/gitter"; in stdenv.mkDerivation rec { pname = "gitter"; version = "4.1.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 689445d7dcb..e97db0b5312 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { version = "2018-05-11"; - name = "jackline-${version}"; + pname = "jackline"; src = fetchFromGitHub { owner = "hannesm"; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 820a742245e..04a31ba403a 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "jitsi-${version}"; + pname = "jitsi"; version = "2.10.5550"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 1fb74314811..6f4e7e5b677 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -37,18 +37,18 @@ let in stdenv.mkDerivation rec { - name = "mattermost-desktop-${version}"; + pname = "mattermost-desktop"; version = "4.2.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80"; } else diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index d86d62021fb..f4111123711 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mcabber-${version}"; + pname = "mcabber"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index ea190db07a6..3e2718c9c57 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -18,7 +18,7 @@ # rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix' stdenv.mkDerivation rec { - name = "mikutter-${version}"; + pname = "mikutter"; version = "3.8.7"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index a75835b3c7e..7b76154021a 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { - name = "mm-${version}"; + pname = "mm"; version = "2016.11.04"; goPackagePath = "gitlab.com/meutraa/mm"; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index d337c62ea09..f214f722143 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -22,7 +22,7 @@ let }; in mkDerivation rec { - name = "nheko-${version}"; + pname = "nheko"; version = "0.6.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 64443461e37..ff260c9161b 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -2,7 +2,7 @@ fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "oysttyer-${version}"; + pname = "oysttyer"; version = "2.10.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 60fd5af0a1a..079fc7d57fb 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -1,7 +1,7 @@ { stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : stdenv.mkDerivation rec { - name = "pidgin-carbons-${version}"; + pname = "pidgin-carbons"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 7e86a390edc..34755809e39 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { - name = "pidgin-opensteamworks-${version}"; + pname = "pidgin-opensteamworks"; version = "unstable-2018-08-02"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index f407ed6cabe..c418b2e992a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { - name = "pidgin-skypeweb-${version}"; + pname = "pidgin-skypeweb"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index ba1d64c8b92..1e998bcc806 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { - name = "purple-discord-${version}"; + pname = "purple-discord"; version = "unstable-2018-04-10"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 61e8c2b58d9..d226490b275 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation rec { - name = "purple-hangouts-hg-${version}"; + pname = "purple-hangouts-hg"; version = "2018-12-02"; src = fetchhg { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index bcfcbee8556..e488ae73be0 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: stdenv.mkDerivation rec { - name = "purple-lurch-${version}"; + pname = "purple-lurch"; version = "0.6.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 6d75ba40ce0..41f205514e7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: stdenv.mkDerivation rec { - name = "tox-prpl-${version}"; + pname = "tox-prpl"; version = "0.5.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index dfdc92cfd4b..8f86256069c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pidgin } : stdenv.mkDerivation rec { - name = "pidgin-window-merge-${version}"; + pname = "pidgin-window-merge"; version = "0.3"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 8b6863384b3..71168e1a692 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -13,12 +13,12 @@ # FIXME: clean the mess around choosing the SSL library (nss by default) let unwrapped = stdenv.mkDerivation rec { - name = "pidgin-${version}"; + pname = "pidgin"; majorVersion = "2"; version = "${majorVersion}.13.0"; src = fetchurl { - url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; + url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; }; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index e7527bafcc6..1ddc603dc62 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -5,7 +5,7 @@ let gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { - name = "pond-${version}"; + pname = "pond"; version = "20150830-${stdenv.lib.strings.substring 0 7 rev}"; rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 79a197d1a7a..bd88962c40d 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,7 +21,7 @@ assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "profanity-${version}"; + pname = "profanity"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index e1a2fb40c5a..b77407bd0c8 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "psi-plus-${version}"; + pname = "psi-plus"; version = "1.4.504"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 60a4dd39fb0..a23dbda6cb2 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -2,7 +2,7 @@ , auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { - name = "rambox-bare-${version}"; + pname = "rambox-bare"; version = "0.6.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index efecebe169e..97c722f0935 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sencha-bare-${version}"; + pname = "sencha-bare"; src = srcs.${stdenv.hostPlatform.system}; nativeBuildInputs = [ gzip which unzip ]; diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index a6aef5e6a2f..96ce9c32a7d 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ricochet-${version}"; + pname = "ricochet"; version = "1.1.4"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 168719bf0e4..8dc053631e9 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -79,7 +79,7 @@ let }); in stdenv.mkDerivation rec { - name = "ring-daemon-${version}"; + pname = "ring-daemon"; version = "2017-07-11"; inherit src; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index 0546d2dae47..d1f1c033361 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "restbed-${version}"; + pname = "restbed"; version = "2016-09-15"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 9a2e2df80f2..ba0f8c48fbd 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -4,7 +4,7 @@ # Versions of `riot-web` and `riot-desktop` should be kept in sync. stdenv.mkDerivation rec { - name= "riot-web-${version}"; + pname = "riot-web"; version = "1.3.0"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 3336c05aae7..010ea1bff7c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - name = "signal-cli-${version}"; + pname = "signal-cli"; version = "0.6.2"; # Building from source would be preferred, but is much more involved. diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 381d66c678e..d37cebd6ef9 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,7 +56,7 @@ let ]; in stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; + pname = "signal-desktop"; version = "1.26.0"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index cf6031aa05b..cdc176be65b 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version_major = "2.1.7369"; version_minor = "1"; version = version_major + "." + version_minor; - name = "sky-${version}"; + pname = "sky"; unpackCmd = "ar x $curSrc; tar -xf data.tar.xz"; src = fetchurl { url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb"; diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 79464f54232..6271e338a96 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { # https://github.com/erroneousboat/slack-term - name = "slack-term-${version}"; + pname = "slack-term"; version = "0.4.1"; goPackagePath = "github.com/erroneousboat/slack-term"; diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index c24e2c4301e..58cc7a220b9 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "e2a6a9cd9da70175881ab991220c86aa87179509"; version = "2019-07-26"; - name = "slack-theme-black-${version}"; + pname = "slack-theme-black"; src = fetchgit { inherit rev; url = "https://github.com/laCour/slack-night-mode"; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 17a38479f82..7a9ab4d127c 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation rec { version = "1.17.82"; - name = "stride-${version}"; + pname = "stride"; src = fetchurl { url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 51e7f081d1e..db1d0a54dce 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swift-im-${version}"; + pname = "swift-im"; version = "4.0.2"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 21b9510a605..3c532fa506a 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { - name = "teamspeak-client-${version}"; + pname = "teamspeak-client"; version = "3.3.0"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 4f9bbe021d1..ce7f47fe4ff 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -7,7 +7,7 @@ with lib; mkDerivation rec { - name = "telegram-desktop-${version}"; + pname = "telegram-desktop"; version = "1.8.0"; # Telegram-Desktop with submodules diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 4607961cdf0..3368ec1124e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "telepathy-idle"; version = "0.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index c6b930fc590..11845ecfb26 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -4,7 +4,7 @@ # should use that stdenv.mkDerivation rec { - name = "tensor-git-${version}"; + pname = "tensor-git"; version = "2017-02-21"; src = fetchgit { diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 06bcd7a0400..edfec97edf8 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }: stdenv.mkDerivation rec { - name = "torchat-${version}"; + pname = "torchat"; version = "0.9.9.553"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 95879fef05a..540aa3fcea4 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -3,7 +3,7 @@ , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { - name = "toxic-${version}"; + pname = "toxic"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 349a1363259..5ef0d916242 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -3,7 +3,7 @@ , libXrender, fontconfig, libXext, libXft, libsodium, libopus }: stdenv.mkDerivation rec { - name = "utox-${version}"; + pname = "utox"; version = "0.17.0"; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 109566b5d07..cd5109320c7 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -4,7 +4,7 @@ , xz, zlib }: stdenv.mkDerivation rec { - name = "vacuum-im-${version}"; + pname = "vacuum-im"; version = "1.3.0.20160104"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index a4bf26a0b1a..b0824c78022 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "viber-${version}"; + pname = "viber"; version = "7.0.0.1035"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 980d21572cc..4047eba1fbb 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "xmpp-client-${version}"; + pname = "xmpp-client"; version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 3719a69138c..3a2b32f0117 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "insync-${version}"; + pname = "insync"; version = "1.5.7.37371"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n"; } else - throw "${name} is not supported on ${stdenv.hostPlatform.system}"; + throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 870e40d8128..426619908d6 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }: buildGoPackage rec { - name = "ipfs-cluster-${version}"; + pname = "ipfs-cluster"; version = "0.9.0"; rev = "v${version}"; @@ -9,7 +9,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { - inherit name src; + inherit src;name = "${pname}-${version}"; sha256 = "1k7xcirvi07p5g9gr9jcx5h39wk7jxfsyjrn5yraa8xdqhn6b6nx"; }) ]; diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index f070c510937..39631bfc5c8 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "ipfs-migrator-${version}"; + pname = "ipfs-migrator"; version = "7"; goPackagePath = "github.com/ipfs/fs-repo-migrations"; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 45835248d0d..9f206a8f48f 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: buildGoPackage rec { - name = "ipget-${version}"; + pname = "ipget"; version = "0.3.2"; rev = "v${version}"; @@ -9,7 +9,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { - inherit name src; + inherit src;name = "${pname}-${version}"; sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8"; }) ]; diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix index 746d79805f5..cdece4eb644 100644 --- a/pkgs/applications/networking/iptraf-ng/default.nix +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.1.4"; - name = "iptraf-ng-${version}"; + pname = "iptraf-ng"; src = fetchurl { - url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz"; + url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz"; sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; }; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 7c40a4e12a6..0792aefe25f 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: stdenv.mkDerivation rec { - name = "bip-${version}"; + pname = "bip"; version = "0.8.9"; # fetch sources from debian, because the creator's website provides diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 917de745d27..8278f90d321 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,7 +1,7 @@ { fetchgit, libcommuni, qtbase, qmake, stdenv }: stdenv.mkDerivation rec { - name = "communi-${version}"; + pname = "communi"; version = "3.5.0"; src = fetchgit { diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 0b52515228b..a90446a87fa 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: stdenv.mkDerivation rec { - name = "epic5-${version}"; + pname = "epic5"; version = "2.0.1"; src = fetchurl { - url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz"; + url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz"; sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; }; diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix index 8c5d2ffa35e..8bdb23d50dd 100644 --- a/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "glowing-bear-${version}"; + pname = "glowing-bear"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 34c4fcf0c88..b3e77a145bc 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.12.4"; - name = "hexchat-${version}"; + pname = "hexchat"; src = fetchFromGitHub { owner = "hexchat"; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 347b7b28ca9..2840d85bddd 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "irssi-${version}"; + pname = "irssi"; src = fetchurl { - url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx"; }; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index add4fa632c9..6f7cd2cda8b 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "irssi-otr-${version}"; + pname = "irssi-otr"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index cf72bef62b1..b081a6b3672 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sic-${version}"; + pname = "sic"; version = "1.2"; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 5ae96d03f7c..3f8ad762218 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,7 +28,7 @@ let assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { version = "2.5"; - name = "weechat-${version}"; + pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index de7974d4cbe..49616671507 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { - name = "wee-slack-${version}"; + pname = "wee-slack"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index add52d85d8b..6d9acdb68e5 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -4,7 +4,7 @@ with stdenv; with stdenv.lib; mkDerivation rec { - name = "wraith-${version}"; + pname = "wraith"; version = "1.4.7"; src = fetchurl { url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 34f332b003c..3f626a6ac48 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "jmeter-${version}"; + pname = "jmeter"; version = "5.1.1"; src = fetchurl { - url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; + url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4"; }; diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 8967a5d824a..e2a8a2d56bd 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "jnetmap-${version}"; + pname = "jnetmap"; version = "0.5.4"; src = fetchurl { diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 14ee8095247..daddf6adf7e 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "linssid-${version}"; + pname = "linssid"; version = "2.7"; src = fetchurl { diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index bb62014c77a..1417a8c7b1b 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -4,11 +4,11 @@ # NOTE: Please check if any changes here are applicable to ../realpine/ as well stdenv.mkDerivation rec { - name = "alpine-${version}"; + pname = "alpine"; version = "2.21"; src = fetchurl { - url = "http://alpine.freeiz.com/alpine/release/src/${name}.tar.xz"; + url = "http://alpine.freeiz.com/alpine/release/src/${pname}-${version}.tar.xz"; sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30"; }; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index db3cd7782e8..15f707e06a2 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "balsa-${version}"; + pname = "balsa"; version = "2.5.7"; src = fetchurl { - url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; + url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2"; sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx"; }; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index bb4c6c54f16..d7df94f7e67 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -30,7 +30,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "claws-mail-${version}"; + pname = "claws-mail"; version = "3.17.4"; src = fetchurl { diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index e5a919af2e6..78b1aad03fb 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, lua, pcre }: stdenv.mkDerivation rec { - name = "imapfilter-${version}"; + pname = "imapfilter"; version = "2.6.12"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index 4139b650fb7..189ac1e6aae 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -3,7 +3,7 @@ , fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: stdenv.mkDerivation rec { - name = "inboxer-${version}"; + pname = "inboxer"; version = "1.2.1"; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index 05e78485655..ffa3e92d390 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mailcheck-${version}"; + pname = "mailcheck"; version = "1.91.2"; patches = [ ./mailcheck-Makefile.patch ]; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index d8151340662..4cbaee4488b 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -9,7 +9,7 @@ let inherit (pythonPackages) python; in pythonPackages.buildPythonApplication rec { - name = "mailnag-${version}"; + pname = "mailnag"; version = "1.3.0"; src = fetchurl { diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index f00ec6e6566..6c3b3a69b1d 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, libiconv }: stdenv.mkDerivation rec { - name = "mblaze-${version}"; + pname = "mblaze"; version = "0.5.1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index f259fdebf22..c694398bd7d 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -26,11 +26,11 @@ assert gpgmeSupport -> gpgme != null && openssl != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "mutt-${version}"; + pname = "mutt"; version = "1.12.1"; src = fetchurl { - url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; + url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81"; }; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index f4b0846b98f..615b810d002 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20180716"; - name = "neomutt-${version}"; + pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index 3e235400498..b87728dd2cd 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "notbit-${version}"; + pname = "notbit"; version = "2018-01-09"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index e2b56f3b8af..2ee071fec57 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: stdenv.mkDerivation rec { - name = "notmuch-bower-${version}"; + pname = "notmuch-bower"; version = "0.10"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9ddedac0974..f6e6a8d747e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -13,15 +13,15 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.28.4"; # not really, git - name = "notmuch-${version}"; + pname = "notmuch"; passthru = { - pythonSourceRoot = "${name}/bindings/python"; + pythonSourceRoot = "${pname}-${version}/bindings/python"; inherit version; }; src = fetchurl { - url = "https://notmuchmail.org/releases/${name}.tar.gz"; + url = "https://notmuchmail.org/releases/${pname}-${version}.tar.gz"; sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds"; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index e25dfe834f6..a0dbf98f276 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { version = "5"; - name = "muchsync-${version}"; + pname = "muchsync"; passthru = { inherit version; }; src = fetchurl { - url = "http://www.muchsync.org/src/${name}.tar.gz"; + url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz"; sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 410e5e10ceb..7382b97ba81 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -1,7 +1,7 @@ { stdenv, lib, perl, perlPackages, makeWrapper, coreutils, notmuch }: stdenv.mkDerivation rec { - name = "notmuch-mutt-${version}"; + pname = "notmuch-mutt"; version = notmuch.version; outputs = [ "out" ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 70f74dff309..986ee5fe3c9 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -7,11 +7,11 @@ assert sslSupport -> openssl != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "sylpheed-${version}"; + pname = "sylpheed"; version = "3.7.0"; src = fetchurl { - url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${pname}-${version}.tar.xz"; sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6921279b27f..da817731e07 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -23,7 +23,7 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { - name = "thunderbird-${version}"; + pname = "thunderbird"; version = "60.8.0"; src = fetchurl { diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 2d96d033613..7f7296cd700 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -8,11 +8,11 @@ }: mkDerivation rec { - name = "trojita-${version}"; + pname = "trojita"; version = "0.7"; src = fetchurl { - url = "mirror://sourceforge/trojita/trojita/${name}.tar.xz"; + url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz"; sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0"; }; diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index d31f98ef4ba..2e61753346d 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }: stdenv.mkDerivation rec { - name = "modem-manager-gui-${version}"; + pname = "modem-manager-gui"; version = "0.0.19.1"; src = fetchhg { diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 44355c2c181..5792aadf568 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gzip }: stdenv.mkDerivation rec { - name = "ndppd-${version}"; + pname = "ndppd"; version = "0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index b89173820ee..b3001c96057 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,7 +1,7 @@ { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netperf-${version}"; + pname = "netperf"; version = "20180613"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 898b7706bd6..002f142a53e 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "quiterss-${version}"; + pname = "quiterss"; version = "0.18.12"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 37eb248fb48..828ffc1664c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "nextcloud-client-${version}"; + pname = "nextcloud-client"; version = "2.5.2"; src = fetchgit { diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index 2c16fabc5c4..16cc0e3d50a 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.7.4"; - name = "nload-${version}"; + pname = "nload"; src = fetchurl { - url = "http://www.roland-riegel.de/nload/${name}.tar.gz"; + url = "http://www.roland-riegel.de/nload/${pname}-${version}.tar.gz"; sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61"; }; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 8795f32e829..58e1fffdbda 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: stdenv.mkDerivation rec { - name = "nntp-proxy-${version}"; + pname = "nntp-proxy"; version = "2014-01-06"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix index 1e127c1b1ec..dc52d767438 100644 --- a/pkgs/applications/networking/omping/default.nix +++ b/pkgs/applications/networking/omping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { - name = "omping-${version}"; + pname = "omping"; version = "0.0.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 962f10a99c0..3f48601d96f 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ostinato-${version}"; + pname = "ostinato"; version = "0.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 9ed532acfe1..4dad5f4d6bd 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, mandoc }: stdenv.mkDerivation rec { - name = "owamp-${version}"; + pname = "owamp"; version = "3.5.6"; buildInputs = [ autoconf automake mandoc ]; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 8ced53c972b..7907365a6a3 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: stdenv.mkDerivation rec { - name = "owncloud-client-${version}"; + pname = "owncloud-client"; version = "2.5.4.11654"; src = fetchurl { diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index f58f7e04e00..6e3b8a7293e 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "deluge-${version}"; + pname = "deluge"; version = "1.3.15"; src = fetchurl { - url = "http://download.deluge-torrent.org/source/${name}.tar.bz2"; + url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2"; sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; }; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index db30da82bdb..77aee30d38b 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -2,7 +2,7 @@ , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { - name = "eiskaltdcpp-${version}"; + pname = "eiskaltdcpp"; version = "2.2.10"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 1d98bf77675..5488baddef4 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "6.7.4"; - name = "frostwire-${version}"; + pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index c66c3ca05a4..6dd2fc34355 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "ktorrent-${version}"; + pname = "ktorrent"; version = "${libktorrent.mainVersion}.0"; src = fetchurl { - url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${name}.tar.xz"; + url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw"; }; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 7f229be1b54..b28074a2fd6 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: stdenv.mkDerivation rec { - name = "ncdc-${version}"; + pname = "ncdc"; version = "1.22.1"; src = fetchurl { diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 7ffd79edba4..a579ae15181 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -9,7 +9,7 @@ assert guiSupport -> (dbus != null); with lib; mkDerivation rec { - name = "qbittorrent-${version}"; + pname = "qbittorrent"; version = "4.1.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 2d523cc07dd..f10714031ff 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -3,7 +3,7 @@ , qtmultimedia, qtx11extras, qttools }: stdenv.mkDerivation rec { - name = "retroshare-${version}"; + pname = "retroshare"; version = "0.6.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 104131e4775..bcfe8f01e4a 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { - name = "soulseekqt-${version}"; + pname = "soulseekqt"; inherit version; src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 87b331adf2d..850fc488bf3 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }: stdenv.mkDerivation rec { - name = "tixati-${version}"; + pname = "tixati"; version = "2.62"; src = fetchurl { diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix index fc803fa2745..e05ca43eb50 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - name = "transmission-remote-cli-${version}"; + pname = "transmission-remote-cli"; version = "1.7.1"; src = fetchurl { diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 7d2f34c591e..bcaea5eb6dc 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "transmission-remote-gtk-${version}"; + pname = "transmission-remote-gtk"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 29ec8158099..65abcf35a35 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -2,7 +2,7 @@ , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { - name = "tribler-${version}"; + pname = "tribler"; version = "7.1.2"; src = fetchurl { diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index cce44521a62..647b708e102 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -16,7 +16,7 @@ let boostPython = boost.override { enablePython = true; }; in stdenv.mkDerivation rec { - name = "twister-${version}"; + pname = "twister"; version = "0.9.34"; src = fetchurl { diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index 8725d5263fe..b1d3c73129a 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }: stdenv.mkDerivation rec { - name = "vuze-${version}"; + pname = "vuze"; version = "5750"; src = fetchsvn { diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 8a66c039b5a..c9df5d3fbe3 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, libsamplerate, alsaLib }: stdenv.mkDerivation rec { - name = "pjsip-${version}"; + pname = "pjsip"; version = "2.9"; src = fetchurl { @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua - mkdir -p $out/share/${name}/samples - cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples + mkdir -p $out/share/${pname}-${version}/samples + cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index 5b292fe7bec..be4cc5830d5 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "unstable-2018-10-18"; - name = "ps2client-${version}"; + pname = "ps2client"; src = fetchFromGitHub { owner = "ps2dev"; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 66edc203276..5255b492ec6 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -26,11 +26,11 @@ let }; in stdenv.mkDerivation rec { - name = "anydesk-${version}"; + pname = "anydesk"; version = "4.0.1"; src = fetchurl { - url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz"; + url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz"; inherit sha256; }; diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 1f70cb56b54..9627fef7597 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -65,7 +65,7 @@ let citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }: stdenv.mkDerivation rec { - name = "citrix-receiver-${version}"; + pname = "citrix-receiver"; version = "${major}.${minor}.${patch}"; inherit homepage; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index 745ad7a9c5d..faab83e9492 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -69,7 +69,7 @@ let citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: stdenv.mkDerivation rec { - name = "citrix-workspace-${version}"; + pname = "citrix-workspace"; version = "${major}.${minor}.${patch}"; inherit homepage; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 0653686c650..5963c6b6c95 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "freerdp-${version}"; + pname = "freerdp"; version = "2.0.0-rc4"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index fdd367f97c0..3b7db7075bb 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { version = "0.71"; - name = "putty-${version}"; + pname = "putty"; src = fetchurl { urls = [ - "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz" - "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz" + "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" + "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg"; }; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 5f737cacb46..9c9abe55daa 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; version = "1.8.6"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 99835627f87..f85f6cbb7ba 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -2,11 +2,11 @@ , libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }: stdenv.mkDerivation rec { - name = "ssvnc-${version}"; + pname = "ssvnc"; version = "1.0.29"; src = fetchurl { - url = "mirror://sourceforge/ssvnc/${name}.src.tar.gz"; + url = "mirror://sourceforge/ssvnc/${pname}-${version}.src.tar.gz"; sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d"; }; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 949c85bf942..c265d9356e1 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "teamviewer-${version}"; + pname = "teamviewer"; version = "14.4.2669"; src = fetchurl { diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 442881398f6..5d33f186df7 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -2,7 +2,7 @@ let xorgxrdp = stdenv.mkDerivation rec { - name = "xorgxrdp-${version}"; + pname = "xorgxrdp"; version = "0.2.9"; src = fetchFromGitHub { @@ -35,7 +35,7 @@ let xrdp = stdenv.mkDerivation rec { version = "0.9.9"; - name = "xrdp-${version}"; + pname = "xrdp"; src = fetchFromGitHub { owner = "volth"; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 1844711066b..ecce7172def 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -8,7 +8,7 @@ let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { - name = "resilio-sync-${version}"; + pname = "resilio-sync"; version = "2.6.3"; src = fetchurl { diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 543afc696ea..1b12dde85db 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "6.2.11"; - name = "seafile-client-${version}"; + pname = "seafile-client"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index 69ae40b7618..dc578dccd19 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "sieve-connect-${version}"; + pname = "sieve-connect"; version = "0.90"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 13d536ccf1b..2881f3b5377 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -3,7 +3,7 @@ , fetchpatch }: stdenv.mkDerivation rec { - name = "ettercap-${version}"; + pname = "ettercap"; version = "0.8.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 0c793c41c55..0005a5d230d 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }: stdenv.mkDerivation rec { - name = "kismet-${version}"; + pname = "kismet"; version = "2016-07-R1"; src = fetchurl { - url = "https://www.kismetwireless.net/code/${name}.tar.xz"; + url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; }; diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index 10bb465b8a1..301802d322b 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: stdenv.mkDerivation rec { - name = "sniproxy-${version}"; + pname = "sniproxy"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 1034acf0b90..9de525d9324 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, writeText, jdk, maven, makeWrapper }: stdenv.mkDerivation rec { - name = "soapui-${version}"; + pname = "soapui"; version = "5.5.0"; src = fetchurl { diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix index 706dd670324..c70723284fd 100644 --- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.12.0"; - name = "patchwork-classic-${version}"; + pname = "patchwork-classic"; src = fetchurl { url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index e4ba29d3a9f..669ab4d1e3e 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -3,7 +3,6 @@ , fusepy, sqlalchemy }: buildPythonApplication rec { - name = pname + "-" + version; pname = "acd_cli"; version = "0.3.2"; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index fae838a7d5f..36c4dd46222 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { version = "1.1.24"; - name = "backintime-common-${version}"; + pname = "backintime-common"; src = fetchFromGitHub { owner = "bit-team"; diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index 26288f9f6e6..fb47d9bc510 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (backintime-common) version src installFlags; - name = "backintime-qt4-${version}"; + pname = "backintime-qt4"; buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 8d9b941e26e..1eb5e44ba24 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "casync-${version}"; + pname = "casync"; version = "2-152-ge4a3c5e"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 6dcd451533a..d38f8b53dbb 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "desync-${version}"; + pname = "desync"; version = "0.4.0"; rev = "v${version}"; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index b0315ee3477..832f7c63f27 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { - name = "lsyncd-${version}"; + pname = "lsyncd"; version = "2.2.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix index 4325c8ea88a..00edcd411fd 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { - name = "rclone-browser-${version}"; + pname = "rclone-browser"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index ad5a35eb251..bc93b743f8b 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation (rec { - name = "unison-${version}"; + pname = "unison"; version = "2.51.2"; src = fetchFromGitHub { owner = "bcpierce00"; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 763c740c817..3e5d3187e9b 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }: buildPythonApplication rec { - name = "syncplay-${version}"; + pname = "syncplay"; version = "1.6.4"; format = "other"; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 328561529ce..9317ccab4ea 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { version = "0.9.4"; - name = "syncthing-gtk-${version}"; + pname = "syncthing-gtk"; src = fetchFromGitHub { owner = "syncthing"; diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix index 050c8502e07..6f5a3f3ec16 100644 --- a/pkgs/applications/networking/tsung/default.nix +++ b/pkgs/applications/networking/tsung/default.nix @@ -5,7 +5,7 @@ gnuplot }: stdenv.mkDerivation rec { - name = "tsung-${version}"; + pname = "tsung"; version = "1.7.0"; src = fetchurl { url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz"; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index a1fe790b119..1a19c8c96b3 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, openssl, protobufc, libconfig }: stdenv.mkDerivation rec { - name = "umurmur-${version}"; + pname = "umurmur"; version = "0.2.17"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 08fa53a6e38..238864311ef 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "znc-${version}"; + pname = "znc"; version = "1.7.4"; src = fetchurl { - url = "https://znc.in/releases/archive/${name}.tar.gz"; + url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi"; }; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 6808a81bec1..a2b14443c1a 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "abiword-${version}"; + pname = "abiword"; version = "3.0.2"; src = fetchurl { - url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; + url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz"; sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; }; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 91b12d8a33c..6ef6e51527e 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, jre }: stdenv.mkDerivation rec { - name = "atlassian-cli-${version}"; + pname = "atlassian-cli"; version = "8.5.0"; src = fetchzip { - url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; + url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; sha256 = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 4a050eb5d74..4855fbc63c3 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -16,10 +16,9 @@ mkDerivation rec { pname = "calligra"; version = "3.1.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 461d428787b..0043648146f 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "cb2bib"; version = "2.0.0"; src = fetchurl { - url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; + url = "https://www.molspaces.com/dl/progs/${pname}-${version}.tar.gz"; sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index e4a89b513e9..d3ab02fabd3 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { - name = "gnucash-${version}"; + pname = "gnucash"; version = "3.6"; src = fetchurl { - url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; + url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi"; }; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { rm $out/bin/gnucash-valgrind wrapProgram "$out/bin/gnucash" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \ --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --prefix PERL5LIB ":" "$PERL5LIB" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 338cdc17065..752ad70cd09 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -2,11 +2,11 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "grisbi-${version}"; + pname = "grisbi"; version = "1.2.1"; src = fetchurl { - url = "mirror://sourceforge/grisbi/${name}.tar.bz2"; + url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; sha1 = "1159c5491967fa7afd251783013579ffb45b891b"; }; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index b39617e02db..372414c1a76 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.14.0"; - name = "ib-controller-${version}"; + pname = "ib-controller"; src = fetchurl { url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz"; diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index 59ecb5a5c3b..a88f1af02c6 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "9542"; - name = "ib-tws-${version}"; + pname = "ib-tws"; src = requireFile rec { name = "ibtws_${version}.jar"; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index ebd5a14ad04..b249186c2f1 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.8.1"; - name = "jabref-${version}"; + pname = "jabref"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar"; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index e28a2d0852b..adad5c8680f 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -10,10 +10,9 @@ mkDerivation rec { pname = "kexi"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1zy1q7q9rfdaws3rwf3my22ywkn6g747s3ixfcg9r80mm2g3z0bs"; }; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 363c484fa28..0cb23abea66 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "kmymoney-${version}"; + pname = "kmymoney"; version = "5.0.5"; src = fetchurl { - url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977"; }; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 276134efd73..99e09a8f36f 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -2,7 +2,7 @@ , texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { - name = "ledger-${version}"; + pname = "ledger"; version = "3.1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index cdda46d4837..7c054ba5204 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: stdenv.mkDerivation rec { - name = "marp-${version}"; + pname = "marp"; version = "0.0.14"; src = fetchurl { diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 3e666b0f627..6b4a3869af9 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation rec { - name = "moneyplex-${version}"; + pname = "moneyplex"; version = "16.0.22424"; src = fetchurl (if stdenv.hostPlatform.system == "i686-linux" then src_i686 diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 20f8b428f0d..b1311428c61 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -2,11 +2,11 @@ , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "osmo-${version}"; + pname = "osmo"; version = "0.4.2"; src = fetchurl { - url = "mirror://sourceforge/osmo-pim/${name}.tar.gz"; + url = "mirror://sourceforge/osmo-pim/${pname}-${version}.tar.gz"; sha256 = "1gjd4w9jckfpqr9n0bw0w25h3qhfyzw1xvilh3hqdadfinwyal2v"; }; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index f1dd10e9420..af2fd82ddb0 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -33,7 +33,7 @@ let paperless = stdenv.mkDerivation rec { - name = "paperless-${version}"; + pname = "paperless"; version = "2.7.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 7e6da96db80..14756c3557f 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -2,10 +2,10 @@ , gdk-pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { - name = "pinpoint-${version}"; + pname = "pinpoint"; version = "0.1.8"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index ecd38627ac5..42fddb972c9 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { - name = "skrooge-${version}"; + pname = "skrooge"; version = "2.20.0"; src = fetchurl { - url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; + url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w"; }; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index a69fb7a1c6c..450ee34262b 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -6,7 +6,6 @@ in buildPythonApplication rec { pname = "todoman"; version = "3.5.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 951b61e43ef..000fa7ff101 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, wxGTK, makeWrapper }: stdenv.mkDerivation rec { - name = "treesheets-${version}"; + pname = "treesheets"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index c1e2fdcc7df..877dfba88c0 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation rec { - name = "trilium-${version}"; + pname = "trilium"; version = "0.33.6"; src = fetchurl { diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index 89a3d128796..a4734f45460 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "tudu-${version}"; + pname = "tudu"; version = "0.10.3"; src = fetchurl { - url = "https://code.meskio.net/tudu/${name}.tar.gz"; + url = "https://code.meskio.net/tudu/${pname}-${version}.tar.gz"; sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y"; }; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 4271e3d17aa..3e4ca0ae975 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -2,7 +2,7 @@ , lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { - name = "wordgrinder-${version}"; + pname = "wordgrinder"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index f8785616c5e..6f4f9c43b0f 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -10,7 +10,6 @@ mkDerivation rec { pname = "zanshin"; version = "2017-11-25"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "KDE"; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 3d4f98ddd44..70e5f82694d 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -33,7 +33,7 @@ }: stdenv.mkDerivation rec { - name = "zotero-${version}"; + pname = "zotero"; version = "5.0.71"; src = fetchurl { diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 07bf0a542fa..14badd6c55c 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -2,7 +2,7 @@ pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }: stdenv.mkDerivation rec { - name = "cubicsdr-${version}"; + pname = "cubicsdr"; version = "0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index 7125e37f7f9..f718854224c 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -2,7 +2,7 @@ , libusb1, systemd }: stdenv.mkDerivation rec { - name = "dmrconfig-${version}"; + pname = "dmrconfig"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index 713755d8a65..49149a2d82a 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { version = "1.2.6"; pname = "fllog"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg"; }; diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index b96f3c2b327..6bdab0a925d 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { version = "1.3.5"; pname = "flwrap"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg"; }; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 747015d80ee..ba37b7ecad2 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -19,7 +19,7 @@ }: stdenv.mkDerivation rec { - name = "gnss-sdr-${version}"; + pname = "gnss-sdr"; version = "0.0.11"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 7c6db61b529..6b23858aee4 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-ais-${version}"; + pname = "gr-ais"; version = "2015-12-20"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index f9a50313c47..016540c1e67 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -25,7 +25,7 @@ }: stdenv.mkDerivation rec { - name = "gnuradio-${version}"; + pname = "gnuradio"; version = "3.7.13.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 119b7f7600f..80583c0ff3b 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-gsm-${version}"; + pname = "gr-gsm"; version = "2016-08-25"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index c3c8721be25..d357db91344 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-nacl-${version}"; + pname = "gr-nacl"; version = "2017-04-10"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index df2a88033c4..b8cc60544c9 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -13,7 +13,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-osmosdr-${version}"; + pname = "gr-osmosdr"; version = "2018-08-15"; src = fetchgit { diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index b56e0d22687..e4a55fe5098 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-rds-${version}"; + pname = "gr-rds"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index cd5f8b0db9e..03acf9e1135 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -8,7 +8,7 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { - name = "gqrx-${version}"; + pname = "gqrx"; version = "2.11.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 81a66bf503c..09b4c84c131 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }: stdenv.mkDerivation rec { - name = "hackrf-${version}"; + pname = "hackrf"; version = "2018.01.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index 8d179e8eed1..55cd14cf70d 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { version = "0.24-1"; pname = "minimodem"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "kamalmostafa"; diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index c8401cdbf49..db1bfbb3f89 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "9.2.6"; - name = "qsstv-${version}"; + pname = "qsstv"; src = fetchurl { url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index a4d5b2cad1e..4e9badaa6c5 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "rtl-sdr-${version}"; + pname = "rtl-sdr"; version = "0.6.0"; src = fetchgit { diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 88dc64471ec..a06ac2d7a03 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "18.12"; - name = "rtl_433-${version}"; + pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 2aeba5fb5f4..fe31fd133e7 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: stdenv.mkDerivation rec { - name = "unixcw-${version}"; + pname = "unixcw"; version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz"; diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 212f93fb093..e802f0d84c4 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -3,7 +3,7 @@ qtmultimedia, qtserialport, qttools, texinfo }: stdenv.mkDerivation rec { - name = "wsjtx-${version}"; + pname = "wsjtx"; version = "2.1.0"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 3150d41ca9f..32d89866b5a 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper, unzip }: stdenv.mkDerivation rec { - name = "astrolabe-generator-${version}"; + pname = "astrolabe-generator"; version = "3.3"; src = fetchurl { diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 9f65c63f7a6..968d8769caa 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { srcVersion = "jul19a"; version = "20190701_a"; - name = "gildas-${version}"; + pname = "gildas"; src = fetchurl { # For each new release, the upstream developers of Gildas move the diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index dc7c7c920a1..cfdd320d201 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; - name = "openspace-${version}"; + pname = "openspace"; src = fetchFromGitHub { owner = "OpenSpace"; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e3c66199f11..ecca9141d9f 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "stellarium-${version}"; + pname = "stellarium"; version = "0.19.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index fef4ca1907f..e9fc0607998 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, imake, gccmakedep, libXt, libXext }: stdenv.mkDerivation rec { - name = "xearth-${version}"; + pname = "xearth"; version = "1.1"; src = fetchurl { - url = "http://xearth.org/${name}.tar.gz"; + url = "http://xearth.org/${pname}-${version}.tar.gz"; sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c"; }; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 539d7c22446..d8ffbb74e6b 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "bcftools"; version = "1.9"; src = fetchurl { - url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg"; }; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index 2cdd7fda38e..b5bc3b622b9 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}: stdenv.mkDerivation rec { - name = "bedtools-${version}"; + pname = "bedtools"; version = "2.28.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix index 24a6e052df9..15829104934 100644 --- a/pkgs/applications/science/biology/bftools/default.nix +++ b/pkgs/applications/science/biology/bftools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeWrapper, fetchzip, jre }: stdenv.mkDerivation rec { - name = "bftools-${version}"; + pname = "bftools"; version = "5.9.2"; src = fetchzip { diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 21e2f56bdf9..962428d67cf 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "bowtie2"; version = "2.3.5.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index d1dbacf053f..5e39320bf83 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "bwa-${version}"; + pname = "bwa"; version = "0.7.17"; src = fetchurl { - url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2"; + url = "mirror://sourceforge/bio-bwa/${pname}-${version}.tar.bz2"; sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy"; }; diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix index 3464e134ee8..00acc25028c 100644 --- a/pkgs/applications/science/biology/clustal-omega/default.nix +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "clustal-omega-${version}"; + pname = "clustal-omega"; src = fetchurl { - url = "http://www.clustal.org/omega/${name}.tar.gz"; + url = "http://www.clustal.org/omega/${pname}-${version}.tar.gz"; sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6"; }; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 0e2b5d8b25f..63d51de9930 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.0.20190410"; - name = "dcm2niix-${version}"; + pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 1a15dcf6197..e1e84c9423b 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, bzip2, lzma }: stdenv.mkDerivation rec { - name = "freebayes-${version}"; + pname = "freebayes"; version = "2017-08-23"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix index 9d41fed0691..82485630114 100644 --- a/pkgs/applications/science/biology/hisat2/default.nix +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, which, python, perl}: stdenv.mkDerivation rec { - name = "hisat2-${version}"; + pname = "hisat2"; version = "2.1.0"; src = fetchurl { diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index e43d48db55f..3adbaf0079e 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "hmmer-${version}"; + pname = "hmmer"; src = fetchurl { - url = "http://eddylab.org/software/hmmer/${name}.tar.gz"; + url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; sha256 = "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5"; }; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 95dc2b612e2..412b55f5916 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - name = "igv-${version}"; + pname = "igv"; version = "2.4.19"; src = fetchurl { diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix index 0c8c7313bf2..1ba8cdf22ba 100644 --- a/pkgs/applications/science/biology/itsx/default.nix +++ b/pkgs/applications/science/biology/itsx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.1"; - name = "itsx-${version}"; + pname = "itsx"; src = fetchurl { url = "http://microbiology.se/sw/ITSx_${version}.tar.gz"; diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index d80ffea9a78..16639db1781 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, hdf5, zlib }: stdenv.mkDerivation rec { - name = "kallisto-${version}"; + pname = "kallisto"; version = "0.43.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index dbbf8d39a93..d485666f393 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "messer-slim-${version}"; + pname = "messer-slim"; src = fetchurl { url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index 84c65feb093..bff2bcf428b 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "minimap2"; version = "2.17"; diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 1bdb31616e4..717b8c3ab2f 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "mosdepth-${version}"; + pname = "mosdepth"; version = "0.2.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 875e98499f5..4e6d3494c72 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "neuron-${version}"; + pname = "neuron"; version = "7.5"; nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index 9f1cb8db43d..6379f2c3282 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "niftyreg"; version = "1.3.9"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/nifty_reg-${version}/nifty_reg-${version}.tar.gz"; diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index e7221855503..689d3e42c97 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "niftyseg"; version = "1.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/KCL-BMEIS/NiftySeg/archive/v${version}.tar.gz"; sha256 = "11q6yldsxp3k6gfp94c0xhcan2y3finzv8lzizmrc79yps3wjkn0"; diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 0a2074a06e9..9d81e08d729 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "octopus"; version = "0.6.3-beta"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "luntergroup"; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 68efc2030e5..161188f7ef1 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.9i"; - name = "paml-${version}"; + pname = "paml"; src = fetchurl { url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw"; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 70c72779c52..7b95334eec2 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre, makeWrapper}: stdenv.mkDerivation rec { - name = "picard-tools-${version}"; + pname = "picard-tools"; version = "2.20.4"; src = fetchurl { diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 323ca90f0a2..fc6cfbb158c 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -3,7 +3,7 @@ let python = python27.withPackages (ps: with ps; [ cython ]); in stdenv.mkDerivation rec { - name = "platypus-unstable-${version}"; + pname = "platypus-unstable"; version = "2018-07-22"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 2efb59f536f..52f8f70b779 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, openblas, darwin}: stdenv.mkDerivation rec { - name = "plink-ng-${version}"; + pname = "plink-ng"; version = "1.90b3"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index 3bb9ea06fd4..8a19ae135e8 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -3,7 +3,6 @@ pythonPackages.buildPythonPackage rec { pname = "poretools"; version = "unstable-2016-07-10"; - name = "${pname}-${version}"; src = fetchFromGitHub { repo = pname; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 140f7032319..d7ee54bfbcf 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "RAxML"; version = "8.2.12"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stamatak"; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index c4b4bb522c4..dd1a53472db 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "samtools"; version = "1.9"; src = fetchurl { - url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8"; }; diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index a811bc4412f..72d125ef8b6 100644 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "samtools"; version = "0.1.19"; src = fetchurl { - url = "mirror://sourceforge/samtools/${name}.tar.bz2"; + url = "mirror://sourceforge/samtools/${pname}-${version}.tar.bz2"; sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4"; }; diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix index 17cf903ae49..69dece88c27 100644 --- a/pkgs/applications/science/biology/seaview/default.nix +++ b/pkgs/applications/science/biology/seaview/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.7"; - name = "seaview-${version}"; + pname = "seaview"; src = fetchurl { url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz"; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index dc224690334..d700ee50a9c 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre, unzip, makeWrapper}: stdenv.mkDerivation rec { - name = "snpeff-${version}"; + pname = "snpeff"; version = "4.3t"; src = fetchurl { diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index 4bbd6a32003..1961c71f43b 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, zlib, ncurses}: stdenv.mkDerivation rec { - name = "somatic-sniper-${version}"; + pname = "somatic-sniper"; version = "1.0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index e7f5eab8bfa..84c90d89556 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, zlib, python2}: stdenv.mkDerivation rec { - name = "strelka-${version}"; + pname = "strelka"; version = "2.9.10"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index f685031e87e..697a444193b 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre, makeWrapper}: stdenv.mkDerivation rec { - name = "varscan-${version}"; + pname = "varscan"; version = "2.4.2"; src = fetchurl { diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index a6f52ae97b5..f6c9ad029c1 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "vcftools"; version = "0.1.16"; diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 948aed03fe5..391ed54dfcb 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -3,7 +3,6 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "marvin"; version = "19.1.0"; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 274afd5fc3d..d5810860c10 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.1"; - name = "molden-${version}"; + pname = "molden"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 5e1c77e2475..ea80e9fd5ca 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "6.4.1"; - name = "quantum-espresso-${version}"; + pname = "quantum-espresso"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index eb17a68b8aa..a27355afdc8 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1-b3"; - name = "siesta-${version}"; + pname = "siesta"; src = fetchurl { url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz"; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index 236225959f7..8b95e73b891 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2.3.6"; - name = "adms-${version}"; + pname = "adms"; src = fetchFromGitHub { owner = "Qucs"; diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 63bc0911d25..b351c892c2c 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "alliance-${version}"; + pname = "alliance"; version = "5.1.1"; src = fetchurl { - url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${name}.tar.bz2"; + url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2"; sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1"; }; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 8f81a03044b..ff41a498ae7 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: stdenv.mkDerivation rec { - name = "caneda-${version}"; + pname = "caneda"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 55e8a7b4ffe..d188365db1d 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -4,7 +4,7 @@ libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl }: stdenv.mkDerivation rec { - name = "dsview-${version}"; + pname = "dsview"; version = "0.99"; diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index c42b70c041a..8aa8275510c 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -6,7 +6,7 @@ systemd, alsaLib, dsview stdenv.mkDerivation rec { inherit (dsview) version src; - name = "libsigrok4dsl-${version}"; + pname = "libsigrok4dsl"; postUnpack = '' export sourceRoot=$sourceRoot/libsigrok4DSL diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 214f7766343..12d375cf88a 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -5,7 +5,7 @@ glib, check, python3, dsview stdenv.mkDerivation rec { inherit (dsview) version src; - name = "libsigrokdecode4dsl-${version}"; + pname = "libsigrokdecode4dsl"; postUnpack = '' export sourceRoot=$sourceRoot/libsigrokdecode4DSL diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index ba1b9e174be..3168fc19d05 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -12,7 +12,7 @@ let ]; in stdenv.mkDerivation rec { - name = "eagle-${version}"; + pname = "eagle"; version = "9.4.2"; src = fetchurl { diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index 69b111562ab..a9528b05a31 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { - name = "eagle-${version}"; + pname = "eagle"; version = "7.7.0"; src = diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index e6e7219ff87..a3b2945ac3d 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -5,7 +5,7 @@ with lib; stdenv.mkDerivation rec { - name = "fped-${version}"; + pname = "fped"; version = "unstable-2017-05-11"; src = fetchgit { diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index ab508854310..127e9c05624 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "fritzing-${version}"; + pname = "fritzing"; version = "0.9.3b"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 93fe7b6ba77..71101d7cd74 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation rec { - name = "geda-${version}"; + pname = "geda"; version = "1.8.2-20130925"; src = fetchurl { diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index c0821c8a9ab..3f61a13eab8 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation rec { - name = "gerbv-${version}"; + pname = "gerbv"; version = "2015-10-08"; src = fetchgit { diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 4830e2a032a..8dffe580cc6 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-${version}"; + pname = "gtkwave"; version = "3.3.101"; src = fetchurl { - url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; + url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz"; sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz"; }; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 6608661364a..6f0d8e51448 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -26,7 +26,7 @@ let } // attrs); in stdenv.mkDerivation rec { - name = "kicad-${version}"; + pname = "kicad"; series = "5.0"; version = "5.1.2"; diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index a9a4c32a0b4..7475170d6a7 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -11,7 +11,7 @@ assert ngspiceSupport -> libngspice != null; with lib; stdenv.mkDerivation rec { - name = "kicad-unstable-${version}"; + pname = "kicad-unstable"; version = "2018-06-12"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 277574ce2f1..110552d1d64 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qttools, qmake }: stdenv.mkDerivation rec { - name = "librepcb-${version}"; + pname = "librepcb"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 194804a21a6..78240a40bac 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -2,7 +2,7 @@ , readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }: stdenv.mkDerivation rec { - name = "ngspice-${version}"; + pname = "ngspice"; version = "30"; src = fetchurl { diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index b9bbcd695f1..7514aed9f24 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pcb-${version}"; + pname = "pcb"; version = "20140316"; src = fetchurl { - url = "http://ftp.geda-project.org/pcb/pcb-20140316/${name}.tar.gz"; + url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz"; sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; }; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 1a5fbf90d10..1bfe6df5ff5 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.0.19"; - name = "qucs-${version}"; + pname = "qucs"; src = fetchFromGitHub { owner = "Qucs"; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index b531563c5c1..9a989919250 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, flex, bison }: stdenv.mkDerivation rec { - name = "verilator-${version}"; + pname = "verilator"; version = "4.016"; src = fetchurl { - url = "https://www.veripool.org/ftp/${name}.tgz"; + url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij"; }; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index e233b91bbc9..e8ae4d01a6d 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -2,13 +2,13 @@ , intltool, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "drgeo-${version}"; + pname = "drgeo"; version = "1.1.0"; hardeningDisable = [ "format" ]; src = fetchurl { - url = "mirror://sourceforge/ofset/${name}.tar.gz"; + url = "mirror://sourceforge/ofset/${pname}-${version}.tar.gz"; sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc"; }; patches = [ ./struct.patch ]; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 6e7a3cfc88a..fd50fc825a0 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, readline, cmake }: stdenv.mkDerivation rec { - name = "abc-verifier-${version}"; + pname = "abc-verifier"; version = "2018-07-08"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index bc23454edfc..7078fd454a0 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, rsync, ocamlPackages }: stdenv.mkDerivation rec { - name = "abella-${version}"; + pname = "abella"; version = "2.0.6"; src = fetchurl { - url = "http://abella-prover.org/distributions/${name}.tar.gz"; + url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz"; sha256 = "164q9gngckg6q69k13lwx2pq3cnc9ckw1qi8dnpxqfjgwfqr7xyi"; }; diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 03524fc6b22..10d94e2bb8c 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, picosat }: stdenv.mkDerivation rec { - name = "aiger-${version}"; + pname = "aiger"; version = "1.9.9"; src = fetchurl { - url = "http://fmv.jku.at/aiger/${name}.tar.gz"; + url = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz"; sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; }; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 234b7474997..f83480cfbaf 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, which, dune, ocamlPackages }: stdenv.mkDerivation rec { - name = "alt-ergo-${version}"; + pname = "alt-ergo"; version = "2.3.0"; src = fetchurl { - url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; - name = "${name}.tar.gz"; + url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz"; }; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 6c2d2f0a062..668fd9fea72 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, zlib, boost }: stdenv.mkDerivation rec { - name = "avy-${version}"; + pname = "avy"; version = "2017.10.16"; src = fetchgit { diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 8e0ad22bba1..f1f74bcb581 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boolector-${version}"; + pname = "boolector"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index ed3d9e63812..9d6c866faea 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "btor2tools-${version}"; + pname = "btor2tools"; version = "pre55_8c150b39"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix index ae57724e4f8..e2f48b34029 100644 --- a/pkgs/applications/science/logic/clprover/clprover.nix +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "clprover-${version}"; + pname = "clprover"; version = "1.0.3"; src = fetchzip { diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index c9516a135c0..b4c4cb7c047 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python3, xxd, boost }: stdenv.mkDerivation rec { - name = "cryptominisat-${version}"; + pname = "cryptominisat"; version = "5.6.8"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 09801f54e7e..6877060d36d 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "cryptoverif-${version}"; + pname = "cryptoverif"; version = "2.01pl1"; src = fetchurl { diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index 91eaaeeb0e4..cd41e1ca64b 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "cubicle-${version}"; + pname = "cubicle"; version = "1.1.2"; src = fetchurl { url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 703ce6fd508..dfb04ad90e9 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, gmp, perl }: stdenv.mkDerivation rec { - name = "cvc3-${version}"; + pname = "cvc3"; version = "2.4.1"; src = fetchurl { - url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz"; + url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym"; }; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index cddcbef7a03..c0c7a53ebd4 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "cvc4-${version}"; + pname = "cvc4"; version = "1.6"; src = fetchurl { diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index dab509706a8..1f6fced2233 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which }: stdenv.mkDerivation rec { - name = "eprover-${version}"; + pname = "eprover"; version = "2.3"; src = fetchurl { diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index bc8d372ce42..0a8fad484da 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "glucose-${version}"; + pname = "glucose"; version = "4.1"; src = fetchurl { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { makeFlags = [ "r" ]; installPhase = '' install -Dm0755 glucose_release $out/bin/glucose - mkdir -p "$out/share/doc/${name}/" - install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/" + mkdir -p "$out/share/doc/${pname}-${version}/" + install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix index 30af3216737..816f8504a52 100644 --- a/pkgs/applications/science/logic/glucose/syrup.nix +++ b/pkgs/applications/science/logic/glucose/syrup.nix @@ -1,6 +1,6 @@ { stdenv, zlib, glucose }: stdenv.mkDerivation rec { - name = "glucose-syrup-${version}"; + pname = "glucose-syrup"; version = glucose.version; src = glucose.src; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { makeFlags = [ "r" ]; installPhase = '' install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup - mkdir -p "$out/share/doc/${name}/" - install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/" + mkdir -p "$out/share/doc/${pname}-${version}/" + install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 46b29e3dd27..85fe52239ad 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, eprover, zlib }: stdenv.mkDerivation rec { - name = "iprover-${version}"; + pname = "iprover"; version = "2018_Jul_24_11h"; src = fetchurl { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp iproveropt "$out/bin" - mkdir -p "$out/share/${name}" - cp *.p "$out/share/${name}" + mkdir -p "$out/share/${pname}-${version}" + cp *.p "$out/share/${pname}-${version}" echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover ''; diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index a95d1201cbd..61ca78d85ed 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, smlnj, which }: stdenv.mkDerivation rec { - name = "jonprl-${version}"; + pname = "jonprl"; version = "0.1.0"; src = fetchgit { diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index d7f047b84e0..4775384a3dd 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/pkgs/applications/science/logic/lci/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, readline}: stdenv.mkDerivation rec { version = "0.6"; - name = "lci-${version}"; + pname = "lci"; src = fetchurl { - url = "mirror://sourceforge/lci/${name}.tar.gz"; + url = "mirror://sourceforge/lci/${pname}-${version}.tar.gz"; sha256="204f1ca5e2f56247d71ab320246811c220ed511bf08c9cb7f305cf180a93948e"; }; buildInputs = [readline]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 407244ef183..9bf54a5f094 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gmp }: stdenv.mkDerivation rec { - name = "lean-${version}"; + pname = "lean"; version = "3.4.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 4e1415d3961..22177798647 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -2,7 +2,7 @@ , gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { - name = "lean2-${version}"; + pname = "lean2"; version = "2017-07-22"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index be337a1c258..b50848a1820 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: stdenv.mkDerivation rec { - name = "leo2-${version}"; + pname = "leo2"; version = "1.6.2"; src = fetchurl { diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix index 000587a22e6..dbd34f1da6e 100644 --- a/pkgs/applications/science/logic/lingeling/default.nix +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "lingeling-${version}"; + pname = "lingeling"; # This is the version used in satcomp2018, which was # relicensed, and also known as version 'bcj' version = "pre1_03b4860d"; diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix index c77e0327fb6..02e9844115e 100644 --- a/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/pkgs/applications/science/logic/ltl2ba/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ltl2ba-${version}"; + pname = "ltl2ba"; version = "1.2"; src = fetchurl { - url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz"; + url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz"; sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx"; }; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index dc32e84279a..93212c5b854 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "201707"; build_nr = "1"; - name = "mcrl2-${version}"; + pname = "mcrl2"; src = fetchurl { url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index 1601a74e189..7e46dbeb074 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl, mlton }: stdenv.mkDerivation rec { - name = "metis-prover-${version}"; + pname = "metis-prover"; version = "2.3.20160713"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 4b2116680d5..34051a1da40 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "minisat-${version}"; + pname = "minisat"; version = "2.2.0"; src = fetchurl { - url = "http://minisat.se/downloads/${name}.tar.gz"; + url = "http://minisat.se/downloads/${pname}-${version}.tar.gz"; sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; }; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index f9f021b15f0..9e5ebe008b8 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "opensmt-${version}"; + pname = "opensmt"; version = "20101017"; src = fetchurl { diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index d21487ef92f..40c66dd699d 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, ocaml }: stdenv.mkDerivation rec { - name = "ott-${version}"; + pname = "ott"; version = "0.28"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 638996e853b..547bd31e8b4 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "picosat-${version}"; + pname = "picosat"; version = "965"; src = fetchurl { - url = "http://fmv.jku.at/picosat/${name}.tar.gz"; + url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz"; sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm"; }; diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index 2f765572f9a..c833b22e49b 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, gmp, cmake, python}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libpoly"; version = "0.1.7"; diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 4abfdf9162c..2b368a0e673 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,7 +1,6 @@ { stdenv, fetchzip, cmake }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clingo"; version = "5.3.0"; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 1f6620a2872..d4feb5c9e28 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: stdenv.mkDerivation rec { - name = "prooftree-${version}"; + pname = "prooftree"; version = "0.13"; src = fetchurl { diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index aca06ffbfb7..931ad2fc4f3 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "proverif-${version}"; + pname = "proverif"; version = "2.00"; src = fetchurl { diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index b9dd90f601f..7249eb991d3 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: stdenv.mkDerivation rec { - name = "satallax-${version}"; + pname = "satallax"; version = "2.7"; buildInputs = [ocaml zlib which eprover makeWrapper coq]; src = fetchurl { - url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; + url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; }; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 32ebdad51d9..3f8305ff403 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -23,7 +23,7 @@ let }; in stdenv.mkDerivation rec { - name = "saw-tools-${version}"; + pname = "saw-tools"; version = "0.1.1-20150731"; src = saw-bin; diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index 2bb2b911d49..2645aa102d9 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "spass-${version}"; + pname = "spass"; version = "${baseVersion}.${minorVersion}"; src = fetchurl { diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix index 9676b991679..e0efb28819d 100644 --- a/pkgs/applications/science/logic/statverif/default.nix +++ b/pkgs/applications/science/logic/statverif/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "statverif-${version}"; + pname = "statverif"; version = "1.86pl4"; src = fetchurl { diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 081dc788163..5e186a395fc 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; - name = "stp-${version}"; + pname = "stp"; src = fetchFromGitHub { owner = "stp"; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 8ba77159693..0fc7220c43b 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, yosys, bash, python3 }: stdenv.mkDerivation rec { - name = "symbiyosys-${version}"; + pname = "symbiyosys"; version = "2019.04.18"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index b1eb171b20b..b1c72d7c5ee 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "tlaplus-${version}"; + pname = "tlaplus"; version = "1.5.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 7d35f5f91df..7c8389688d9 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "tlaps-${version}"; + pname = "tlaps"; version = "1.4.3"; src = fetchurl { url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 7f68a8e647e..4c63f8e72a3 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, yap, tcsh, perl, patchelf }: stdenv.mkDerivation rec { - name = "TPTP-${version}"; + pname = "TPTP"; version = "7.2.0"; src = fetchurl { diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 74f8875fceb..161da6e4b23 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, smlnj, rsync }: stdenv.mkDerivation rec { - name = "twelf-${version}"; + pname = "twelf"; version = "1.7.1"; src = fetchurl { diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 08ab243fb96..35be32f458c 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.2.2"; - name = "vampire-${version}"; + pname = "vampire"; src = fetchFromGitHub { owner = "vprover"; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 360f75cc6f0..3e3e2670861 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { - name = "verifast-${version}"; + pname = "verifast"; version = "18.02"; src = fetchurl { - url = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz"; + url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e"; }; diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index ca3673d7bf9..a04ab46c669 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: stdenv.mkDerivation rec { - name = "veriT-${version}"; + pname = "veriT"; version = "2016"; src = fetchurl { diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index bd538dc6c75..3cb14d7da21 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,7 +2,7 @@ , ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation rec { - name = "why3-${version}"; + pname = "why3"; version = "1.2.0"; src = fetchurl { diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 313fe5a9f1d..2f972c92b52 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "workcraft-${version}"; + pname = "workcraft"; version = "3.1.9"; src = fetchurl { diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 40a4c391e1d..76ed934fb39 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }: stdenv.mkDerivation rec { - name = "yices-${version}"; + pname = "yices"; version = "2.6.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index c0536b36cfe..7bcc915daec 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -15,7 +15,7 @@ else assert licenseAccepted; let maps = callPackage ./maps.nix {}; in stdenv.mkDerivation rec { version = "4.7.1"; - name = "sc2-headless-${version}"; + pname = "sc2-headless"; src = fetchurl { url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip"; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 8de78092bd8..be15bba979f 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -16,7 +16,6 @@ assert opencvSupport -> opencv != null; stdenv.mkDerivation rec { pname = "shogun"; version = "6.0.0"; - name = pname + "-" + version; src = fetchFromGitHub { owner = pname + "-toolbox"; diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index e0b0bc11f05..6909cfd8ef6 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.2"; # The current version of LiE is 2.2.2, which is more or less unchanged # since about the year 2000. Minor bugfixes do get applied now and then. - name = "lie-${version}"; + pname = "lie"; meta = { description = "A Computer algebra package for Lie group computations"; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 61eb1fd3ce4..74adcab4e70 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bcal-${version}"; + pname = "bcal"; version = "1.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index 1b7a9736007..37504fceb14 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, doxygen }: stdenv.mkDerivation rec { - name = "bliss-${version}"; + pname = "bliss"; version = "0.73"; src = fetchurl { - url = "http://www.tcs.hut.fi/Software/bliss/${name}.zip"; + url = "http://www.tcs.hut.fi/Software/bliss/${pname}-${version}.zip"; sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84"; }; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index e8171bcb256..5068abbf307 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -36,7 +36,7 @@ let in stdenv.mkDerivation rec { - name = "caffe-${version}"; + pname = "caffe"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 24cddfb9a1c..eb306439a0a 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -2,13 +2,13 @@ , enableReadline ? true, readline, ncurses }: stdenv.mkDerivation rec { - name = "calc-${version}"; + pname = "calc"; version = "2.12.7.2"; src = fetchurl { urls = [ - "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2" - "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2" + "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" + "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp"; }; diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 0beee1eb291..0eb57c75692 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.17.2"; - name = "clp-${version}"; + pname = "clp"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz"; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 465c7318c0e..c20a6954c3c 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - name = "CNTK-${version}"; + pname = "CNTK"; version = "2.7"; # Submodules diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 94e0a44226d..13a75ce4db2 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "ColPack"; version = "1.0.10"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "CSCsw"; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index a14839d3ecc..ec13f5252f1 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -8,7 +8,7 @@ # different for every user. stdenv.mkDerivation rec { - name = "cplex-${version}"; + pname = "cplex"; version = "128"; src = diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix index 23ab2184266..eb42315f015 100644 --- a/pkgs/applications/science/math/form/default.nix +++ b/pkgs/applications/science/math/form/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.2.1"; - name = "form-${version}"; + pname = "form"; # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub src = fetchurl { diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 3232d08aa33..8f38a24f40d 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }: stdenv.mkDerivation rec { - name = "geogebra-${version}"; + pname = "geogebra"; version = "5-0-535-0"; preferLocalBuild = true; diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 74e4b052fdb..3ccd89cf2c1 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }: stdenv.mkDerivation rec { - name = "getdp-${version}"; + pname = "getdp"; version = "3.0.4"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index d2d1ddb6584..33b003b2b56 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, gmp, mpir, cddlib}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "gfan"; version = "0.6.2"; diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index ee9bdcc6f1b..4ac7c411c2d 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -3,7 +3,7 @@ let majorVersion = "8.1"; in stdenv.mkDerivation rec { - name = "gurobi-${version}"; + pname = "gurobi"; version = "${majorVersion}.0"; src = with stdenv.lib; fetchurl { diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index 9eab9ca3999..45a13d02889 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ghostscript }: stdenv.mkDerivation rec { - name = "hmetis-${version}"; + pname = "hmetis"; version = "1.5"; src = fetchurl { diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 0cf834c8cde..f39c6a04d19 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "lp_solve-${version}"; + pname = "lp_solve"; version = "5.5.2.5"; src = fetchurl { diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index 9e02b08c8ad..eecb37dd743 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.2"; pname = "lrcalc"; - name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "asbuch"; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index c6802c3719e..4204b139913 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { version = "10.0.2"; - name = "mathematica-${version}"; + pname = "mathematica"; src = requireFile rec { name = "Mathematica_${version}_LINUX.sh"; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index e2e4ba63b07..bd4725ce73c 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -7,7 +7,7 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { - name = "mxnet-${version}"; + pname = "mxnet"; version = "1.4.1"; src = fetchurl { diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 226e13c004d..c86354234e3 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -3,7 +3,7 @@ , fetchurl }: stdenv.mkDerivation rec { - name = "nauty-${version}"; + pname = "nauty"; version = "26r11"; src = fetchurl { url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index 86bd2e84367..e743c8ae95b 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { - name = "gp2c-${version}"; + pname = "gp2c"; version = "0.0.11pl2"; src = fetchurl { - url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g"; }; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 3e7d9898a65..167ab9275fa 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pcalc-${version}"; + pname = "pcalc"; version = "20141224"; src = fetchgit { diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 4fba231f094..fdc4de7b028 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -7,7 +7,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "polymake"; version = "3.2.rc4"; diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 2dd4778234d..71d16fb626c 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, gmp }: stdenv.mkDerivation rec { - name = "ratpoints-${version}"; + pname = "ratpoints"; version = "2.1.3.p4"; src = fetchurl { diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 591fa192d56..af5c96c093c 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { version = src.version; - name = "sage-tests-${version}"; + pname = "sage-tests"; inherit src; buildInputs = [ diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index e4b1aeae016..524085e8c01 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -87,7 +87,7 @@ let in stdenv.mkDerivation rec { version = src.version; - name = "sage-with-env-${version}"; + pname = "sage-with-env"; src = sage-env.lib.src; inherit buildInputs; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index f6dc21d0018..4fa8ae6270b 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = src.version; - name = "sage-${version}"; + pname = "sage"; src = sage-with-env.env.lib.src; buildInputs = [ diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 91c880673a1..bf618fe64f4 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = src.version; - name = "sagedoc-${version}"; + pname = "sagedoc"; src = sage-with-env.env.lib.src; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 1040d6d4ba1..6eac84aaa86 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { format = "other"; version = src.version; - name = "sagelib-${version}"; + pname = "sagelib"; src = sage-src; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 01fb58403ca..432280a18fb 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { version = "4.1.2"; - name = "scilab-${version}"; + pname = "scilab"; src = fetchurl { - url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz"; + url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz"; sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 8fa020ba07c..610f1ef05c0 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.0.4"; - name = "scotch-${version}"; + pname = "scotch"; src_name = "scotch_${version}"; buildInputs = [ bison openmpi flex zlib ]; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 24063216db0..ccb139203ac 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "singular-${version}"; + pname = "singular"; version = "4.1.1p2"; src = let diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index d36b135531c..67561658eb2 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchgit, cmake, qtbase, qttools }: mkDerivation rec { - name = "speedcrunch-${version}"; + pname = "speedcrunch"; version = "0.12.0"; src = fetchgit { diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index bc971606cd0..18daabb9e7e 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -3,7 +3,7 @@ , fetchpatch }: stdenv.mkDerivation rec { - name = "symmetrica-${version}"; + pname = "symmetrica"; version = "2.0"; src = fetchurl { diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 3bfb22dad93..90278a744f1 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { - name = "weka-${version}"; + pname = "weka"; version = "3.9.2"; src = fetchurl { - url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip"; + url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip"; sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 13ccd70c83f..406d74c4cd3 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -3,7 +3,7 @@ , maxima, wxGTK, gnome3 }: stdenv.mkDerivation rec { - name = "wxmaxima-${version}"; + pname = "wxmaxima"; version = "19.03.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index c02ef73df11..bae0d9a18c6 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "yacas-${version}"; + pname = "yacas"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index d1da5a74e85..c806b558da0 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -9,10 +9,10 @@ in stdenv.mkDerivation rec { version = "${majorVersion}.${minorVersion}"; - name = "boinc-${version}"; + pname = "boinc"; src = fetchFromGitHub { - name = "${name}-src"; + name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 2262e342fc9..2e19012af87 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "cytoscape-${version}"; + pname = "cytoscape"; version = "3.7.1"; src = fetchurl { - url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k"; }; diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 8b6c7497e54..b394639fd0c 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -2,11 +2,11 @@ , proj, boost, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { - name = "gplates-${version}"; + pname = "gplates"; version = "2.0.0"; src = fetchurl { - url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2"; + url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2"; sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw"; }; diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index 76f958cc3a8..b412c4ef81a 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "netlogo-${version}"; + pname = "netlogo"; version = "6.0.4"; src = fetchurl { diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 4139c88ffb0..121e953f43a 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "openmvg-${version}"; + pname = "openmvg"; src = fetchgit { url = "https://www.github.com/openmvg/openmvg.git"; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 0199373b082..2145d7e71d3 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -3,7 +3,7 @@ , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { - name = "root-${version}"; + pname = "root"; version = "5.34.36"; src = fetchurl { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 2ec1ded68a2..690dc920d5c 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -3,7 +3,7 @@ , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { - name = "root-${version}"; + pname = "root"; version = "6.12.06"; src = fetchurl { diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index 1986f3b75ec..c7692dde13a 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.10"; - name = "DL_POLY_Classic-${version}"; + pname = "DL_POLY_Classic"; src = fetchurl { url = "https://ccpforge.cse.rl.ac.uk/gf/download/frsrelease/574/8924/dl_class_1.10.tar.gz"; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index f4491053e4c..83f8b88ba31 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { # LAMMPS has weird versioning converted to ISO 8601 format version = "stable_22Aug2018"; - name = "lammps-${version}"; + pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix index ad86ff61471..b22b9d412fd 100644 --- a/pkgs/applications/science/physics/quantomatic/default.nix +++ b/pkgs/applications/science/physics/quantomatic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "quantomatic-${version}"; + pname = "quantomatic"; version = "0.7"; src = fetchurl { diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index d43a05f1c61..dd092a2ce9a 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { - name = "sacrifice-${version}"; + pname = "sacrifice"; version = "1.0.0"; src = fetchurl { diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 1d61c612563..045a77cea27 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { - name = "sherpa-${version}"; + pname = "sherpa"; version = "2.2.6"; src = fetchurl { diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index ae5307f155b..2af93961e02 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }: stdenv.mkDerivation rec { - name = "xfitter-${version}"; + pname = "xfitter"; version = "2.0.0"; src = fetchurl { - name = "${name}.tgz"; - url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${name}.tgz"; + name = "${pname}-${version}.tgz"; + url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz"; sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515"; }; diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index c454ad37768..ebfb6471c63 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { major = "2"; minor = "5"; version = "${major}-${minor}"; - name = "plm-${version}"; + pname = "plm"; src = fetchurl { url = "http://webloria.loria.fr/~quinson/Teaching/PLM/plm-${major}_${minor}.jar"; sha256 = "0m17cxa3nxi2cbswqvlfzp0mlfi3wrkw8ry2xhkxy6aqzm2mlgcc"; - name = "${name}.jar"; + name = "${pname}-${version}.jar"; }; buildInputs = [ makeWrapper jre gcc valgrind ]; diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 69f355c7b84..678a2ada6d2 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "apmplanner2-${version}"; + pname = "apmplanner2"; # TODO revert Qt511 to Qt5 in pkgs/top-level/all-packages.nix on next release version = "2.0.27-rc1"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 98ccd92c4ee..a3ebda463b9 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { inherit version; - name = "gazebo-${version}"; + pname = "gazebo"; src = fetchurl { - url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2"; + url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pname}-${version}.tar.bz2"; sha256 = src-sha256; }; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index eae5d3766d6..1863757adbc 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "qgroundcontrol-${version}"; + pname = "qgroundcontrol"; version = "3.3.0"; qtInputs = [ diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 507481cddab..d14c0bb0fe8 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "yarp-${version}"; + pname = "yarp"; version = "2.3.70.2"; src = fetchFromGitHub { owner = "robotology"; diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix index 69fc0e76932..06b2aee0392 100644 --- a/pkgs/applications/search/grepcidr/default.nix +++ b/pkgs/applications/search/grepcidr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "grepcidr-${version}"; + pname = "grepcidr"; version = "2.0"; src = fetchurl { - url = "http://www.pc-tools.net/files/unix/${name}.tar.gz"; + url = "http://www.pc-tools.net/files/unix/${pname}-${version}.tar.gz"; sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231"; }; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 99c149b79d9..f3fc1e24401 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perlPackages, mutt }: stdenv.mkDerivation rec { - name = "grepm-${version}"; + pname = "grepm"; version = "0.6"; src = fetchurl { diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 26397380d57..e092a604142 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -3,7 +3,7 @@ , libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { - name = "bitkeeper-${version}"; + pname = "bitkeeper"; version = "7.3.1ce"; src = fetchurl { diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 569606d2fdb..3f445e427a5 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "1.20170611"; pname = "blackbox"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stackexchange"; diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index 6301acdf134..7d1de378f53 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -7,7 +7,7 @@ # pythonPackages.buildPythonApplication rec { version = "1.1.1"; - name = "bugseverywhere-${version}"; + pname = "bugseverywhere"; src = fetchurl { url = diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index aa3bcb27394..71130a2e283 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, cvs, zlib }: stdenv.mkDerivation rec { - name = "cvsps-${version}"; + pname = "cvsps"; version = "2.1"; src = fetchurl { diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix index fa6d4fe1890..fc591dd710e 100644 --- a/pkgs/applications/version-management/diffuse/default.nix +++ b/pkgs/applications/version-management/diffuse/default.nix @@ -4,10 +4,10 @@ let inherit (python27Packages) pygtk python; in stdenv.mkDerivation rec { version = "0.4.8"; - name = "diffuse-${version}"; + pname = "diffuse"; src = fetchurl { - url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2"; sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1"; }; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d4b60a4f538..cc029881133 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "fossil-${version}"; + pname = "fossil"; version = "2.9"; src = fetchurl { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { [ "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw"; }; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 0475a8ae76c..350eea240ec 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gerrit-${version}"; + pname = "gerrit"; version = "2.14.6"; src = fetchurl { diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 6b25ef8518c..20392655062 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "cgit-${version}"; + pname = "cgit"; version = "1.2.1"; src = fetchurl { - url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz"; sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; }; diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 1af1870928b..0e28258915f 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: stdenv.mkDerivation rec { - name = "darcs-to-git-${version}"; + pname = "darcs-to-git"; version = "2015-06-04"; src = fetchgit { diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 1af2170e169..1eff8420fc3 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -1,7 +1,7 @@ {stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}: stdenv.mkDerivation rec { - name = "diff-so-fancy-${version}"; + pname = "diff-so-fancy"; version = "1.2.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 52494d4ab7e..3c0653529ce 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "ghq-${version}"; + pname = "ghq"; version = "0.10.2"; goPackagePath = "github.com/motemen/ghq"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index ba64a065d28..3118eaab19b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }: buildPythonApplication rec { - name = "git-annex-metadata-gui-${version}"; + pname = "git-annex-metadata-gui"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 4d0f33730e4..55a9dd18f72 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "git-annex-remote-b2-${version}"; + pname = "git-annex-remote-b2"; version = "20151212-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index c368dcd487e..5d4d9b86d83 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rclone, makeWrapper }: stdenv.mkDerivation rec { - name = "git-annex-remote-rclone-${version}"; + pname = "git-annex-remote-rclone"; version = "0.6"; rev = "v${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 185ed38b5db..daa0af43879 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-appraise-unstable-${version}"; + pname = "git-appraise-unstable"; version = "2018-02-26"; rev = "2414523905939525559e4b2498c5597f86193b61"; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 0baf09918d4..edc5f9d7bfb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-bug-${version}"; + pname = "git-bug"; version = "0.5.0"; rev = "8d7a2c076a38c89085fd3191a2998efb659650c2"; goPackagePath = "github.com/MichaelMure/git-bug"; diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index c14a027b4ab..e502c73adfd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -3,7 +3,7 @@ , pythonPackages }: stdenv.mkDerivation rec { - name = "git-bz-${version}"; + pname = "git-bz"; version = "3.2015-09-08"; src = fetchgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 316b664c070..6945e24ee46 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -4,7 +4,7 @@ let inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; in buildPythonApplication rec { - name = "git-cola-${version}"; + pname = "git-cola"; version = "3.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index c036a0ffe4b..09c9169e434 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "git-extras-${version}"; + pname = "git-extras"; version = "4.7.0"; src = fetchurl { diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index ded9bcc2ffd..193133d6d3e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gitMinimal, python2Packages }: stdenv.mkDerivation rec { - name = "git-hub-${version}"; + pname = "git-hub"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 10e78622271..76b29135f66 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { - name = "git-imerge-${version}"; + pname = "git-imerge"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index f8d871bdcf3..a7abd1eeaf4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "git-octopus-${version}"; + pname = "git-octopus"; version = "1.4"; installFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index dc3fbbed199..1cc3f365ea8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -1,7 +1,7 @@ {stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { - name = "git-open-${version}"; + pname = "git-open"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index d72df802875..9fb9d4de6e3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "git-radar-${version}"; + pname = "git-radar"; version = "0.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index d1dce046979..ff0f702269c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "git-remote-gcrypt-${version}"; + pname = "git-remote-gcrypt"; version = "1.2"; rev = version; diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 03435ec834a..c0de46264d0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, git, gnused }: stdenv.mkDerivation rec { - name = "git-reparent-${version}"; + pname = "git-reparent"; version = "unstable-2017-09-03"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 211685c8edb..c1a40b12cde 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, git, coreutils }: stdenv.mkDerivation rec { - name = "git-secrets-${version}"; + pname = "git-secrets"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index 6a52983e83c..e8eaf885c71 100644 --- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "git-stree-${version}"; + pname = "git-stree"; version = "0.4.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 7ba7d8ec243..7fa15c66809 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "git-sync-${version}"; + pname = "git-sync"; version = "20151024"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix index 1150f008299..e55799c2752 100644 --- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, git }: stdenv.mkDerivation rec { - name = "git-test-${version}"; + pname = "git-test"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 26f9f8c756e..57af13f597a 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -5,7 +5,6 @@ with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; version = "1.12.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "petervanderdoes"; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index e9862cb4897..9d4cbf2f74c 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -5,12 +5,11 @@ stdenv.mkDerivation rec { pname = "tig"; version = "2.4.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; - rev = name; + rev = "${pname}-${version}"; sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd"; }; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index cea588f76ca..3b8affb57ed 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { - name = "transcrypt-${version}"; + pname = "transcrypt"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index fd999dc17d4..ec03c5bed5b 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "git-crecord-${version}"; + pname = "git-crecord"; version = "20161216.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 3cde046a2ad..e3190667259 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-lfs-${version}"; + pname = "git-lfs"; version = "1.5.6"; rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 92ba5738250..d9b5e170497 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-lfs-${version}"; + pname = "git-lfs"; version = "2.7.2"; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 2c427bb1824..f51e447d88d 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "git-repo-${version}"; + pname = "git-repo"; version = "1.13.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix index 9c5ab20d364..7a92679583b 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -2,7 +2,6 @@ buildGoPackage rec { pname = "git-sizer"; - name = "${pname}-${version}"; version = "1.0.0"; goPackagePath = "github.com/github/git-sizer"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 5b7fc119b5b..4f0651a3a76 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,7 +12,7 @@ let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; in stdenv.mkDerivation rec { - name = "gitkraken-${version}"; + pname = "gitkraken"; version = "6.1.1"; src = fetchurl { diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index a946c7fa7ca..993f0fe6947 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -18,7 +18,7 @@ let }; in buildGoPackage rec { version = "1.47.0"; - name = "gitaly-${version}"; + pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index faeed38c918..cd4784b36c8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "9.3.0"; - name = "gitlab-shell-${version}"; + pname = "gitlab-shell"; src = fetchFromGitLab { owner = "gitlab-org"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 23cf3483f7a..12f354bc2fb 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - name = "gitlab-workhorse-${version}"; + pname = "gitlab-workhorse"; version = "8.7.0"; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 42c09100788..7c157191ab9 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, git, nettools, perl }: stdenv.mkDerivation rec { - name = "gitolite-${version}"; + pname = "gitolite"; version = "3.6.11"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index 64b6e2107f6..5d29c8fcb6c 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }: stdenv.mkDerivation rec { - name = "gitstats-${version}"; + pname = "gitstats"; version = "2016-01-08"; # upstream does not make releases src = fetchzip { url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip"; sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59"; - name = name + "-src"; + name = "${pname}-${version}" + "-src"; }; buildInputs = [ perl python ]; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 0587bc9af76..c2153ebea89 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; buildGoPackage rec { - name = "gogs-${version}"; + pname = "gogs"; version = "0.11.86"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 0d2c4d74267..0a24cfbb3a0 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.49"; - name = "gource-${version}"; + pname = "gource"; src = fetchurl { - url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9"; }; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 3c052a26cde..bee1c82e11b 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -9,12 +9,12 @@ let graphviz_2_0 = import ./graphviz-2.0.nix { }; in stdenv.mkDerivation rec { version = "1.0.2"; - name = "monotone-viz-${version}"; + pname = "monotone-viz"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { - url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz"; + url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; }; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 8150203814d..23278e9e748 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - name = "mr-${version}"; + pname = "mr"; version = "1.20180726"; src = fetchgit { diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 18fb672226f..bb2b4b3e0b8 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,6 @@ with python2Packages; buildPythonApplication rec { - name = "${pname}-${version}"; version = "0.3.1"; pname = "nbstripout"; diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index 8fb1095dc58..db9afdc0a74 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "nitpick"; version = "1.1"; - name = "${pname}-${version}"; format = "other"; disabled = !isPy27; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 314c379c4e6..0020c8c2189 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "p4v-${version}"; + pname = "p4v"; version = "2017.3.1601999"; src = fetchurl { diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index e799d5fac43..60486e20116 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: stdenv.mkDerivation rec { - name = "rapidsvn-${version}"; + pname = "rapidsvn"; version = "0.12.1"; src = fetchurl { - url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz"; + url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz"; sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 049f2756a55..a3fcd209efc 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, rcs, git, makeWrapper }: stdenv.mkDerivation rec { - name = "src-${version}"; + pname = "src"; version = "1.26"; src = fetchurl { - url = "http://www.catb.org/~esr/src/${name}.tar.gz"; + url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz"; sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23"; }; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 8753d4f6f57..693af89d978 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.9.5_beta"; - name = "srcml-${version}"; + pname = "srcml"; src = fetchurl { url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz"; diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index c2bf0a4183c..2ad6b6f2f62 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, autoconf, sqlite }: stdenv.mkDerivation rec { - name = "vcprompt-${version}"; + pname = "vcprompt"; version = "1.2.1"; src = fetchhg { diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 4089e68d85d..577f2f01416 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.20170915"; # date of commit we're pulling - name = "vcsh-${version}"; + pname = "vcsh"; src = fetchFromGitHub { owner = "RichiH"; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 3df61682480..2734035b6de 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -21,11 +21,11 @@ assert portaudioSupport -> (portaudio != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "aegisub-${version}"; + pname = "aegisub"; version = "3.2.2"; src = fetchurl { - url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz"; + url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz"; sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"; }; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 8e87a0589c5..72568ab0f5c 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -24,7 +24,7 @@ assert default != "qt5" -> default == "cli"; assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { - name = "avidemux-${version}"; + pname = "avidemux"; version = "2.7.3"; src = fetchurl { diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index a76608bdd90..3d598086329 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "avxsynth-${version}"; + pname = "avxsynth"; version = "2015-04-07"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index d98b3979660..64b9613363c 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: stdenv.mkDerivation rec { - name = "bino-${version}"; + pname = "bino"; version = "1.6.7"; src = fetchurl { - url = "https://bino3d.org/releases/${name}.tar.xz"; + url = "https://bino3d.org/releases/${pname}-${version}.tar.xz"; sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; }; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 4b97db56e97..1cba1d0e949 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -8,7 +8,7 @@ fetchpatch { url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; }; in stdenv.mkDerivation rec { - name = "bombono-${version}"; + pname = "bombono"; version = "1.2.4"; src = fetchFromGitHub { owner = "muravjov"; diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index bbac1014034..9ff65483f26 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -30,7 +30,7 @@ assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; stdenv.mkDerivation rec { - name = "bomi-${version}"; + pname = "bomi"; version = "0.9.11"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index ea8cb5aa3ff..0f1b185ed22 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.3.alpha"; - name = "byzanz-${version}"; + pname = "byzanz"; src = fetchgit { url = git://github.com/GNOME/byzanz; diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix index 34c80e1050b..53d257dd9d0 100644 --- a/pkgs/applications/video/clickshare-csc1/default.nix +++ b/pkgs/applications/video/clickshare-csc1/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { - name = "clickshare-csc1-${version}"; + pname = "clickshare-csc1"; version = "01.07.00.033"; src = fetchurl { name = "clickshare-csc1-${version}.zip"; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 9b29e18d0bc..e31b2575f86 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "clipgrab-${version}"; + pname = "clipgrab"; version = "3.8.3"; src = fetchurl { sha256 = "1v8vvlqgjqy3gyzwaz9iq0m4fwlkimy5gzg6z3bqwp61p9zzw0zf"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! - url = "https://download.clipgrab.org/${name}.tar.gz"; + url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 344c47eb934..61894bd22f8 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -28,11 +28,11 @@ let ''; in stdenv.mkDerivation rec { - name = "dvd-slideshow-${version}"; + pname = "dvd-slideshow"; version = "0.8.4-2"; src = fetchurl { - url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz"; + url = "mirror://sourceforge/dvd-slideshow/files/${pname}-${version}.tar.gz"; sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5"; }; diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 4712dfac757..54be20d5faf 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.2"; - name = "dvdbackup-${version}"; + pname = "dvdbackup"; src = fetchurl { - url = "mirror://sourceforge/dvdbackup/${name}.tar.xz"; + url = "mirror://sourceforge/dvdbackup/${pname}-${version}.tar.xz"; sha256 = "1rl3h7waqja8blmbpmwy01q9fgr5r0c32b8dy3pbf59bp3xmd37g"; }; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 76db1cd9e64..6d0d33cf40d 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dvdstyler-${version}"; + pname = "dvdstyler"; srcName = "DVDStyler-${version}"; version = "3.1"; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index fd8cc8d8630..3e26b4d68c2 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -2,7 +2,7 @@ , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-mplayer-${version}"; + pname = "gnome-mplayer"; version = "1.0.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 1c625de0dbc..f81f394ed0b 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.0"; - name = "gpac-${version}"; + pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 02a0f275f57..037331cad9e 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { version = "3.0.3"; - name = "k9copy-${version}"; + pname = "k9copy"; src = fetchurl { - url = "mirror://sourceforge/k9copy-reloaded/${name}.tar.gz"; + url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz"; sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg"; }; diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index bc6cd015b86..7dc350da647 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gnome2, librsvg, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "key-mon-${version}"; + pname = "key-mon"; version = "1.17"; namePrefix = ""; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz"; sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; }; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 44313f9499f..33ff1821640 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { majorMinorVersion = "0.12"; patchVersion = "0b"; version = "${majorMinorVersion}.${patchVersion}"; - name = "kmplayer-${version}"; + pname = "kmplayer"; src = fetchurl { url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2"; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index b4d4312c0fa..0dc97410f54 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -20,7 +20,7 @@ let lightworks = stdenv.mkDerivation rec { version = "14.0.0"; - name = "lightworks-${version}"; + pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -28,7 +28,7 @@ let url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb"; sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033"; } - else throw "${name} is not supported on ${stdenv.hostPlatform.system}"; + else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index 717853af745..0a422bb7f50 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.8"; - name = "linuxstopmotion-${version}"; + pname = "linuxstopmotion"; src = fetchgit { url = "git://git.code.sf.net/p/linuxstopmotion/code"; diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 4dd2e019d1d..c302ae1730f 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -13,7 +13,7 @@ with stdenv; mkDerivation rec { version = "0.6.1"; - name = "mapmap-${version}"; + pname = "mapmap"; src = fetchFromGitHub { owner = "mapmapteam"; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index cceed556f97..a5de209854b 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "13.2.1"; - name = "mediathekview-${version}"; + pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz"; sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a"; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 5ee437a19be..a9876da234f 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -6,7 +6,7 @@ , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: stdenv.mkDerivation rec { - name = "minitube-${version}"; + pname = "minitube"; version = "2.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index 70dc156d680..14db747d2ce 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libjpeg }: stdenv.mkDerivation rec { - name = "mjpg-streamer-${version}"; + pname = "mjpg-streamer"; version = "unstable-2019-05-24"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index e3dcf6b3d3b..684390d3c5c 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -2,7 +2,7 @@ , ffmpeg, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { - name = "motion-${version}"; + pname = "motion"; version = "4.2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 81b48e25b96..efa495a45af 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: stdenv.mkDerivation rec { - name = "mpc-qt-${version}"; + pname = "mpc-qt"; version = "18.08"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index dcfeae52aae..d225eecb1e6 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -95,7 +95,7 @@ let luaEnv = lua.withPackages(ps: with ps; [ luasocket ]); in stdenv.mkDerivation rec { - name = "mpv-${version}"; + pname = "mpv"; version = "0.29.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 74167a67bd2..d5c46491cf4 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "mythtv-${version}"; + pname = "mythtv"; version = "29.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 6299cd7e593..4617d1d17dc 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -12,7 +12,7 @@ let }; seexpr = stdenv.mkDerivation rec { version = "1.0.1"; - name = "seexpr-${version}"; + pname = "seexpr"; src = fetchurl { url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz"; sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 983bdff106e..cdcdea3dd26 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -36,7 +36,7 @@ let optional = stdenv.lib.optional; in mkDerivation rec { - name = "obs-studio-${version}"; + pname = "obs-studio"; version = "23.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 14f40ad8901..52aa57bf198 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "obs-linuxbrowser-${version}"; + pname = "obs-linuxbrowser"; version = "0.6.1"; src = fetchFromGitHub { owner = "bazukas"; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 1c124df3023..bef9537b806 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -12,7 +12,7 @@ let # don't bother exposing the package to all of nixpkgs. gst-transcoder = stdenv.mkDerivation rec { version = "1.14.1"; - name = "gst-transcoder-${version}"; + pname = "gst-transcoder"; src = fetchFromGitHub { owner = "pitivi"; repo = "gst-transcoder"; diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 4bd4d5fdaad..25623b47716 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -35,7 +35,7 @@ let }; }; in mkDerivation rec { - name = "plex-media-player-${version}"; + pname = "plex-media-player"; version = "2.36.0.988"; vsnHash = "0150ae52"; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index ea4816ad6d0..327a2034265 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -5,10 +5,9 @@ stdenv.mkDerivation rec { pname = "qstopmotion"; version = "2.4.1"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz"; + url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz"; sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index c3204cc9c0c..8f9e3131d8a 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { - name = "libquvi-${version}"; + pname = "libquvi"; version="0.9.4"; src = fetchurl { diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 603534be4c8..e54fc0eae4b 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig}: stdenv.mkDerivation rec { - name = "quvi-scripts-${version}"; + pname = "quvi-scripts"; version="0.9.20131130"; src = fetchurl { diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 333f4e6ab4d..972e08bb61b 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: stdenv.mkDerivation rec { - name = "quvi-${version}"; + pname = "quvi"; version="0.9.5"; src = fetchurl { diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix index 8797ad8f953..e4d6e14d098 100644 --- a/pkgs/applications/video/recordmydesktop/default.nix +++ b/pkgs/applications/video/recordmydesktop/default.nix @@ -2,7 +2,7 @@ , libICE, libSM, libX11, libXext, libXfixes, libXdamage }: stdenv.mkDerivation rec { - name = "recordmydesktop-${version}"; + pname = "recordmydesktop"; version = "0.3.8.1-svn${rev}"; rev = "602"; diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix index 984b623cee7..d59b02d4b0a 100644 --- a/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/pkgs/applications/video/recordmydesktop/gtk.nix @@ -5,7 +5,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; in stdenv.mkDerivation rec { - name = "gtk-recordmydesktop-${version}"; + pname = "gtk-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; src = fetchsvn { diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix index 56080135151..0864edfcf38 100644 --- a/pkgs/applications/video/recordmydesktop/qt.nix +++ b/pkgs/applications/video/recordmydesktop/qt.nix @@ -5,7 +5,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; in stdenv.mkDerivation rec { - name = "qt-recordmydesktop-${version}"; + pname = "qt-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; src = fetchsvn { diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 1b80e379008..b34b832baf0 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; mkDerivation rec { - name = "shotcut-${version}"; + pname = "shotcut"; version = "19.07.15"; src = fetchFromGitHub { diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b456d8ee9a6..603557b062d 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "simplescreenrecorder-${version}"; + pname = "simplescreenrecorder"; version = "0.3.11"; src = fetchurl { diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 41f82a8bdd5..50e82a4bab6 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "19.6.0"; - name = "smtube-${version}"; + pname = "smtube"; src = fetchurl { - url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2"; sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm"; }; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 79f092a882c..a5efddc9f1a 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { version = "1.1.1"; - name = "streamlink-${version}"; + pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 8979e9790b4..b3d98dd41de 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null); stdenv.mkDerivation rec { - name = "vlc-${version}"; + pname = "vlc"; version = "3.0.7.1"; src = fetchurl { - url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; + url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; sha256 = "1xb4c8n0hkwijzfdlbwadhxnx9z8rlhmrdq4c7q74rq9f51q0m86"; }; diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 2bf74da3d0f..3c4f607c6af 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "w_scan-${version}"; + pname = "w_scan"; version = "20170107"; src = fetchurl { - url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2"; + url = "http://wirbel.htpc-forum.de/w_scan/${pname}-${version}.tar.bz2"; sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q"; }; diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 0c28b4d5737..8258f858309 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -38,7 +38,7 @@ udev ]); in stdenv.mkDerivation rec { - name = "webtorrent-desktop-${version}"; + pname = "webtorrent-desktop"; version = "0.20.0"; src = diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 64fcf0ba04a..176d9a87aed 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { - name = "wxcam-${version}"; + pname = "wxcam"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${pname}-${version}.tar.gz"; sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859"; }; diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index ae048f1bdac..ba72763cdaf 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: stdenv.mkDerivation rec { - name = "xscast-unstable-${version}"; + pname = "xscast-unstable"; version = "2016-07-26"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index 15d98dc9be5..6e61ef098f3 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -6,7 +6,7 @@ assert sdlSupport -> (SDL != null); stdenv.mkDerivation rec { - name = "8086tiny-${version}"; + pname = "8086tiny"; version = "1.25"; src = fetchurl { diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index e7cd5b7bde6..02fb256b38c 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "aqemu-${version}"; + pname = "aqemu"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index f9d7128330f..72db4f1e5aa 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -18,11 +18,11 @@ assert curlSupport -> (curl != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "bochs-${version}"; + pname = "bochs"; version = "2.6.9"; src = fetchurl { - url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz"; sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf"; }; diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix index 13060a50290..9cdaec1c698 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, iasl, flex, bison }: stdenv.mkDerivation rec { - name = "cbfstool-${version}"; + pname = "cbfstool"; version = "4.9"; src = fetchurl { diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index d21bc8cc32b..b770c6ed0a5 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "containerd-${version}"; + pname = "containerd"; version = "1.2.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix index 0af9abc852e..ed4db853c38 100644 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "distribution-${version}"; + pname = "distribution"; version = "2.6.2"; rev = "v${version}"; diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 946014e5cc9..351353ceb96 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, p7zip }: stdenv.mkDerivation rec { - name = "win-virtio-${version}"; + pname = "win-virtio"; version = "0.1.141-1"; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index cce5a674f7c..6f35257b50f 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, cmake, libelf, libpcap }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dynamips"; version = "0.2.21"; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index ab971fe64c9..691c74301e3 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "amazon-ecs-agent"; version = "1.18.0"; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index afb2088c6a6..9420a40805d 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "looking-glass-client-${version}"; + pname = "looking-glass-client"; version = "a12"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index 197b3045cf2..b58a5108eba 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -25,7 +25,7 @@ with lib; let }; nvidia-container-runtime-hook = buildGoPackage rec { - name = "nvidia-container-runtime-hook-${version}"; + pname = "nvidia-container-runtime-hook"; version = "1.4.0"; goPackagePath = "nvidia-container-runtime-hook"; @@ -46,7 +46,7 @@ with lib; let }); in stdenv.mkDerivation rec { - name = "nvidia-docker-${version}"; + pname = "nvidia-docker"; version = "2.0.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index 46b8e3ba43c..71c02ab4de5 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -12,7 +12,7 @@ with lib; let }; in stdenv.mkDerivation rec { - name = "libnvidia-container-${version}"; + pname = "libnvidia-container"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 200542f4de8..ee241abda7f 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -5,7 +5,7 @@ withX ? true }: stdenv.mkDerivation rec { - name = "open-vm-tools-${version}"; + pname = "open-vm-tools"; version = "10.3.10"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8d264f3062c..f4854d9b361 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "podman-${version}"; + pname = "podman"; version = "1.4.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 8777f7cc2db..d8a2878e3f7 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - name = "remotebox-${version}"; + pname = "remotebox"; version = "2.6"; src = fetchurl { diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 0f53ede188c..fd0bd92faa6 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -13,8 +13,8 @@ let in stdenv.mkDerivation rec { version = "1.30.0"; - name = "rkt-${version}"; - BUILDDIR="build-${name}"; + pname = "rkt"; + BUILDDIR="build-${pname}-${version}"; src = fetchFromGitHub { owner = "coreos"; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 10c7d17209c..6357f9fadff 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { - name = "runc-${version}"; + pname = "runc"; version = "1.0.0-rc8"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index 5aa73528e9d..32528627a3c 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "seabios-${version}"; + pname = "seabios"; version = "1.11.0"; src = fetchurl { - url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz"; + url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz"; sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2"; }; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 8ec9ec6c8b4..beec7b92b79 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -14,7 +14,7 @@ with lib; buildGoPackage rec { - name = "singularity-${version}"; + pname = "singularity"; version = "3.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 25c19cd79c7..39508412333 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.18.0"; - name = "tini-${version}"; + pname = "tini"; src = fetchFromGitHub { owner = "krallin"; diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix index a8f11330725..224f77ed32d 100644 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ b/pkgs/applications/virtualization/tinyemu/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, openssl, curl, SDL }: stdenv.mkDerivation rec { - name = "tinyemu-${version}"; + pname = "tinyemu"; version = "2018-09-23"; src = fetchurl { - url = "https://bellard.org/tinyemu/${name}.tar.gz"; + url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; }; buildInputs = [ openssl curl SDL ]; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index c1dbad94250..5a98e71c916 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "virt-manager-qt-${version}"; + pname = "virt-manager-qt"; version = "0.70.91"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 493307d0d07..382ebba3c57 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ocamlPackages, autoreconfHook }: stdenv.mkDerivation rec { - name = "virt-top-${version}"; + pname = "virt-top"; version = "2017-11-18-unstable"; src = fetchgit { diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix index 8a339ac8322..7ea83b01559 100644 --- a/pkgs/applications/virtualization/virt-what/default.nix +++ b/pkgs/applications/virtualization/virt-what/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "virt-what-${version}"; + pname = "virt-what"; version = "1.19"; src = fetchurl { - url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz"; + url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk"; }; diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 3d6efcfc844..464fe46b499 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, glibc }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "vpcs"; version = "0.8"; src = fetchurl { - name = "${name}.tar.bz2"; - url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz"; + name = "${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz"; sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw"; }; diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 59d64210837..ea8a24e57a3 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: stdenv.mkDerivation rec { - name = "x11docker-${version}"; + pname = "x11docker"; version = "6.0.0"; src = fetchFromGitHub { owner = "mviereck"; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index d3990a70bca..26b55b364f1 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; + pname = "xhyve"; version = "20190124"; src = fetchurl { diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index 116180f5ec3..4b61fe3d7e6 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.2"; - name = "2bwm-${version}"; + pname = "2bwm"; src = fetchFromGitHub { owner = "venam"; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 46a86da1d66..5fcbff26b15 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { - name = "afterstep-${version}"; + pname = "afterstep"; version = "2.2.12"; sourceName = "AfterStep-${version}"; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 5c897926432..2551ea80550 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -13,7 +13,7 @@ assert gtk3Support -> gtk3 != null; with luaPackages; stdenv.mkDerivation rec { - name = "awesome-${version}"; + pname = "awesome"; version = "4.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix index 582f9cb61f8..40cebb572af 100644 --- a/pkgs/applications/window-managers/bevelbar/default.nix +++ b/pkgs/applications/window-managers/bevelbar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: stdenv.mkDerivation rec { - name = "bevelbar-${version}"; + pname = "bevelbar"; version = "16.11"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 8fd85aaeb86..3895bafb5a9 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bspwm-${version}"; + pname = "bspwm"; version = "0.9.8"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index f55c55110a2..cf90b1fad63 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "btops-${version}"; + pname = "btops"; version = "0.1.0"; goPackagePath = "github.com/cmschuetz/btops"; diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 0c13691a36a..cf45dfa8640 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "fbpanel-${version}"; + pname = "fbpanel"; version = "6.1"; src = fetchurl { - url = "mirror://sourceforge/fbpanel/${name}.tbz2"; + url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2"; sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index c92b70153a7..404044fa3fa 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fluxbox-${version}"; + pname = "fluxbox"; version = "1.3.7"; src = fetchurl { - url = "mirror://sourceforge/fluxbox/${name}.tar.xz"; + url = "mirror://sourceforge/fluxbox/${pname}-${version}.tar.xz"; sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 20a95f36cee..27657c10a7e 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -10,10 +10,9 @@ assert gestures -> libstroke != null; stdenv.mkDerivation rec { pname = "fvwm"; version = "2.6.8"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv"; }; diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 83fe3ef163a..c62edd6d71a 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "i3blocks-gaps-${version}"; + pname = "i3blocks-gaps"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index bd088db8a36..2246d77173a 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "i3blocks-${version}"; + pname = "i3blocks"; version = "unstable-2019-02-07"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 3e9618f6e5d..a8a769887a3 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ , xorgserver, xvfb_run }: stdenv.mkDerivation rec { - name = "i3-${version}"; + pname = "i3"; version = "4.17"; src = fetchurl { - url = "https://i3wm.org/downloads/${name}.tar.bz2"; + url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf"; }; diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 54f23831706..33aac1cf4b6 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "i3ipc-glib-${version}"; + pname = "i3ipc-glib"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index fa88a7e26be..2fb6fb44833 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.12.c"; - name = "i3lock-color-${version}"; + pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 9d02dbafa5d..3e976f8919f 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,11 @@ xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-${version}"; + pname = "i3lock"; version = "2.12"; src = fetchurl { - url = "https://i3wm.org/i3lock/${name}.tar.bz2"; + url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2"; sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh"; }; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 2f6199122f1..71a4ec3549a 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "icewm-${version}"; + pname = "icewm"; version = "1.4.2"; buildInputs = diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 6a7c1436b09..3668b344be5 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -4,7 +4,7 @@ librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { - name = "jwm-${version}"; + pname = "jwm"; version = "1685"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 3b764e7095b..7df2847669f 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: stdenv.mkDerivation rec { - name = "jwm-settings-manager-${version}"; + pname = "jwm-settings-manager"; version = "2018-10-19"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 9abbd891e31..3c537d6c931 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { - name = "matchbox-${version}"; + pname = "matchbox"; version = "1.2"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index 722566ea2e9..026ee2e1287 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -23,7 +23,7 @@ let rev = "v0.6-17-g271e784"; in stdenv.mkDerivation rec { - name = "neocomp-unstable-${version}"; + pname = "neocomp-unstable"; version = "2019-03-12"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 8c6926dd2c6..c8d526b6d28 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -3,7 +3,7 @@ , imlib2, pango, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { - name = "openbox-${version}"; + pname = "openbox"; version = "3.6.1"; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://openbox.org/dist/openbox/${name}.tar.gz"; + url = "http://openbox.org/dist/openbox/${pname}-${version}.tar.gz"; sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb"; }; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 00ff6252010..d449fc91c0d 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "oroborus-${version}"; + pname = "oroborus"; version = "2.0.20"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index b2677218e85..38255dce722 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { - name = "pekwm-${version}"; + pname = "pekwm"; version = "0.1.17"; src = fetchurl { - url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2"; + url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2"; sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa"; }; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 0a1a095e0ce..11a69020ee6 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "ratpoison-${version}"; + pname = "ratpoison"; version = "1.4.9"; src = fetchurl { - url = "mirror://savannah/ratpoison/${name}.tar.xz"; + url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz"; sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; }; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index d8bb58c21b6..f9bcb28e455 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sawfish-${version}"; + pname = "sawfish"; version = "1.12.90"; sourceName = "sawfish_${version}"; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 81901be0e60..7233ff2410b 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "spectrwm-${version}"; + pname = "spectrwm"; version = "2.7.2"; src = fetchurl { diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 64fa600765b..f0f724d6cf0 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, xorgproto }: stdenv.mkDerivation rec { - name = "stalonetray-${version}"; + pname = "stalonetray"; version = "0.8.3"; src = fetchurl { - url = "mirror://sourceforge/stalonetray/${name}.tar.bz2"; + url = "mirror://sourceforge/stalonetray/${pname}-${version}.tar.bz2"; sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"; }; diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix index 56d2515ed7b..a6f2961ed3f 100644 --- a/pkgs/applications/window-managers/stumpish/default.nix +++ b/pkgs/applications/window-managers/stumpish/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "stumpish"; version = "0.0.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stumpwm"; diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 595197a3f6f..86301492c46 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swaybg-${version}"; + pname = "swaybg"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index c9daed461c5..bc917e76f97 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swayidle-${version}"; + pname = "swayidle"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 80d6ed4e072..fe445a6b7ad 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swaylock-${version}"; + pname = "swaylock"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 2e58928e34c..2327e4f8b80 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "sxhkd-${version}"; + pname = "sxhkd"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/way-cooler/wlc.nix b/pkgs/applications/window-managers/way-cooler/wlc.nix index 3f2891ffd51..03d0b3023f7 100644 --- a/pkgs/applications/window-managers/way-cooler/wlc.nix +++ b/pkgs/applications/window-managers/way-cooler/wlc.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "wlc-${version}"; + pname = "wlc"; version = "0.0.11"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index a88281369e8..99416fcf778 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "weston-${version}"; + pname = "weston"; version = "6.0.1"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; }; diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index d83c4493acc..8ad63999289 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -3,7 +3,7 @@ , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: stdenv.mkDerivation rec { - name = "windowmaker-${version}"; + pname = "windowmaker"; version = "0.95.8"; srcName = "WindowMaker-${version}"; diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix index d615b4fe010..ad611f8dabe 100644 --- a/pkgs/applications/window-managers/wmfs/default.nix +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnumake, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: stdenv.mkDerivation rec { - name = "wmfs-${version}"; + pname = "wmfs"; version = "201902"; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 5a8b68df364..e0f2243827c 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { rev = "2823"; version = "hg-2012-12-09"; - name = "wmii-${version}"; + pname = "wmii"; src = fetchurl { url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip; diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index aca4e340e26..d9300188498 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -1,7 +1,7 @@ {stdenv, makeWrapper, python, toposort, rpm}: stdenv.mkDerivation rec { - name = "nix-template-rpm-${version}"; + pname = "nix-template-rpm"; version = "0.1"; buildInputs = [ makeWrapper python toposort rpm ]; diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index 51ebe704bea..a53ead29c1e 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, python, zip, fop }: stdenv.mkDerivation rec { - name = "bgnet-${version}"; + pname = "bgnet"; version = "3.0.21"; src = fetchurl { diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index c4ce2750172..8b0696408e6 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-${version}"; + pname = "man-pages"; version = "5.02"; src = fetchurl { - url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; + url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2"; }; diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix index 08690b7cecf..b2a6eaa1535 100644 --- a/pkgs/data/documentation/mustache-spec/default.nix +++ b/pkgs/data/documentation/mustache-spec/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mustache-spec-${version}"; + pname = "mustache-spec"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 25df45258a6..81fa0ea945d 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -1,7 +1,7 @@ { stdenv, curl, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "stdman-${version}"; + pname = "stdman"; version = "2018.03.11"; src = fetchFromGitHub { diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 9bca390f96e..2566b162d65 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -3,7 +3,7 @@ , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: mkDerivation rec { - name = "zeal-${version}"; + pname = "zeal"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index 27306a0ef05..061bbb445fb 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.92"; - name = "dina-font-pcf-${version}"; + pname = "dina-font-pcf"; src = fetchurl { url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 4837425d19a..81a1b5649b3 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "dosemu-fonts-${version}"; + pname = "dosemu-fonts"; version = "1.4.0"; src = fetchurl { diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 3e71352f802..171ec10c8f1 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { - name = "emojione-${version}"; + pname = "emojione"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 59ac4ec850b..1f861afcf83 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gohufont-${version}"; + pname = "gohufont"; version = "2.1"; src = fetchurl { - url = "http://font.gohu.org/${name}.tar.gz"; + url = "http://font.gohu.org/${pname}-${version}.tar.gz"; sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm"; }; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index d743d2ccbd4..707beb41231 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "google-fonts-${version}"; + pname = "google-fonts"; version = "2019-07-14"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 7eded5deab4..94c43b11285 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,7 +1,7 @@ { stdenv, google-fonts }: stdenv.mkDerivation rec { - name = "inconsolata-${version}"; + pname = "inconsolata"; inherit (google-fonts) src version; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index 8b557008175..aec48b12086 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, fontforge}: stdenv.mkDerivation rec { - name = "inconsolata-lgc-${version}"; + pname = "inconsolata-lgc"; version = "1.3"; src = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; - install -m444 -Dt $out/share/doc/${name} LICENSE README + install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README ''; meta = with stdenv.lib; { diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 4910ef21f9a..d079ae59b0d 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, requireFile, unzip }: stdenv.mkDerivation rec { - name = "input-fonts-${version}"; + pname = "input-fonts"; version = "2017-08-10"; # date of the download and checksum src = requireFile { diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index ec932ab978c..7a68c9deb5a 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libre-caslon-${version}"; + pname = "libre-caslon"; version = "1.002"; srcs = [ @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} + cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${pname}-${version} ''; outputHashAlgo = "sha256"; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index d9e7ec66ee6..773b53c8892 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -50,15 +50,15 @@ let in stdenv.mkDerivation rec { - name = "lobstertwo-${version}"; + pname = "lobstertwo"; version = "1.006"; phases = ["installPhase"]; installPhase = '' mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name} + mkdir -p $out/share/doc/${pname}-${version} + cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name} cp -v ${bold.file} $out/share/fonts/opentype/${bold.name} cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name} cp -v ${italic.file} $out/share/fonts/opentype/${italic.name} diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index f990575def0..a041f9ce907 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "meslo-lg-${version}"; + pname = "meslo-lg"; meslo-lg = fetchurl { url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true"; - name="${name}"; + name="${pname}-${version}"; sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"; }; meslo-lg-dz = fetchurl { url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true"; - name="${name}-dz"; + name="${pname}-${version}-dz"; sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; }; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 228952aaa56..8a089ea9e79 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "migmix-${version}"; + pname = "migmix"; version = "20150712"; srcs = [ diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 193e98d01a4..775d1766894 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "migu-${version}"; + pname = "migu"; version = "20150712"; srcs = [ diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 2bc5a82fa94..c4cf4f14251 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, fontforge }: stdenv.mkDerivation rec { - name = "monoid-${version}"; + pname = "monoid"; version = "2016-07-21"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index c08630335d4..59b0f89e45e 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "nerdfonts-${version}"; + pname = "nerdfonts"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "nerd-fonts"; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index a9d45128c5b..7db2d9ef75a 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonPackage rec { version = "2017-09-25"; - name = "nototools-${version}"; + pname = "nototools"; src = fetchFromGitHub { owner = "googlei18n"; diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index 2667562b1b0..ab794992e45 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, google-fonts, migu, fontforge, which }: stdenv.mkDerivation rec { - name = "ricty-${version}"; + pname = "ricty"; version = "4.1.1"; src = fetchurl { diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 2bdb96228d9..2e83d5b12d4 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fontforge, pythonFull }: stdenv.mkDerivation rec { - name = "rictydiminished-with-firacode-${version}"; + pname = "rictydiminished-with-firacode"; version = "0.0.1"; src = fetchgit { url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index 175acb22d7b..d55e3b753dd 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -5,7 +5,7 @@ let commit = "883939708704a19a295e0652036369d22469e8dc"; in stdenv.mkDerivation rec { - name = "roboto-mono-${version}"; + pname = "roboto-mono"; version = "2016-01-11"; srcs = [ diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index c5ce13ad7ae..548414152dd 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -5,7 +5,7 @@ let commit = "883939708704a19a295e0652036369d22469e8dc"; in stdenv.mkDerivation rec { - name = "roboto-slab-${version}"; + pname = "roboto-slab"; version = "2016-01-11"; srcs = [ diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 57356398004..358ab959cd0 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -2,11 +2,10 @@ stdenv.mkDerivation rec { pname = "terminus-font"; - version = "4.48"; - name = "${pname}-${version}"; # set here for use in URL below + version = "4.48"; # set here for use in URL below src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"; }; diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix index 494f48fd36e..78700992831 100644 --- a/pkgs/data/fonts/tlwg/default.nix +++ b/pkgs/data/fonts/tlwg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, fontforge }: stdenv.mkDerivation rec { - name = "tlwg-${version}"; + pname = "tlwg"; version = "0.6.4"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 996d1192397..f1545e3d5b4 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "ucs-fonts-${version}"; + pname = "ucs-fonts"; version = "20090406"; srcs = [ diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index b3c6d585b8b..a80beee342b 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, mkfontscale, mkfontdir }: stdenv.mkDerivation rec { - name = "unifont-${version}"; + pname = "unifont"; version = "12.1.03"; ttf = fetchurl { - url = "mirror://gnu/unifont/${name}/${name}.ttf"; + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p"; }; pcf = fetchurl { - url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 6d169e940cf..cd4d0dc42cd 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -1,11 +1,10 @@ {stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "unscii"; version = "1.1"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://pelulamu.net/${pname}/${name}-src.tar.gz"; + url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; }; nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 553c1dbde22..24e9f2a3935 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, fontforge }: stdenv.mkDerivation rec { - name = "xits-math-${version}"; + pname = "xits-math"; version = "1.200"; src = fetchFromGitHub { diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index ce7bb11522b..2e99c3d9232 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }: stdenv.mkDerivation rec { - name = "bibata-cursors-${version}"; + pname = "bibata-cursors"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 4b42f0b6ee9..f276b573019 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "elementary-xfce-icon-theme-${version}"; + pname = "elementary-xfce-icon-theme"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index a4ffefe1f26..99488a26f2b 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "faba-mono-icons"; version = "2016-04-30"; diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index ee45a186f29..f7015621853 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk3 }: stdenv.mkDerivation rec { - name = "iconpack-obsidian-${version}"; + pname = "iconpack-obsidian"; version = "4.3"; src = fetchFromGitHub { diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 7b4ed7a6680..49d289cac39 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "maia-icon-theme-${version}"; + pname = "maia-icon-theme"; version = "2018-02-24"; src = fetchFromGitLab { diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 17892679a7e..83c4b19472a 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "moka-icon-theme"; version = "5.4.0"; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 1a2eb6504d9..e41373f536f 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "numix-icon-theme"; version = "18.07.17"; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index de808e44ea6..5359b2229f3 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "paper-icon-theme"; version = "2018-06-24"; diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index b6def37def6..c4a8fd44a61 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, xorg }: stdenv.mkDerivation rec { - name = "vanilla-dmz-${version}"; + pname = "vanilla-dmz"; version = "0.4.4"; src = fetchzip { url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz"; diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix index 18331b5ada9..5df7343f3be 100644 --- a/pkgs/data/misc/combinatorial_designs/default.nix +++ b/pkgs/data/misc/combinatorial_designs/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "combinatorial_designs-${version}"; + pname = "combinatorial_designs"; version = "20140630"; src = fetchurl { diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix index fec422b33ac..48b538fe183 100644 --- a/pkgs/data/misc/conway_polynomials/default.nix +++ b/pkgs/data/misc/conway_polynomials/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "conway_polynomials-${version}"; + pname = "conway_polynomials"; version = "0.5"; pythonEnv = python.withPackages (ps: with ps; [ six ]); diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix index 528486328c6..49b8736b084 100644 --- a/pkgs/data/misc/elliptic_curves/default.nix +++ b/pkgs/data/misc/elliptic_curves/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation rec { pname = "elliptic_curves"; version = "0.8"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 309ae47a851..38662bef0af 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "geolite-legacy-${version}"; + pname = "geolite-legacy"; version = "2017-12-02"; srcGeoIP = fetchDB diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix index aea5feef46c..14551c6a4a4 100644 --- a/pkgs/data/misc/graphs/default.nix +++ b/pkgs/data/misc/graphs/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "graphs"; version = "20161026"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix index 343071fcf59..cb446e9b0bc 100644 --- a/pkgs/data/misc/libkkc-data/default.nix +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "libkkc-data"; version = "0.2.7"; - name = "${pname}-${version}"; src = fetchurl { - url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz"; + url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz"; sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; }; diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix index 222fd2f8870..1b6b60f104e 100644 --- a/pkgs/data/misc/pari-galdata/default.nix +++ b/pkgs/data/misc/pari-galdata/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20080411"; - name = "pari-galdata-${version}"; + pname = "pari-galdata"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz"; diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix index 967122c1bd4..2d3d52f697e 100644 --- a/pkgs/data/misc/pari-seadata-small/default.nix +++ b/pkgs/data/misc/pari-seadata-small/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20090618"; - name = "pari-seadata-small-${version}"; + pname = "pari-seadata-small"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz"; diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix index 85f2cff09db..8fec9a85426 100644 --- a/pkgs/data/misc/polytopes_db/default.nix +++ b/pkgs/data/misc/polytopes_db/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "polytopes_db"; version = "20170220"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index c90b8aa7e37..f15a7534e26 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "scowl"; version = "2018.04.16"; diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 043d3d65b84..355a2c2c577 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "sound-theme-freedesktop-${version}"; + pname = "sound-theme-freedesktop"; version = "0.8"; src = fetchurl { sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb"; - url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~mccann/dist/${pname}-${version}.tar.bz2"; }; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 0d19d8c9dca..c1f9153c585 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPackages }: stdenv.mkDerivation rec { - name = "tzdata-${version}"; + pname = "tzdata"; version = "2019a"; srcs = diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index e1136299260..12acc424b9d 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, pkgconfig, xorgproto}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "rgb"; version = "1.0.6"; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 762ab3eac3e..09ca8897a21 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "matcha-${version}"; + pname = "matcha"; version = "2019-06-22"; src = fetchFromGitHub { diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix index c4265875390..d1cfb800001 100644 --- a/pkgs/data/themes/nordic-polar/default.nix +++ b/pkgs/data/themes/nordic-polar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "nordic-polar-${version}"; + pname = "nordic-polar"; version = "1.5.0"; srcs = [ diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 1f0e110488b..5172b2992cc 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "nordic-${version}"; + pname = "nordic"; version = "1.6.5"; srcs = [ diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index ee0c81d7d39..3a0695f3fb8 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dbus-factory"; version = "3.1.17"; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 608096951b6..b052a104240 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -23,7 +23,6 @@ }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "dde-api"; version = "3.18.4.1"; @@ -114,7 +113,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 0d25d9083eb..427cb1249c9 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -3,7 +3,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-calendar"; version = "1.2.10"; @@ -38,7 +37,7 @@ mkDerivation rec { -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index 88c3639ff2e..0871e004e5f 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -7,7 +7,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-control-center"; version = "4.10.11"; @@ -100,7 +99,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Control panel of Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 4fb0272a3ce..19089a6b050 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -7,7 +7,6 @@ deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "dde-daemon"; version = "3.27.2.6"; @@ -122,7 +121,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index 21c8221bd13..fc25d007f20 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -6,7 +6,6 @@ let unwrapped = mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-dock"; version = "4.10.3"; @@ -69,7 +68,7 @@ unwrapped = mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Dock for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 3580eeb4304..081c93a65c8 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -9,7 +9,6 @@ xdg-user-dirs, xorg, zlib, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-file-manager"; version = "4.8.6.4"; @@ -239,7 +238,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "File manager and desktop module for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index f8a05b86980..b36d87604e7 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -4,7 +4,6 @@ which, xdg_utils, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-launcher"; version = "4.6.13"; @@ -64,7 +63,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Desktop Environment launcher module"; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 4fd08749ee4..5397439949b 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -2,7 +2,6 @@ dde-qt-dbus-factory, proxychains, which, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-network-utils"; version = "0.1.4"; @@ -42,7 +41,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin network utils"; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index d1f1bed2775..9d181c188d4 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -2,7 +2,6 @@ dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-polkit-agent"; version = "0.2.10"; @@ -39,7 +38,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "PolicyKit agent for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 0d063cbd848..a0e1e35ad85 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, qmake, python3, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; version = "1.1.5"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index 8302e8e97bc..d6713fb3688 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -6,7 +6,6 @@ xkeyboard_config, xorg, xrandr, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-session-ui"; version = "4.9.12"; @@ -115,7 +114,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index c768fa60ce7..619c66d9f5f 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -2,7 +2,6 @@ dtkcore, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-anything"; version = "0.1.0"; @@ -52,7 +51,7 @@ mkDerivation rec { searchHardCodedPaths $modsrc # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin file search tool"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 51f0b666cb1..97d2b53da70 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -2,7 +2,6 @@ dtkwidget, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-calculator"; version = "1.0.11"; @@ -37,7 +36,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Easy to use calculator for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index f43909f37dc..ba826eb9063 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-desktop-base"; version = "2019.06.19"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 5849bc78ac0..b6c20ef7129 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -2,7 +2,6 @@ deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; version = "3.13.6"; @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index d9a6f370168..f4f4ae2971a 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-gettext-tools"; version = "1.0.8"; @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 469a43efe32..4c0643a7ce5 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-gtk-theme"; version = "17.10.11"; @@ -16,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin GTK Theme"; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index c5cf9e9ad3a..8ecb25f5a2e 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-icon-theme"; version = "15.12.71"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 89ef6247504..733f4846f5c 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -4,7 +4,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-image-viewer"; version = "1.3.17"; @@ -42,7 +41,7 @@ mkDerivation rec { -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 4292fb2d212..9aef8a15eb9 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -2,7 +2,6 @@ qt5integration, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-menu"; version = "3.4.8"; @@ -35,7 +34,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin menu service"; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index a4aede5857c..18f54223301 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -4,7 +4,6 @@ deepin, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-metacity"; version = "3.22.24"; @@ -54,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "2D window manager for Deepin"; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 6e14f0fd804..046f589263b 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -3,7 +3,6 @@ libdvdnav, libdvdread, xorg, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-movie-reborn"; version = "3.2.24"; @@ -45,7 +44,7 @@ mkDerivation rec { sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin movie player"; diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index 83afe1ee24f..9f2e8068d55 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -5,7 +5,6 @@ deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-mutter"; version = "3.20.38"; @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Base window manager for deepin, fork of gnome mutter"; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 256744828db..e77aa5e68c6 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -3,7 +3,6 @@ deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-screenshot"; version = "4.2.1"; @@ -49,7 +48,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 8c482d53405..62c6c7ed925 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -2,7 +2,6 @@ qt5integration, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-shortcut-viewer"; version = "1.3.5"; @@ -26,7 +25,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index bb752cc1ca9..398be55398b 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-sound-theme"; version = "15.10.3"; @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin sound theme"; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 51156554f99..59789bd84bb 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -5,7 +5,6 @@ libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-terminal"; version = "3.2.6"; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Default terminal emulator for Deepin"; diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index 1fe930ea490..299db533674 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-turbo"; version = "0.0.3"; @@ -32,7 +31,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "A daemon that helps to launch applications faster"; diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index f99974ba9c2..e822cf6269d 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, dde-api, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-wallpapers"; version = "1.7.7"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index 986bee2f0dd..13b115e7042 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -4,7 +4,6 @@ deepin-desktop-schemas, wrapGAppsHook, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-wm"; version = "1.9.38"; @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Window Manager"; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index 4baa2262cd6..f645be0f4d9 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -2,7 +2,6 @@ dde-polkit-agent, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dpa-ext-gnomekeyring"; version = "0.1.0"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GNOME keyring extension for dde-polkit-agent"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 2a527e3cc19..2ed10f99368 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkcore"; version = "2.0.14"; @@ -43,7 +42,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin tool kit core modules"; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 8487509e73b..54c4163fcd1 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -3,7 +3,6 @@ dde-qt-dbus-factory, dtkcore, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkwidget"; version = "2.0.14"; @@ -41,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index c05eedd8857..4807c3d312b 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -2,7 +2,6 @@ deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkwm"; version = "2.0.11"; @@ -31,7 +30,7 @@ mkDerivation rec { "LIB_INSTALL_DIR=${outRef}/lib" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index 044d5e2a2ea..1d97991dffd 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-dbus-factory"; version = "0.9.0"; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 92cf3960c73..2c63fd5ebe6 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, go, go-lib, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-dbus-generator"; version = "0.6.6"; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index 4b79969970a..68504d756b1 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -2,7 +2,6 @@ libgudev, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-gir-generator"; version = "2.0.2"; @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 6f3a851eb2f..fff92b595f8 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -2,7 +2,6 @@ mobile-broadband-provider-info, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-lib"; version = "1.10.2"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { rm -r $out/share/go/src/pkg.deepin.io/lib/debian ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index b275174fa9f..ffbc230d2e2 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -39,7 +39,6 @@ let in mkDerivation rec { - name = "${pname}-${version}"; pname = "qcef"; version = "1.1.6"; @@ -91,7 +90,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt5 binding of Chromium Embedded Framework"; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index f2e6eb0d123..d76bed1b9b7 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -2,7 +2,6 @@ mtdev, cairo, deepin, qtbase }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; version = "1.2.2"; @@ -31,7 +30,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 8302e701b38..97e60be6d67 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -3,7 +3,6 @@ qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qt5integration"; version = "0.3.12"; @@ -41,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index e7f735a4256..51c38f6d347 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "udisks2-qt5"; version = "0.0.1"; @@ -29,7 +28,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "UDisks2 D-Bus interfaces binding for Qt5"; diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 8e73682065d..93b0cb59650 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { - name = "econnman-${version}"; + pname = "econnman"; version = "1.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; + url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.gz"; sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index a7f5eaf6339..f1b55607e3a 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "efl-${version}"; + pname = "efl"; version = "1.22.2"; src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; + url = "http://download.enlightenment.org/rel/libs/efl/${pname}-${version}.tar.xz"; sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n"; }; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 07aac3d611b..a15655ce2c9 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "enlightenment-${version}"; + pname = "enlightenment"; version = "0.22.4"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; + url = "http://download.enlightenment.org/rel/apps/enlightenment/${pname}-${version}.tar.xz"; sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r"; }; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index 409b3f7bb8d..f1455f68338 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { - name = "ephoto-${version}"; + pname = "ephoto"; version = "1.5"; src = fetchurl { - url = "http://www.smhouston.us/stuff/${name}.tar.gz"; + url = "http://www.smhouston.us/stuff/${pname}-${version}.tar.gz"; sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb"; }; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index a1de3f95131..8362655f90e 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "rage-${version}"; + pname = "rage"; version = "0.3.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz"; + url = "http://download.enlightenment.org/rel/apps/rage/${pname}-${version}.tar.xz"; sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; }; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index 31dd985af2a..7d8365337aa 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation rec { ver_maj = "2.32"; ver_min = "0"; version = "${ver_maj}.${ver_min}"; - name = "gnome-python-desktop-${version}"; + pname = "gnome-python-desktop"; src = fetchurl { url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # gnome-python-desktop expects that .pth file is already installed by PyGTK # in the same directory. This is not the case for Nix. postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth + echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 03440c02c14..87d2931d274 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "2.10.5"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2"; + url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2"; sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index ac9a87299ab..10b99e4eb5d 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "9ae8768"; version = "5.4"; - name = "mail-notification-${version}"; + pname = "mail-notification"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index df3de11e738..1a1848491b1 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }: stdenv.mkDerivation rec { - name = "gconf-${version}"; + pname = "gconf"; version = "3.2.6"; src = fetchurl { diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 3ea04048acc..33c2abef0fa 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "4.10.0"; - name = "gtkhtml-${version}"; + pname = "gtkhtml"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz"; sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index f21e81237b2..b18e58f6f56 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -5,11 +5,11 @@ , adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { - name = "cheese-${version}"; + pname = "cheese"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv"; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 733b8ecca92..267a7f2f7d2 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -2,11 +2,11 @@ , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { - name = "file-roller-${version}"; + pname = "file-roller"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw"; }; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 2dcd265e2e4..35d97a87a86 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -5,11 +5,11 @@ , gnome3, gspell, perl, itstool, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gedit-${version}"; + pname = "gedit"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"; }; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 4424eb4a3fd..92b38ed5eee 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -4,11 +4,11 @@ , gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "glade-${version}"; + pname = "glade"; version = "3.22.1"; src = fetchurl { - url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index c95d135e9e7..fe8977646f6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -2,11 +2,11 @@ , gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: stdenv.mkDerivation rec { - name = "gnome-characters-${version}"; + pname = "gnome-characters"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index d2845bef2a1..38182f1f994 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -5,11 +5,11 @@ , gnome3, gdk-pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { - name = "gnome-clocks-${version}"; + pname = "gnome-clocks"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index e8796d49e9a..1301381e5aa 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -7,11 +7,11 @@ , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-documents-${version}"; + pname = "gnome-documents"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 4c215d34729..655e9e9fe34 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "gnome-getting-started-docs-${version}"; + pname = "gnome-getting-started-docs"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index d46882deb41..8681a3c866c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -2,11 +2,11 @@ , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-logs-${version}"; + pname = "gnome-logs"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index d21cfcfd72d..1e5a641f08f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -2,11 +2,11 @@ , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-weather-${version}"; + pname = "gnome-weather"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s"; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index ae360d73b87..c5377157ef0 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -2,11 +2,11 @@ , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { - name = "vinagre-${version}"; + pname = "vinagre"; version = "3.22.0"; src = fetchurl { - url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 9ef94adcbd0..a7f4a637b17 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -2,11 +2,11 @@ , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "adwaita-icon-theme-${version}"; + pname = "adwaita-icon-theme"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9"; }; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 73c3f65a968..5e4bbf8cce1 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -10,11 +10,11 @@ , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { - name = "empathy-${version}"; + pname = "empathy"; version = "3.25.90"; src = fetchurl { - url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 7b7b7f64aa4..85f31bfdce5 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -5,11 +5,11 @@ , gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }: stdenv.mkDerivation rec { - name = "epiphany-${version}"; + pname = "epiphany"; version = "3.32.4"; src = fetchurl { - url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69"; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 078145e1231..dda45a71fe2 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ , glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "evolution-data-server-${version}"; + pname = "evolution-data-server"; version = "3.32.4"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \ + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \ --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas" patches="$patches $PWD/hardcode-gsettings.patch" ''; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 420a0d3e6b1..a4d2fd2be5a 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -4,11 +4,11 @@ , librsvg, coreutils, xwayland }: stdenv.mkDerivation rec { - name = "gdm-${version}"; + pname = "gdm"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4"; }; diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 4e43d5f9d50..303377b8631 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -3,11 +3,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "gjs-${version}"; + pname = "gjs"; version = "1.56.2"; src = fetchurl { - url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 1e332502db5..e4c772cb1d4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: stdenv.mkDerivation rec { - name = "gnome-backgrounds-${version}"; + pname = "gnome-backgrounds"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 9214aa0a9a7..df43371a497 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -3,11 +3,11 @@ , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-calculator-${version}"; + pname = "gnome-calculator"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index d0ab339a504..f2eb65e50bb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { - name = "gnome-common-${version}"; + pname = "gnome-common"; version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 4beeb190f02..9d798c2811b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -3,13 +3,13 @@ , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-desktop-${version}"; + pname = "gnome-desktop"; version = "3.32.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 613de6c3c16..98398311882 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -3,11 +3,11 @@ , gnome3, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-dictionary-${version}"; + pname = "gnome-dictionary"; version = "3.26.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 8e09b152e83..d6d9f927252 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -4,11 +4,11 @@ , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - name = "gnome-disk-utility-${version}"; + pname = "gnome-disk-utility"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 317c7e91584..976829acd4c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -3,11 +3,11 @@ , wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { - name = "gnome-font-viewer-${version}"; + pname = "gnome-font-viewer"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index f36d3f4a6e0..4148843d4ab 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -3,11 +3,11 @@ , docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-keyring-${version}"; + pname = "gnome-keyring"; version = "3.31.91"; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index ed4c1a3da13..93da1f8abec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -3,11 +3,11 @@ , tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-online-miners-${version}"; + pname = "gnome-online-miners"; version = "3.30.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 38adf7137f7..f13ad9f47aa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -3,11 +3,11 @@ , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: stdenv.mkDerivation rec { - name = "gnome-session-${version}"; + pname = "gnome-session"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 21281f15a5c..76121660012 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -2,11 +2,11 @@ , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { - name = "gnome-shell-extensions-${version}"; + pname = "gnome-shell-extensions"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/ + schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/ glib-compile-schemas $schemadir diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 1363cf6d669..a1d8f2c599a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -13,11 +13,11 @@ let pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { - name = "gnome-shell-${version}"; + pname = "gnome-shell"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 6d487597900..12081bbae5b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { - name = "gnome-software-${version}"; + pname = "gnome-software"; version = "3.32.4"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 5c332c4135c..a9f8367a548 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -3,11 +3,11 @@ , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { - name = "gnome-system-monitor-${version}"; + pname = "gnome-system-monitor"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index c9f5229f870..75d4b117e77 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -3,11 +3,11 @@ , desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-terminal-${version}"; + pname = "gnome-terminal"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 1a8582626e3..7915e71a73c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - name = "gnome-user-docs-${version}"; + pname = "gnome-user-docs"; version = "3.32.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig"; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index cfdda920e27..56104aff484 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gnome3 }: stdenv.mkDerivation rec { - name = "unicode-data-${version}"; + pname = "unicode-data"; version = "12.0.0"; srcs = [ (fetchurl { diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 4f57c5247d9..de56b14d46f 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,11 +3,11 @@ , libxml2, sane-backends, vala, gnome3, gobject-introspection }: stdenv.mkDerivation rec { - name = "simple-scan-${version}"; + pname = "simple-scan"; version = "3.32.2.1"; src = fetchurl { - url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp"; }; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 5554dbdfe30..86675f21f06 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -4,11 +4,11 @@ , gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }: stdenv.mkDerivation rec { - name = "sushi-${version}"; + pname = "sushi"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj"; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 4953b7ec7a8..a5388f2eae1 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -6,11 +6,11 @@ , gdk-pixbuf, tracker, nautilus, xvfb_run }: stdenv.mkDerivation rec { - name = "totem-${version}"; + pname = "totem"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v"; }; diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index b3f06c2dcc1..4153a7ed955 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = "vino-${version}"; + pname = "vino"; version = "3.22.0"; src = fetchurl { - url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index aac21626258..43863bf7f85 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - name = "yelp-tools-${version}"; + pname = "yelp-tools"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index f1a39311728..fc5b0268df7 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -2,11 +2,11 @@ , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { - name = "yelp-xsl-${version}"; + pname = "yelp-xsl"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 24a49413960..7e326dd1657 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -4,11 +4,11 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "yelp-${version}"; + pname = "yelp"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f"; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 89d0fd7a3b9..5023ffce6b9 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -2,11 +2,11 @@ , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "zenity-${version}"; + pname = "zenity"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index d1e5179063f..573259b7e7d 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -3,11 +3,11 @@ itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { - name = "anjuta-${version}"; + pname = "anjuta"; version = "3.28.0"; src = fetchurl { - url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh"; }; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 80a3770b703..23a58011e02 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -3,11 +3,11 @@ , webkitgtk, gettext, itstool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "devhelp-${version}"; + pname = "devhelp"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq"; }; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 647e7163d0b..81f63941729 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "gnome-devel-docs-${version}"; + pname = "gnome-devel-docs"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0"; }; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index 9fbce7c6cc0..7ebacc99c52 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -3,11 +3,11 @@ gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "nemiver-${version}"; + pname = "nemiver"; version = "0.9.6"; src = fetchurl { - url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; }; diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 568a6cace72..6f289fd74d9 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-appindicator-${version}"; + pname = "gnome-shell-extension-appindicator"; version = "29"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index afedd5f98e1..b7bde83915c 100644 --- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-battery-status-${version}"; + pname = "gnome-shell-extension-battery-status"; version = "6"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index e627bec8b93..95a68505c7c 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext, bash }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-caffeine-${version}"; + pname = "gnome-shell-extension-caffeine"; version = "unstable-2019-04-02"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index e41227e8513..0faadbcd2b6 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-clipboard-indicator-${version}"; + pname = "gnome-shell-extension-clipboard-indicator"; version = "30"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 06e7d27c544..e80149e5005 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-dash-to-dock-${version}"; + pname = "gnome-shell-dash-to-dock"; version = "66"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 0d48b8359c9..30f9ad7d2ab 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-dash-to-panel-${version}"; + pname = "gnome-shell-dash-to-panel"; version = "19"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index dd2a02b6be8..0d9d54167ff 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -3,7 +3,7 @@ , glib, gtk3, at-spi2-core, upower, openssh, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-gsconnect-${version}"; + pname = "gnome-shell-gsconnect"; version = "23"; src = fetchFromGitHub { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" - "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas" + "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" "-Dopenssl_path=${openssl}/bin/openssl" diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index d08e6f3a57d..8214300a531 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-icon-hider-${version}"; + pname = "gnome-shell-extension-icon-hider"; version = "23"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix index 24b4c1cf703..b36f3489b57 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-impatience-${version}"; + pname = "gnome-shell-impatience"; version = "0.4.5"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix index 686d7be91a4..f09822415a6 100644 --- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extensions-mediaplayer-${version}"; + pname = "gnome-shell-extensions-mediaplayer"; version = "unstable-2019-03-21"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index 8c075a11bdc..f9f72bd77f0 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-no-title-bar-${version}"; + pname = "gnome-shell-extension-no-title-bar"; version = "9"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix index 21ff70140be..e2b5288e886 100644 --- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix +++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-nohotcorner-${version}"; + pname = "gnome-shell-extension-nohotcorner"; version = "19.0"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index 5faa55652d8..d9ea670db09 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-remove-dropdown-arrows-${version}"; + pname = "gnome-shell-extension-remove-dropdown-arrows"; version = "11"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 7046e673726..285733d5f7c 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }: stdenv.mkDerivation rec { - name = "gnome-shell-system-monitor-${version}"; + pname = "gnome-shell-system-monitor"; version = "36"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index c72d72cce12..745541b7cf4 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-taskwhisperer-${version}"; + pname = "gnome-shell-extension-taskwhisperer"; version = "12"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index 604b7433ccb..f841ef2403d 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-timepp-${version}"; + pname = "gnome-shell-extension-timepp"; version = "unstable-2019-03-30"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 9a151a6ac8f..f0f6279fe2e 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-topicons-plus-${version}"; + pname = "gnome-shell-extension-topicons-plus"; version = "22"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix index 19ced0b5252..072d31b84fe 100644 --- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix +++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-volume-mixer-${version}"; + pname = "gnome-shell-volume-mixer"; version = "844ed80ad448855d8f6218847183a80474b523c7"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix index 10aee5cafe6..811e9911f62 100644 --- a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix +++ b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-workspace-grid-${version}"; + pname = "gnome-shell-workspace-grid"; version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 21f089b324e..b4c6eaaec1b 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -2,11 +2,11 @@ , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { - name = "five-or-more-${version}"; + pname = "five-or-more"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn"; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 94428d6640d..5b233c48385 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -3,11 +3,11 @@ , python3, ninja, desktop-file-utils }: stdenv.mkDerivation rec { - name = "four-in-a-row-${version}"; + pname = "four-in-a-row"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index c6c24be4be8..d7001e1c527 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -2,11 +2,11 @@ , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { - name = "gnome-chess-${version}"; + pname = "gnome-chess"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index ee55b5a65a5..9d173945cdd 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-mahjongg-${version}"; + pname = "gnome-mahjongg"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index b2c8e99e823..1ac7e51357e 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -2,11 +2,11 @@ , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gnome-mines-${version}"; + pname = "gnome-mines"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index cbac95c8f41..659339c3b77 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -3,11 +3,11 @@ , libxml2, libgee, libgnome-games-support }: stdenv.mkDerivation rec { - name = "gnome-nibbles-${version}"; + pname = "gnome-nibbles"; version = "3.31.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0wg0l3aghkxcwp74liw115qjzy6w18hn80mhsz4lrjpnbpaivi18"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 2b40548d37c..46723867f8a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -3,11 +3,11 @@ , libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-robots-${version}"; + pname = "gnome-robots"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 5c3fafd3d02..a555ee31cf3 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -2,11 +2,11 @@ , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gnome-sudoku-${version}"; + pname = "gnome-sudoku"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 06914d9817c..b6c60362265 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-taquin-${version}"; + pname = "gnome-taquin"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index ab0f0f0faf2..29141530211 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-tetravex-${version}"; + pname = "gnome-tetravex"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl"; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 86a1bd6485b..114551ed4ee 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "iagno-${version}"; + pname = "iagno"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d"; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 5801c293563..9c582f037a2 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -3,11 +3,11 @@ , meson, ninja, python3 }: stdenv.mkDerivation rec { - name = "lightsoff-${version}"; + pname = "lightsoff"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f"; }; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index d9f3e5fc5ff..fdda4930645 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "tali-${version}"; + pname = "tali"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index c80c8b977cf..c8d26988391 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-autoar-${version}"; + pname = "gnome-autoar"; version = "0.2.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index d819961d281..ea9a79de40e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -2,11 +2,11 @@ , gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-packagekit-${version}"; + pname = "gnome-packagekit"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index a35067587e0..d8a78686e49 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.32.0"; - name = "gpaste-${version}"; + pname = "gpaste"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/libgpaste/settings/gpaste-settings.c \ - --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas" + --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" ''; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 543453a2bd3..a607a6eb6a0 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -2,11 +2,11 @@ , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gtkhtml-${version}"; + pname = "gtkhtml"; version = "4.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 6e8644b19b0..550e98c9dcc 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "lxmenu-data-${version}"; + pname = "lxmenu-data"; version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; }; diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index ca601531b68..104ab20835f 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }: stdenv.mkDerivation rec { - name = "lxtask-${version}"; + pname = "lxtask"; version = "0.1.9"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1"; }; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 75ec5aa06ed..fee4e02dd30 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lxqt-archiver"; version = "0.0.96"; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index f5bdcf064fd..ae4fb28f06a 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, cmake, qtbase, qttools }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "qlipper"; version = "5.1.1"; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 5ef080ef50b..15dea9b1018 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "atril-${version}"; + pname = "atril"; version = "1.22.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190"; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 108e8fe1e0b..ba21cb00d35 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "caja-extensions-${version}"; + pname = "caja-extensions"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p"; }; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 8fad6cac879..675648363f5 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "engrampa-${version}"; + pname = "engrampa"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06z38vfs15f5crrrgvcsqfb557fhpq1mqkj5fd9wb0hvi77hasrk"; }; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 72e509d59af..cc683ab2db2 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "eom-${version}"; + pname = "eom"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4"; }; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index bd6488d2c2c..d6709c375e6 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: stdenv.mkDerivation rec { - name = "libmatekbd-${version}"; + pname = "libmatekbd"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"; }; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index bf2a91971dd..17fee5d61cb 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "libmatemixer-${version}"; + pname = "libmatemixer"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"; }; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 664b85fc287..e4976f71ae6 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { - name = "libmateweather-${version}"; + pname = "libmateweather"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a"; }; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 4f77b303501..9899256018a 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "marco-${version}"; + pname = "marco"; version = "1.22.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry"; }; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 7fbd192ac2c..ec7ad2b4294 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-applets-${version}"; + pname = "mate-applets"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx"; }; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index f5c151d01f7..2667c25959e 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "mate-backgrounds-${version}"; + pname = "mate-backgrounds"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"; }; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 85631f03e1d..64ede5101c7 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-calc-${version}"; + pname = "mate-calc"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld"; }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 3b154fd9812..f85dd632bd1 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mate-common-${version}"; + pname = "mate-common"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z"; }; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 6e54b137ba1..a06c24b9c72 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mate-control-center-${version}"; + pname = "mate-control-center"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0"; }; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 0bfcab58663..58515a492b5 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-desktop-${version}"; + pname = "mate-desktop"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0"; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index ba0cbd526f9..7db01f59816 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "mate-icon-theme-faenza-${version}"; + pname = "mate-icon-theme-faenza"; version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 8f0f15fac2d..9df0d0ce5a8 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3 }: stdenv.mkDerivation rec { - name = "mate-icon-theme-${version}"; + pname = "mate-icon-theme"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k"; }; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 623e7f24096..e1a6e874d1d 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-indicator-applet-${version}"; + pname = "mate-indicator-applet"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1"; }; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 7185181d747..93c765a9953 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-media-${version}"; + pname = "mate-media"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2"; }; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index bb09b0a4849..e37a270f9dc 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { - name = "mate-menus-${version}"; + pname = "mate-menus"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c"; }; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 049e0a4bb69..51d23e475ff 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-netbook-${version}"; + pname = "mate-netbook"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00n162bskbvxhy4k2w14f9zwlsg3wgi43228ssx7sc2p95psmm64"; }; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 45d483503aa..d53ae8efa35 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -2,11 +2,11 @@ libnotify, libwnck3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-notification-daemon-${version}"; + pname = "mate-notification-daemon"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j"; }; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index bbb49c20347..39d2c1812cb 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-panel-${version}"; + pname = "mate-panel"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma"; }; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index f5b6d62dd59..253472e3987 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { - name = "mate-polkit-${version}"; + pname = "mate-polkit"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"; }; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 7f4d1c85015..6ba6ac205ce 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-power-manager-${version}"; + pname = "mate-power-manager"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms"; }; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 53a89bec4c1..d1c1e481d70 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-screensaver-${version}"; + pname = "mate-screensaver"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc"; }; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index c5ad4628c54..bd9ed9f6cbe 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-sensors-applet-${version}"; + pname = "mate-sensors-applet"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3"; }; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 3448e8327f5..b7735ec77fe 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mate-session-manager-${version}"; + pname = "mate-session-manager"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig"; }; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 00d967a2d5c..5ee995402ec 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,11 +4,11 @@ wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-settings-daemon-${version}"; + pname = "mate-settings-daemon"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym"; }; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index f7cdf036ceb..6f5993cfc35 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-system-monitor-${version}"; + pname = "mate-system-monitor"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm"; }; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 2339ad8fb1b..7ec9944aa0e 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-terminal-${version}"; + pname = "mate-terminal"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn"; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index a4724049f7c..9ed5515ea3e 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -2,11 +2,11 @@ gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { - name = "mate-themes-${version}"; + pname = "mate-themes"; version = "3.22.20"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx"; }; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index eae425b1892..a9a0e171231 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, itstool, libxml2, yelp }: stdenv.mkDerivation rec { - name = "mate-user-guide-${version}"; + pname = "mate-user-guide"; version = "1.22.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h"; }; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index f152515d60e..999bee2e5d1 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-user-share-${version}"; + pname = "mate-user-share"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; }; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 606a473cfaa..7775173611e 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-utils-${version}"; + pname = "mate-utils"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0768y6x33ljc9dxjlfmvplsn4lrxj5xhjddbyab9h6pqav8527rg"; }; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 171d8971c4e..cfbe33dd380 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "pluma-${version}"; + pname = "pluma"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "14d5c5fg31d7br9h1y3gdcr53j4sxlgybf326jvdcw8mgy91k3dg"; }; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index c3b39e85925..42a8e328a16 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { - name = "python-caja-${version}"; + pname = "python-caja"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zwdjvxci72j0181nlfq6912lw3aq8j3746brlp7wlzn22qp7b0k"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 79f0800ff34..2782decf6c4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xfce4-hardware-monitor-plugin"; version = "1.6.0"; src = fetchurl { - url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; + url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2"; sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index 7134d29c9ff..f67ba7af8aa 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: stdenv.mkDerivation rec { - name = "vala-panel-appmenu-xfce-${version}"; + pname = "vala-panel-appmenu-xfce"; version = "0.6.94"; src = "${fetchFromGitHub { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index 694f6772282..144291da86d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -3,7 +3,7 @@ xfce, libwnck3, libdbusmenu, gobject-introspection }: stdenv.mkDerivation rec { - name = "xfce4-vala-panel-appmenu-plugin-${version}"; + pname = "xfce4-vala-panel-appmenu-plugin"; version = "0.6.94"; src = fetchFromGitHub { diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index 2178226ab9d..827c5137bf8 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.0"; - name = "arduino-mk-${version}"; + pname = "arduino-mk"; src = fetchFromGitHub { owner = "sudar"; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index c48b36e5aba..accedf9a7af 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "abcl"; version = "1.5.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix index e8759ec073b..ed6b2b2ff24 100644 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -7,11 +7,11 @@ let sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f"; }; in stdenv.mkDerivation rec { - name = "apache-flex-sdk-${version}"; + pname = "apache-flex-sdk"; version = "4.16.1"; src = fetchurl { - url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz"; + url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p"; }; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index ad68382c13a..3058e926c3f 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -3,7 +3,7 @@ with builtins; stdenv.mkDerivation rec { - name = "arachne-pnr-${version}"; + pname = "arachne-pnr"; version = "2018.09.09"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index ce754813dda..3cbb7577f34 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "asn1c-${version}"; + pname = "asn1c"; version = "0.9.28"; src = fetchurl { diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix index 002f34daa13..f086c36468d 100644 --- a/pkgs/development/compilers/ats/default.nix +++ b/pkgs/development/compilers/ats/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "ats-${version}"; + pname = "ats"; version = "0.2.12"; src = fetchurl { diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index df61ea2b791..a1e5927e349 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - name = "ats2-${version}"; + pname = "ats2"; version = versionPkg; src = fetchurl { diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index 387ae906b88..34d1e64c484 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: stdenv.mkDerivation rec { - name = "avian-${version}"; + pname = "avian"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index bf2272a75c1..6e768e65091 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, gmp }: stdenv.mkDerivation rec { - name = "bigloo-${version}"; + pname = "bigloo"; version = "4.1a-2"; src = fetchurl { diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 1b53a142d12..f0299f7e41e 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = if emscriptenRev == null then "version_${version}" else emscriptenRev; - name = "binaryen-${version}"; + pname = "binaryen"; src = fetchFromGitHub { owner = "WebAssembly"; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 646963eedbc..6fac183125f 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { - name = "ccl-${version}"; + pname = "ccl"; version = "1.11.5"; src = fetchurl { diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 9216c779143..1bac7eb9b95 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "chez-scheme-${version}"; + pname = "chez-scheme"; version = "9.5.2"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index a1e29951ddb..664d8492113 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -56,7 +56,6 @@ let }; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clasp"; version = "0.8.99.20181128"; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index e9e97361825..d9f2a588d8f 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "closure-compiler-${version}"; + pname = "closure-compiler"; version = "20190215"; src = fetchurl { diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 237a80280ec..cc8e9f827b7 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: stdenv.mkDerivation rec { - name = "colm-${version}"; + pname = "colm"; version = "0.13.0.7"; src = fetchurl { - url = "https://www.colm.net/files/colm/${name}.tar.gz"; + url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz"; sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 33957b5a8dc..20506508b9c 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -11,7 +11,7 @@ let ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; in stdenv.mkDerivation rec { - name = "compcert-${version}"; + pname = "compcert"; version = "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 8be482e2150..00816fca36b 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "coreclr-${version}"; + pname = "coreclr"; version = "2.0.7"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 5b9e9010ef0..8aab9580232 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -16,7 +16,7 @@ let }: stdenv.mkDerivation rec { - name = "cudatoolkit-${version}"; + pname = "cudatoolkit"; inherit version runPatches; dontPatchELF = true; diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 514075651e1..839ee821d00 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dev86-${version}"; + pname = "dev86"; version = "0.16.21"; src = fetchurl { diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index b3b58e83621..332ded31df6 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "dmd-${version}"; + pname = "dmd"; inherit version; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 4635c6d0a4e..a22862c4292 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -28,11 +28,11 @@ let }; in stdenv.mkDerivation rec { - name = "eli-${version}"; + pname = "eli"; version = "4.8.1"; src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2"; sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; }; diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index 1128fbe64ec..cb960227beb 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = src.rev; - name = "eql-git-${version}"; + pname = "eql-git"; src = fetchgit { rev = "9097bf98446ee33c07bb155d800395775ce0d9b2"; url = "https://gitlab.com/eql/eql.git"; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 405aa8aa3ca..ef445faec92 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -4,7 +4,7 @@ mesa, xorg, openssl, unzip }: stdenv.mkDerivation rec { - name = "factor-lang-${version}"; + pname = "factor-lang"; version = "0.98"; rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix index 47b90469234..4b20c4051a8 100644 --- a/pkgs/development/compilers/fasm/default.nix +++ b/pkgs/development/compilers/fasm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (fasm-bin) version src meta; - name = "fasm-${version}"; + pname = "fasm"; nativeBuildInputs = [ fasm-bin ]; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index b516019ffc9..a2b73f61c27 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -4,7 +4,7 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { version = "3.0.0"; - name = "fpc-${version}"; + pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 3fe72e6b505..1b3f4d168ee 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -3,7 +3,7 @@ , libXi, xorgproto, libX11, libXext }: stdenv.mkDerivation rec { - name = "lazarus-${version}"; + pname = "lazarus"; version = "1.8.4"; src = fetchurl { diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 2de487cc9c8..bcb95d9ca90 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { - name = "fsharp-${version}"; + pname = "fsharp"; version = "4.0.1.1"; src = fetchurl { diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index e0094c73098..b41c32be18f 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }: stdenv.mkDerivation rec { - name = "fsharp-${version}"; + pname = "fsharp"; version = "4.1.7"; src = fetchurl { diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 94836e84fd6..9306eec817f 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "fstar-${version}"; + pname = "fstar"; version = "0.9.6.0"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 65cd67f527d..eca2cba7775 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, ... }: stdenv.mkDerivation rec { - name = "gambit-bootstrap-${version}"; + pname = "gambit-bootstrap"; version = "4.9.3"; src = fetchurl { diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 9e5a172eed8..940dec0338c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses5, python27 }: stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; version = "6-2017-q2-update"; subdir = "6-2017q2"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 80e042b5c2e..90f9d5957bb 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; version = "7-2018-q2-update"; subdir = "7-2018q2"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index ee57dcc8c14..b6420827c85 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; version = "8-2018-q4-major"; subdir = "8-2018q4"; diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 16450cf24ab..1c3df80645a 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -8,7 +8,7 @@ assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; stdenv.mkDerivation rec { - name = "gcl-${version}"; + pname = "gcl"; version = "2.6.13pre50"; src = fetchgit { diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 50d397d2cd4..e3c2d0e09de 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -8,12 +8,12 @@ assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; stdenv.mkDerivation rec { - name = "gcl-${version}"; + pname = "gcl"; version = "2.6.12"; src = fetchurl { sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f"; - url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz"; + url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz"; }; patches = [(fetchurl { diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 3c46dfc107b..79ad90e77a6 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }: stdenv.mkDerivation rec { - name = "glslang-${version}"; + pname = "glslang"; version = "7.11.3113"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index ae27964ae8f..df5202cb1c2 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -6,7 +6,7 @@ let lib = stdenv.lib; in stdenv.mkDerivation rec { - name = "gnu-cobol-${version}"; + pname = "gnu-cobol"; inherit version; src = fetchurl { diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 41c325c2b1a..1035091654a 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -18,7 +18,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library. in stdenv.mkDerivation rec { version = "3.2.5"; - name = "gnu-smalltalk-${version}"; + pname = "gnu-smalltalk"; src = fetchurl { url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 69507685f29..e051d41993c 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-jsonnet-${version}"; + pname = "go-jsonnet"; version = "0.13.0"; goPackagePath = "github.com/google/go-jsonnet"; diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 39de36293c8..3b924f58bfe 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; + pname = "go"; version = "1.10.8"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 95312f9e1ea..97c243439e8 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; + pname = "go"; version = "1.4-bootstrap-20161024"; revision = "79d85a4965ea7c46db483314c3981751909d7883"; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index be03e1aeeed..61e3b6c16ae 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -214,7 +214,7 @@ in rec { jvmci8 = stdenv.mkDerivation rec { version = "19.2-b01"; - name = "jvmci-${version}"; + pname = "jvmci"; src = fetchFromGitHub { owner = "graalvm"; repo = "graal-jvmci-8"; @@ -280,7 +280,7 @@ in rec { graalvm8 = stdenv.mkDerivation rec { inherit version; - name = "graal-${version}"; + pname = "graal"; src = fetchFromGitHub { owner = "oracle"; repo = "graal"; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 010dacd0c71..24e88f9ee2e 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "hhvm-${version}"; + pname = "hhvm"; version = "3.23.2"; # use git version since we need submodules diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 2b589125604..b1b31aecae1 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "iasl-${version}"; + pname = "iasl"; version = "20181213"; src = fetchurl { diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index 73dd90ab4a1..a166954dc21 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { - name = "icedtea-web-${version}"; + pname = "icedtea-web"; version = "1.8.3"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; }; diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index f601dc254a4..6640c4aa89a 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "intercal-${version}"; + pname = "intercal"; version = "0.30"; src = fetchurl { - url = "http://catb.org/esr/intercal/${name}.tar.gz"; + url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz"; sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk"; }; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 1cbe95232eb..f240deda0bf 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit testedTargets; - name = "ispc-${version}"; + pname = "ispc"; src = fetchFromGitHub { owner = "ispc"; diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index 06f321bc39c..f49d3d6e210 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "javacard-devkit"; version = "2.2.2"; uscoreVersion = builtins.replaceStrings ["."] ["_"] version; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index d407fb46b9b..1349b7f0ddd 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -8,7 +8,6 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; version = "164"; - name = pname + "-" + version; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 7bbad0e1201..460ff405b94 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jsonnet-${version}"; + pname = "jsonnet"; version = "0.13.0"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index d8d521952bd..c0414c6259f 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -77,10 +77,9 @@ in stdenv.mkDerivation rec { pname = "julia"; inherit version; - name = "${pname}-${version}"; src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = src_sha256; }; prePatch = '' diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index 9800b33e7a9..b2db09e1c18 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jwasm-${version}"; + pname = "jwasm"; version = "git-2017-11-22"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 32659d5be56..754ab020d51 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -4,7 +4,7 @@ let version = "1.3.41"; in stdenv.mkDerivation rec { inherit version; - name = "kotlin-${version}"; + pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 19833e4d3d4..9660be4df11 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,7 +1,7 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index be18a315f12..da2a5cfb58a 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,7 +1,7 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 989529ff8cc..e9cc6dfc1db 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 25db273d7e3..a846221638a 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index efbf8561b7f..1c0bdf47987 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -3,7 +3,7 @@ let rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; in stdenv.mkDerivation rec { - name = "manticore-${version}"; + pname = "manticore"; version = "2018.09.29"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index b7fc3e4dd77..0327e0dc215 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -2,7 +2,7 @@ , readline }: stdenv.mkDerivation rec { - name = "mercury-${version}"; + pname = "mercury"; version = "14.01.1"; src = fetchurl { diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index f15a7624327..a18202b9f88 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, vim, makeWrapper }: stdenv.mkDerivation rec { - name = "microscheme-${version}"; + pname = "microscheme"; version = "0.9.3"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz"; sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"; }; diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 1c8e9fb7eb2..2fa30d5578a 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation rec { version = "0.5.0"; - name = "mint-${version}"; + pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 72626ec0014..405846343cf 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: with stdenv.lib; stdenv.mkDerivation rec { - name = "mkcl-${version}"; + pname = "mkcl"; version = "1.1.11"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix index 0589733cb3c..2b4998f91c9 100644 --- a/pkgs/development/compilers/mlton/20180207-binary.nix +++ b/pkgs/development/compilers/mlton/20180207-binary.nix @@ -3,15 +3,15 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in stdenv.mkDerivation rec { - name = "mlton-${version}"; + pname = "mlton"; version = "20180207"; src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz"; sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz"; sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; }) else diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 616ec420d2d..193e45bf55e 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; version = "3.6-mono-2017-02-15"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index 89726f20c6b..bc79a64fd77 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gmp, perl }: stdenv.mkDerivation rec { - name = "mosml-${version}"; + pname = "mosml"; version = "2.10.1"; buildInputs = [ gmp perl ]; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index bfb3c154a3c..8d92bc4eba2 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "nasm-${version}"; + pname = "nasm"; version = "2.14.02"; src = fetchFromRepoOrCz { repo = "nasm"; - rev = name; + rev = "${pname}-${version}"; sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; }; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index e2aa5736c7a..74ccaac388f 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "neko-${version}"; + pname = "neko"; version = "2.2.0"; src = fetchurl { diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index d1c0db25351..ca35026b493 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -26,7 +26,7 @@ let }); in stdenv.mkDerivation rec { - name = "nextpnr-${version}"; + pname = "nextpnr"; version = "2019.04.19"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 6bd4af05da3..fa49bf9dd73 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { date = "April2012"; - name = "nvidia-cg-toolkit-${version}"; + pname = "nvidia-cg-toolkit"; src = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 0d171a474a2..8fd6f33740e 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,6 +1,6 @@ { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { - name = "obliv-c-${version}"; + pname = "obliv-c"; version = "0.0pre20180624"; buildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index 4337de702e1..cd621c131ff 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.08.0"; builder = ./builder.sh; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.tar.gz"; + url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz"; sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx"; }; configureScript = ./configure-3.08.0; diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 99a65dec150..556aefd3704 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.10.0"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index e65510c172e..4be41490534 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.11.2"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2"; sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; }; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 8636f670059..edb3acdbdb1 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.12.1"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2"; sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; }; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 0a30ef1352c..2669e8224bf 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "4.00.1"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2"; sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index a933151de12..fb507b9836a 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "ber-metaocaml-${version}"; + pname = "ber-metaocaml"; version = metaocamlPatch; src = fetchurl { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { postConfigure = '' tar -xvzf $metaocaml - cd ${name} + cd ${pname}-${version} make patch cd .. ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { make installopt mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml - cd ${name} + cd ${pname}-${version} make all ''; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; checkPhase = '' - cd ${name} + cd ${pname}-${version} make test make test-compile make test-native diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index e9adbeff490..881748c36ea 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { - name = "metaocaml-${version}"; + pname = "metaocaml"; version = "3.09-alpha-30"; src = fetchurl { diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 06ed7c51e9a..da1df6f30bb 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "opa"; version = "4310"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "MLstate"; diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index 690707265b4..31e3800a6c9 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "openspin-${version}"; + pname = "openspin"; version = "unstable-2018-10-02"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index ccd149bbb40..0625e2d8bbc 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, coreutils, which }: stdenv.mkDerivation rec { - name = "owl-lisp-${version}"; + pname = "owl-lisp"; version = "0.1.16"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index b7feed84c37..eef972a2cc3 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { - name = "polyml-${version}"; + pname = "polyml"; version = "5.7.1"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 91a3bb45352..5ab13d5f761 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { - name = "polyml-${version}"; + pname = "polyml"; version = "5.8"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 2aab6a99a1c..6719293af2a 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation rec { - name = "pony-stable-${version}"; + pname = "pony-stable"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index eee4507d6ce..3856ced250e 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -5,7 +5,7 @@ # in a published version. stdenv.mkDerivation rec { - name = "rgbds-${version}"; + pname = "rgbds"; version = "0.3.8"; src = fetchFromGitHub { owner = "rednex"; diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 056ad745460..0d2a10b6a99 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -43,7 +43,7 @@ let in assert builtins.hasAttr stdenv.hostPlatform.system options; stdenv.mkDerivation rec { - name = "sbcl-bootstrap-${version}"; + pname = "sbcl-bootstrap"; version = cfg.version; src = fetchurl { diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e2cc7adc26e..e5b36ad7890 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation rec { - name = "sbcl-${version}"; + pname = "sbcl"; version = "1.5.3"; src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj"; }; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index ab42eae31a6..5a01e295e49 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.14.0-RC1"; - name = "dotty-bare-${version}"; + pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 4fd46c35a0a..1a450af2b94 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "sdcc-${version}"; + pname = "sdcc"; version = "3.9.0"; src = fetchurl { diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index a6abe6791d7..efcaf56110d 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -3,7 +3,7 @@ bison, flex, libGLU, pythonPackages }: stdenv.mkDerivation rec { - name = "seexpr-${version}"; + pname = "seexpr"; version = "2.11"; src = fetchFromGitHub { owner = "wdas"; diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index e9c6b706e5a..c9b4f9639d0 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "serpent-${version}"; + pname = "serpent"; # I can't find any version numbers, so we're just using the date # of the last commit. diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 75717b5ba09..82cccc3befc 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -24,7 +24,7 @@ let sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2"; }; in stdenv.mkDerivation rec { - name = "shaderc-${version}"; + pname = "shaderc"; version = "2019.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 21cfd408298..e2103fb718f 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: stdenv.mkDerivation rec { - name = "smlnj-bootstrap-${version}"; + pname = "smlnj-bootstrap"; version = "110.91"; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 941f92fd322..6ab55fbd5c0 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "solc-${version}"; + pname = "solc"; version = "0.5.10"; # upstream suggests avoid using archive generated by github diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 219d5307790..a39a6c4a2e4 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -9,7 +9,7 @@ let toolsPath = stdenv.lib.makeBinPath [ mcpp ]; in stdenv.mkDerivation rec { - name = "souffle-${version}"; + pname = "souffle"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 25ea47978fc..c8379fe9090 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -2,7 +2,7 @@ , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: stdenv.mkDerivation rec { - name = "squeak-${version}"; + pname = "squeak"; version = "4.10.2.2614"; src = fetchurl { diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index b1f9ee799e5..dea6df1b7aa 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "terra-git-${version}"; + pname = "terra-git"; version = "1.0.0-beta1"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index a5c3db65857..338ba931249 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "tcc-${version}"; + pname = "tcc"; version = "0.9.27"; src = fetchFromRepoOrCz { diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 2300d63015b..01d4972a55d 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "urweb-${version}"; + pname = "urweb"; version = "20190217"; src = fetchurl { - url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s"; }; diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix index 8cb1e8e5f2c..3196592da48 100644 --- a/pkgs/development/compilers/wcc/default.nix +++ b/pkgs/development/compilers/wcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: stdenv.mkDerivation rec { - name = "wcc-unstable-${version}"; + pname = "wcc-unstable"; version = "2018-04-05"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 88666148da3..3d955c4394b 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation rec { pname = "X11basic"; version = "1.26"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "kollokollo"; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 3ad0bc25787..1cc96455be7 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.3.3"; - name = "yap-${version}"; + pname = "yap"; src = fetchurl { - url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; + url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz"; sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; }; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index afb1bcd5a0b..e7f70136675 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -7,7 +7,7 @@ with builtins; stdenv.mkDerivation rec { - name = "yosys-${version}"; + pname = "yosys"; version = "2019.04.23"; srcs = [ diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index cc42ee1dd3f..f0e0693d12c 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; - name = "zulu-${version}"; + pname = "zulu"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index a43992164d2..d4c4c1f0ac3 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; - name = "zulu-${version}"; + pname = "zulu"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index f03e6e42739..d1e7ac882d7 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -7,10 +7,11 @@ , meta ? {}, ... } @ args: pkgs.stdenv.mkDerivation ( - args // + args // { - name = "emscripten-${args.name}"; + pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}"; + version = args.version or (builtins.parseDrvName args.name).version; buildInputs = [ emscripten python ] ++ buildInputs; nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 592e6ad8999..8377dad690f 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: stdenv.mkDerivation rec { - name = "guile-cairo-${version}"; + pname = "guile-cairo"; version = "1.10.0"; src = fetchurl { - url = "mirror://savannah/guile-cairo/${name}.tar.gz"; + url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"; }; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 26fffac0a13..80ce29799a8 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -5,12 +5,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "guile-gnome-platform"; version = "2.16.4"; src = fetchurl { - url = "mirror://gnu/guile-gnome/${pname}/${name}.tar.gz"; + url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; }; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 35bcd7bfc2f..6ffcc153ec4 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "guile-reader-${version}"; + pname = "guile-reader"; version = "0.6.2"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz"; + url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz"; sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"; }; diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index a606b3ecf28..41bfb2ef62a 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "guile-sdl"; version = "0.5.2"; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; }; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index a88d07d1655..d53337aca1a 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -11,7 +11,7 @@ revs = { "8.2" = "8.2"; }; in stdenv.mkDerivation rec { - name = "acl2-${version}"; + pname = "acl2"; version = "8.2"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 85794b09ae0..744106bce5d 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, gnugrep }: stdenv.mkDerivation rec { - name = "bats-${version}"; + pname = "bats"; version = "1.1.0"; src = fetchzip { diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index b597ba6fe78..918c577356c 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.30"; - name = "clips-${version}"; + pname = "clips"; src = fetchurl { url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z"; sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy"; diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 16f3e7f73e2..ab8e616ac6d 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -128,7 +128,7 @@ let # packageJSON=./package.json; in stdenv.mkDerivation rec { inherit version; - name = "lumo-${version}"; + pname = "lumo"; src = fetchurl { url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz"; diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index f79c30740a1..f968e04bbe9 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "duktape-${version}"; + pname = "duktape"; version = "2.4.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 857a1e5cd8d..744a0f76ff0 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: stdenv.mkDerivation rec { - name = "falcon-${version}"; + pname = "falcon"; version = "2013-09-19"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index a0d20b7ebe4..71542046af9 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gauche-${version}"; + pname = "gauche"; version = "0.9.8"; src = fetchurl { diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index cd7dacf6527..7f15c2b3184 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, gettext, ncurses }: stdenv.mkDerivation rec { - name = "gnu-apl-${version}"; + pname = "gnu-apl"; version = "1.8"; src = fetchurl { diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index efbd72dcefa..793fa0a1b4d 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -3,7 +3,7 @@ # at runtime, need jdk stdenv.mkDerivation rec { - name = "groovy-${version}"; + pname = "groovy"; version = "2.5.7"; src = fetchurl { diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 56becd3d6c9..0d3fe100329 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: stdenv.mkDerivation rec { - name = "icon-lang-${version}"; + pname = "icon-lang"; version = "9.5.1"; src = fetchFromGitHub { owner = "gtownsend"; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 11feb1170c2..791ac6dd338 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, readline, libedit, bc }: stdenv.mkDerivation rec { - name = "j-${version}"; + pname = "j"; version = "807"; jtype = "release"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 704e3eb4031..91b4c0b9a9e 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -4,7 +4,7 @@ let makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL"); in stdenv.mkDerivation rec { - name = "jimtcl-${version}"; + pname = "jimtcl"; version = "0.78"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index ba65c00f1e9..4ab9427934d 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "joker-${version}"; + pname = "joker"; version = "0.12.4"; goPackagePath = "github.com/candid82/joker"; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 2e53ae1694f..e20cb3d7e55 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -4,7 +4,7 @@ let # The version number here is whatever is reported by the RUBY_VERSION string rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { - name = "jruby-${version}"; + pname = "jruby"; version = "9.2.7.0"; diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index f822fdd9c8f..0e1734565f2 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "jython-${version}"; + pname = "jython"; version = "2.7.1"; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 03c836d9251..a9922a38765 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "kona-${version}"; + pname = "kona"; version = "3.21"; src = fetchurl { url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz"; diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 284773fe660..3ef239e89a9 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lolcode-${version}"; + pname = "lolcode"; version = "0.11.2"; src = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 7aa41e95cc9..0ac1fa30e2f 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; - name = "lua-filesystem-${version}"; + pname = "lua-filesystem"; isLibrary = true; src = fetchurl { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index d8a789e9209..f0eb1becc57 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lua5 }: stdenv.mkDerivation rec { - name = "lua-sockets-${version}"; + pname = "lua-sockets"; version = "2.0.2"; src = fetchurl { url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index e8e23cee830..cd325c94948 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "metamath-${version}"; + pname = "metamath"; version = "0.172"; buildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index ceea3932063..aef23ad6881 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "mujs-${version}"; + pname = "mujs"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index d3dda7655c2..cc9f6fcc3c9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -19,9 +19,9 @@ in stdenv.mkDerivation rec { version = "5.1.0"; - name = "octave-${version}"; + pname = "octave"; src = fetchurl { - url = "mirror://gnu/octave/${name}.tar.gz"; + url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3"; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { # Keep a copy of the octave tests detailed results in the output # derivation, because someone may care postInstall = '' - cp test/fntests.log $out/share/octave/${name}-fntests.log || true + cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true ''; passthru = { diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 62ab7b02585..6e57ad250bb 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, readline }: stdenv.mkDerivation rec { - name = "picoc-${version}"; + pname = "picoc"; version = "2015-05-04"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 5adf41a0f3b..dc3b08acbd9 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "picoLisp-${version}"; + pname = "picoLisp"; version = "19.6"; src = fetchurl { - url = "https://www.software-lab.de/${name}.tgz"; + url = "https://www.software-lab.de/${pname}-${version}.tgz"; sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq"; }; buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index d1f2edce936..99c763615e3 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -30,7 +30,7 @@ let bin-path = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") [ gcc ]); build = {flags, target}: stdenv.mkDerivation rec { - name = "pixie-${version}"; + pname = "pixie"; version = "0-r${commit-count}-${variant}"; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = libs; diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index 9e38e825074..0b9ddc0bb34 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "python-boot-${version}"; + pname = "python-boot"; version = "2.7.12"; libPrefix = "python2.7"; diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 779039c6d6a..3b41e14be85 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: stdenv.mkDerivation rec { - name = "qnial-${version}"; + pname = "qnial"; version = "6.3"; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index e37c43a0bd6..35bd1729866 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -45,7 +45,7 @@ let in stdenv.mkDerivation rec { - name = "racket-${version}"; + pname = "racket"; version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { inherit sha256; } )) { - inherit name; + inherit ;name = "${pname}-${version}"; sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl"; }; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 1244ad5ecd2..ab5493e8a9d 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ , CoreServices, ApplicationServices }: stdenv.mkDerivation rec { - name = "rakudo-star-${version}"; + pname = "rakudo-star"; version = "2017.01"; src = fetchurl { - url = "http://rakudo.org/downloads/star/${name}.tar.gz"; + url = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz"; sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq"; }; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 4d98f18eee4..274b70b2c79 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }: stdenv.mkDerivation rec { - name = "rebol-nightly-${version}"; + pname = "rebol-nightly"; version = "3-alpha"; src = fetchFromGitHub { rev = "bd45d0de512ff5953e098301c3d610f6024515d6"; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 56ff0283174..2121f54a3b1 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "red-${version}"; + pname = "red"; version = "0.6.3"; src = fetchFromGitHub { rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { rm -rf $out/opt/red/rebol install -Dm755 console $out/bin/red install -Dm644 BSD-3-License.txt \ - $out/share/licenses/${name}/BSD-3-License.txt + $out/share/licenses/${pname}-${version}/BSD-3-License.txt install -Dm644 BSL-License.txt \ - $out/share/licenses/${name}/BSL-License.txt + $out/share/licenses/${pname}-${version}/BSL-License.txt install -Dm644 docs/red-system-quick-test.html \ - $out/share/doc/${name}/red-system-quick-test.html + $out/share/doc/${pname}-${version}/red-system-quick-test.html install -Dm644 docs/red-system-specs.html \ - $out/share/doc/${name}/red-system-specs.html + $out/share/doc/${pname}-${version}/red-system-specs.html # PathElf patchelf --set-interpreter \ diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix index 1d67193a73c..ec19b0679f4 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/development/interpreters/regina/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "Regina-REXX-${version}"; + pname = "Regina-REXX"; version = "3.9.1"; src = fetchurl { - url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz"; sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx"; }; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index f438e9fb13c..db68578d62a 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -6,7 +6,7 @@ with pythonPackages; stdenv.mkDerivation rec { - name = "renpy-${version}"; + pname = "renpy"; version = "7.3.2"; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 594bbc05b7c..c6c8caa7cf3 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # $ Self -s myimage.snap # version = "4.5.0"; - name = "self-${version}"; + pname = "self"; src = fetchgit { url = "https://github.com/russellallen/self"; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 9c81b230ada..e00af621347 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,7 +1,7 @@ { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; version = "1.8.5"; src = fetchurl { diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 2c45ba58976..89bbd713a5c 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "38.8.0"; - name = "spidermonkey-${version}"; + pname = "spidermonkey"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 057375182f5..2cacb339d75 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -8,7 +8,7 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { - name = "supercollider-${version}"; + pname = "supercollider"; version = "3.10.2"; diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index f2c5fd938ce..ca897ec692c 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tinyscheme-${version}"; + pname = "tinyscheme"; version = "1.41"; src = fetchurl { - url = "mirror://sourceforge/tinyscheme/${name}.tar.gz"; + url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz"; sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a"; }; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 77154b54fd8..30ea124cf4b 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, libX11, libXt }: stdenv.mkDerivation rec { - name = "unicon-lang-${version}"; + pname = "unicon-lang"; version = "11.7"; src = fetchurl { url = "http://unicon.org/dist/uni-2-4-2010.zip"; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index c67d7270548..69cb24fc0b0 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { - name = "postgresql-jdbc-${version}"; + pname = "postgresql-jdbc"; version = "42.2.5"; src = fetchMavenArtifact { diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index fbf9615f88a..f251d2bed0c 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "CoinMP-${version}"; + pname = "CoinMP"; version = "1.8.4"; src = fetchurl { - url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz"; sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 9522038df6a..418900ddeeb 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; - name = "LASzip-${version}"; + pname = "LASzip"; src = fetchurl { url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index a8d5d608f89..610f1b768f2 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "SDL-${version}"; + pname = "SDL"; version = "1.2.15"; src = fetchurl { - url = "https://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 94aca192852..d538a0969b0 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -23,11 +23,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "SDL2-${version}"; + pname = "SDL2"; version = "2.0.9"; src = fetchurl { - url = "https://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95"; }; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 803cc97a8ae..d57bb6cbc94 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,12 +1,11 @@ { stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "SDL2_gfx"; version = "1.0.4"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz"; + url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz"; sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index ba33b1fbc1d..326d9d66264 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: stdenv.mkDerivation rec { - name = "SDL2_image-${version}"; + pname = "SDL2_image"; version = "2.0.5"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; }; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 61e15d621bc..826cf793cd2 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -4,11 +4,11 @@ , enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { - name = "SDL2_mixer-${version}"; + pname = "SDL2_mixer"; version = "2.0.4"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 1cb74ac1b2d..309102e70b5 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,11 +1,11 @@ { stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "SDL2_net-${version}"; + pname = "SDL2_net"; version = "2.0.1"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index b219922223f..50e47bc1d36 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ { stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { - name = "SDL2_ttf-${version}"; + pname = "SDL2_ttf"; version = "2.0.15"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; }; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 68c8c16ed4e..74a31d94687 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_gfx-${version}"; + pname = "SDL_gfx"; version = "2.0.26"; src = fetchurl { - url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; + url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz"; sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 961a0a7f5aa..8e3078563e2 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { - name = "SDL_image-${version}"; + pname = "SDL_image"; version = "1.2.12"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 887319062be..427439f496e 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "SDL_mixer"; version = "1.2.12"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz"; + url = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz"; sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index f1c5a5462d1..6ac91a6d129 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -4,10 +4,8 @@ stdenv.mkDerivation rec { pname = "SDL_net"; version = "1.2.8"; - name = "${pname}-${version}"; - src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 6279bfcb428..7b8fb67a30f 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel }: stdenv.mkDerivation rec { - name = "SDL_sixel-${version}"; + pname = "SDL_sixel"; version = "1.2-nightly"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 0e717c53035..94534ecd699 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }: stdenv.mkDerivation rec { - name = "SDL_sound-${version}"; + pname = "SDL_sound"; version = "1.0.3"; src = fetchurl { - url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz"; + url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz"; sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; }; diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 7f276387c83..9695d51ed89 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_stretch-${version}"; + pname = "SDL_stretch"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2"; sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw"; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index cf6b53021f7..96b60b1061f 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, SDL, freetype }: stdenv.mkDerivation rec { - name = "SDL_ttf-${version}"; + pname = "SDL_ttf"; version = "2.0.11"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; }; diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 4e1da866622..5795d0baa62 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "abseil-cpp-${version}"; + pname = "abseil-cpp"; date = "20190322"; rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a"; version = "${date}-${rev}"; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index a50c92924e9..0aace12569a 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }: stdenv.mkDerivation rec { - name = "accounts-qt-${version}"; + pname = "accounts-qt"; version = "1.15"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index e0c46acb630..af94de525f7 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libtool, perl }: stdenv.mkDerivation rec { - name = "ace-${version}"; + pname = "ace"; version = "6.5.5"; src = fetchurl { diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 5170e384f77..f0d87c81133 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.7.18"; - name = "afflib-${version}"; + pname = "afflib"; src = fetchFromGitHub { owner = "sshock"; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 22e91ee61d7..a1d4c225909 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "aften-${version}"; + pname = "aften"; version = "0.0.8"; src = fetchurl { - url = "mirror://sourceforge/aften/${name}.tar.bz2"; + url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; }; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 5c25da92055..1e9496c1a1c 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "alembic-${version}"; + pname = "alembic"; version = "1.7.11"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index f98c8fa480e..407aa557ea2 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -4,11 +4,11 @@ }: mkDerivation rec { - name = "alkimia-${version}"; + pname = "alkimia"; version = "8.0.1"; src = fetchurl { - url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m"; }; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 9f8ca69a70f..46e3d02963d 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "allegro-${version}"; + pname = "allegro"; version = "5.2.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index eca32b740e3..6b44ec1b598 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -4,11 +4,11 @@ , libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { - name = "allegro-${version}"; + pname = "allegro"; version="4.4.2"; src = fetchurl { - url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index 95828c44f85..a4f3b714e1c 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, openal }: stdenv.mkDerivation rec { - name = "alure-${version}"; + pname = "alure"; version = "1.2"; src = fetchurl { diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index 15331c22599..7525b3baab0 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "amrwb-${version}"; + pname = "amrwb"; version = "11.0.0.0"; srcAmr = fetchurl { diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index fc79cae36f8..9fc11555b69 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apache-activemq-${version}"; + pname = "apache-activemq"; version = "5.14.5"; src = fetchurl { sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54"; - url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz"; + url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 429da8de835..62d72844386 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "appstream-${version}"; + pname = "appstream"; version = "0.12.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 0013764d779..307f57d20cf 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -3,7 +3,7 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here stdenv.mkDerivation rec { - name = "appstream-qt-${version}"; + pname = "appstream-qt"; inherit (appstream) version src prePatch; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index b26291469e7..8be98f061a8 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -5,14 +5,14 @@ let inherit ((import ./sources.nix).aqbanking) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "aqbanking-${version}"; + pname = "aqbanking"; inherit version; src = let qstring = "package=03&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index bb337e471cf..061ed77849f 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -13,14 +13,14 @@ let inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "gwenhywfar-${version}"; + pname = "gwenhywfar"; inherit version; src = let qstring = "package=01&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index 9a0b70e0d97..23c300ab48a 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -3,14 +3,14 @@ let inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "libchipcard-${version}"; + pname = "libchipcard"; inherit version; src = let qstring = "package=02&release=${releaseId}&file=01"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index eb58003a5f6..ac67a101bc5 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "arb"; version = "2.16.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index f2b038aa379..27204e8e339 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "9.600.5"; - name = "armadillo-${version}"; + pname = "armadillo"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7660ea81eaf..f763f98799d 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - name = "arrow-cpp-${version}"; + pname = "arrow-cpp"; version = "0.14.1"; src = fetchurl { diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 24e06b0d65a..d5a98b0ce92 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { - name = "assimp-${version}"; + pname = "assimp"; version = "4.1.0"; src = fetchFromGitHub{ diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 6c3f3aa9fa2..00465a617f4 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,12 +16,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "at-spi2-atk"; version = "2.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index e5d5313eeb1..4e9a29b45b7 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -17,12 +17,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "at-spi2-core"; version = "2.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"; }; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index b79d85bcd7c..02409d6ace0 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0-beta.1"; - name = "JamomaCore-${version}"; + pname = "JamomaCore"; src = fetchFromGitHub { owner = "jamoma"; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 3a4c363e23c..2fde40327e9 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libsndfile }: stdenv.mkDerivation rec { - name = "libbs2b-${version}"; + pname = "libbs2b"; version = "3.1.0"; src = fetchurl { - url = "mirror://sourceforge/bs2b/${name}.tar.bz2"; + url = "mirror://sourceforge/bs2b/${pname}-${version}.tar.bz2"; sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 0f9f5f5aac6..0e0f0c5d425 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { - name = "libmysofa-${version}"; + pname = "libmysofa"; version = "0.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index fe0e0854a32..1c5a5302d71 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "libsmf-${version}"; + pname = "libsmf"; src = fetchurl { - url = "https://github.com/stump/libsmf/archive/${name}.tar.gz"; + url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz"; sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 373d50a0a43..04752fd2951 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { - name = "lilv-${version}"; + pname = "lilv"; version = "0.24.4"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index d026dd258bc..50593cab647 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lv2-${version}"; + pname = "lv2"; version = "1.16.0"; src = fetchurl { - url = "http://lv2plug.in/spec/${name}.tar.bz2"; + url = "http://lv2plug.in/spec/${pname}-${version}.tar.bz2"; sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy"; }; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 81cc868f52c..978376eb4fa 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lv2-unstable-${version}"; + pname = "lv2-unstable"; version = "2017-07-08"; src = fetchgit { diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 78763ca29e2..826c36db1a6 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lvtk-${version}"; + pname = "lvtk"; version = "1.2.0"; src = fetchurl { diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index ddd3940098a..7cb151e4203 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }: stdenv.mkDerivation rec { - name = "ntk-${version}"; + pname = "ntk"; version = "1.3.1000"; src = fetchFromGitHub { owner = "original-male"; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 2adec665e1c..dad36209ed8 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.1.0"; - name = "rtaudio-${version}"; + pname = "rtaudio"; src = fetchFromGitHub { owner = "thestk"; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 41bb9ca9f11..6cd7d06da9d 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; - name = "rtmidi-${version}"; + pname = "rtmidi"; src = fetchFromGitHub { owner = "thestk"; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 09a6230184a..21d6cdfb5d4 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }: stdenv.mkDerivation rec { - name = "sratom-${version}"; + pname = "sratom"; version = "0.6.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; }; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 320fc41f76c..d91784ce14f 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , alsaLib, }: stdenv.mkDerivation rec { - name = "zita-alsa-pcmi-${version}"; + pname = "zita-alsa-pcmi"; version = "0.3.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"; }; diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 4fc5c12ccc4..308aa020e36 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fftwFloat }: stdenv.mkDerivation rec { - name = "zita-convolver-${version}"; + pname = "zita-convolver"; version = "4.0.3"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs"; }; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index e9cccab39f0..98e272d5dab 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zita-resampler-${version}"; + pname = "zita-resampler"; version = "1.6.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"; }; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7233a187053..1cc65b53b3e 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "aws-sdk-cpp-${version}"; + pname = "aws-sdk-cpp"; version = "1.7.90"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index 42621a1792c..af727e394d1 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "backward-${version}"; + pname = "backward"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 9d5063d8f07..de436864eda 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -3,7 +3,7 @@ , xorgserver, dbus, python2, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "bamf-${version}"; + pname = "bamf"; version = "0.5.4"; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 05ff5593205..05203d6c233 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "beignet-${version}"; + pname = "beignet"; version = "unstable-2018.08.20"; src = fetchFromGitHub { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; passthru.utests = stdenv.mkDerivation rec { - name = "beignet-utests-${version}"; + pname = "beignet-utests"; inherit version src; preConfigure = '' diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index e6702d0db64..16be4600ec6 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "biblesync-${version}"; + pname = "biblesync"; version = "1.1.2"; src = fetchurl{ - url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz"; + url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz"; sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8"; }; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 812ad546f86..c7520c89ef5 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -3,7 +3,7 @@ , utillinux, yodl }: stdenv.mkDerivation rec { - name = "bobcat-${version}"; + pname = "bobcat"; version = "4.08.03"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index 68f5d7afcf4..c2b5c7b6062 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boehm-gc-${version}"; + pname = "boehm-gc"; version = "7.6.6"; src = fetchurl { diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index a241b42e187..cf76d9e7d24 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boehm-gc-${version}"; + pname = "boehm-gc"; version = "8.0.4"; src = fetchurl { diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index ee62d5423a1..7db73f5ad47 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -2,7 +2,7 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation rec { - name = "boringssl-${version}"; + pname = "boringssl"; version = "2017-02-23"; src = fetchgit { diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 2580b959bf2..18b1b47f6d3 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "botan-${version}"; + pname = "botan"; version = "${baseVersion}.${revision}"; src = fetchurl { diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 102e7bfcc12..328ac434d85 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -2,7 +2,7 @@ , libXi, pkgconfig }: stdenv.mkDerivation rec { - name = "box2d-${version}"; + pname = "box2d"; version = "2.3.1"; src = fetchurl { diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index b4a57396cc8..ba7b51bb0e4 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "brigand-${version}"; + pname = "brigand"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index b4a2133f7d8..f6041802a9c 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bullet-${version}"; + pname = "bullet"; version = "2.87"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 12fc1834e90..97fe7e51299 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bullet-${version}"; + pname = "bullet"; version = "2019-03-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 1e2bda285a7..e763afc4a43 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { - name = "bwidget-${version}"; + pname = "bwidget"; version = "1.9.13"; src = fetchurl { diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 3603667fbf2..396e419406a 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "c-blosc-${version}"; + pname = "c-blosc"; version = "1.16.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 4a1ea394207..890e2996f5d 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "actor-framework-${version}"; + pname = "actor-framework"; version = "0.17.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index b175250872f..9020ccf08b5 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "capnproto-${version}"; + pname = "capnproto"; version = "0.7.0"; src = fetchurl { diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index c02633d880c..956fd74da58 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "capstone-${version}"; + pname = "capstone"; version = "4.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index d83060fc24d..92e5c04e032 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch-${version}"; + pname = "catch"; version = "1.12.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 2d0fd4cb1bc..d7876affe2f 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch2-${version}"; + pname = "catch2"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 2930ffa61e3..457b51dea7a 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cctz-${version}"; + pname = "cctz"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 68d34c75c01..5f6b3766012 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "cddlib-${version}"; + pname = "cddlib"; version = "0.94j"; src = fetchFromGitHub { owner = "cddlib"; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 4c311f07e01..8487435981c 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "cdk-${version}"; + pname = "cdk"; version ="5.0-20190224"; buildInputs = [ diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 7e5c768036f..eaeb6bf8e43 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: stdenv.mkDerivation rec { - name = "cegui-${version}"; + pname = "cegui"; version = "0.8.7"; src = fetchurl { - url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2"; + url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2"; sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; }; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 52e0f06eeec..3ce8c4ef080 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -11,7 +11,7 @@ assert runTests -> gflags != null; stdenv.mkDerivation rec { - name = "ceres-solver-${version}"; + pname = "ceres-solver"; version = "1.14.0"; src = fetchurl { diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index df75d3a1f1d..39ed74d0075 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo, allegro, perl, libX11 }: stdenv.mkDerivation rec { - name = "cgui-${version}"; + pname = "cgui"; version="2.1.0"; src = fetchurl { - url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz"; sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s"; }; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index ae8b6ca18df..08610d1e9af 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "check-${version}"; + pname = "check"; version = "0.12.0"; src = fetchurl { diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index f460b69a4f8..76f722f31aa 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "chipmunk-${version}"; + pname = "chipmunk"; majorVersion = "7"; version = "${majorVersion}.0.1"; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 02420735ff7..fd868884f98 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, boost, ffmpeg }: stdenv.mkDerivation rec { - name = "chromaprint-${version}"; + pname = "chromaprint"; version = "1.3.2"; src = fetchurl { - url = "https://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/acoustid/chromaprint/downloads/${pname}-${version}.tar.gz"; sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; }; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index bab0a84ca79..904874b2290 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "cimg-${version}"; + pname = "cimg"; version = "2.6.7"; src = fetchurl { diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 1890d2b25a0..a7d7a0ea982 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "cl-${version}"; + pname = "cl"; src = fetchFromGitHub { owner = "tonyrog"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # 'cp' line taken from Arch recipe # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl installPhase = '' - DIR=$out/lib/erlang/lib/${name} + DIR=$out/lib/erlang/lib/${pname}-${version} mkdir -p $DIR cp -ruv c_src doc ebin include priv src $DIR ''; diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix index 086816655d3..11752423906 100644 --- a/pkgs/development/libraries/clipper/default.nix +++ b/pkgs/development/libraries/clipper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.4.2"; - name = "Clipper-${version}"; + pname = "Clipper"; src = fetchurl { url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip"; sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1"; diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 7764e9c67ed..7adc2a365c5 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "cln-${version}"; + pname = "cln"; version = "1.3.4"; src = fetchurl { - url = "${meta.homepage}${name}.tar.bz2"; + url = "${meta.homepage}${pname}-${version}.tar.bz2"; sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d"; }; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index ede2049b6ee..e7c02312b66 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.29.0"; - name = "cmark-${version}"; + pname = "cmark"; src = fetchFromGitHub { owner = "jgm"; diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 8044d7165f7..11e719b36df 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: stdenv.mkDerivation rec { - name = "cmrt-${version}"; + pname = "cmrt"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 29ce216cadf..cc42407433c 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "concurrencykit-${version}"; + pname = "concurrencykit"; version = "0.6.0"; src = fetchurl { diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix index 5630daa0d93..86f4485a900 100644 --- a/pkgs/development/libraries/coprthr/default.nix +++ b/pkgs/development/libraries/coprthr/default.nix @@ -2,7 +2,7 @@ , bison, flex }: stdenv.mkDerivation rec { - name = "coprthr-${version}"; + pname = "coprthr"; version = "1.6"; src = fetchurl { diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index c2f3ce9b9b4..ea3eec825c7 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { - name = "cpp-hocon-${version}"; + pname = "cpp-hocon"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index c13b32a67b0..2585a7abaed 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: stdenv.mkDerivation rec { - name = "cpp-ipfs-api-${version}"; + pname = "cpp-ipfs-api"; version = "2017-01-04"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index a2493e55fb0..7bb2bad9689 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { - name = "cppcms-${version}"; + pname = "cppcms"; version = "1.2.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; }; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 3423b29d76c..737122c57bf 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { - name = "cppdb-${version}"; + pname = "cppdb"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; }; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 3f8b2d896ac..76fd6db18b0 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cppunit-${version}"; + pname = "cppunit"; version = "1.14.0"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/${name}.tar.gz"; + url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz"; sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix index 2dce60d4b2c..28ab31a08cc 100644 --- a/pkgs/development/libraries/cpputest/default.nix +++ b/pkgs/development/libraries/cpputest/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.8"; - name = "cpputest-${version}"; + pname = "cpputest"; src = fetchurl { - url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8"; }; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 5bffda607ee..2328bd53362 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zeromq }: stdenv.mkDerivation rec { - name = "cppzmq-${version}"; + pname = "cppzmq"; version = "4.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index 74619cbaaae..a8c9233aebd 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -2,7 +2,7 @@ libtool, pkgconfig, re2, texinfo }: stdenv.mkDerivation rec { - name = "cre2-${version}"; + pname = "cre2"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 61a825cd374..cb481fc7084 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "crypto++-${version}"; + pname = "crypto++"; majorVersion = "5.6"; version = "${majorVersion}.5"; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index fd81de5139d..5696684e91d 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "ctpl-${version}"; + pname = "ctpl"; version = "0.3.4"; src = fetchurl { diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 5a2a53ef24d..ea2230909a2 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "ctpp2-${version}"; + pname = "ctpp2"; version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/${name}.tar.gz"; + url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index a2188f687d1..647c80bf8ac 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { - name = "curlcpp-${version}"; + pname = "curlcpp"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 58f88e6d8eb..490f472a066 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { - name = "curlpp-${version}"; + pname = "curlpp"; version = "0.8.1"; src = fetchFromGitHub { owner = "jpbarrette"; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index ba1d02380e2..1658f8a6fa7 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "cutee"; version = "0.4.2"; - name = "${pname}-${version}"; src = fetchurl { url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 216b644b38e..e84fbe89aa9 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "cutelyst-${version}"; + pname = "cutelyst"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix index 8be68a314e3..e668e653477 100644 --- a/pkgs/development/libraries/cxx-prettyprint/default.nix +++ b/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cxx-prettyprint-unstable-${version}"; + pname = "cxx-prettyprint-unstable"; version = "2016-04-30"; rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533"; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 77b27640fd7..4c572cf781a 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.2.1"; - name = "cxxtools-${version}"; + pname = "cxxtools"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; }; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 0bdaf1be955..a050dd8d9ca 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cyrus-sasl-${version}"; + pname = "cyrus-sasl"; version = "2.1.27"; src = fetchurl { urls = - [ "http://www.cyrusimap.org/releases/${name}.tar.gz" - "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + [ "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" + "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz" ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; }; diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix index d418b879d1d..73a51cd2731 100644 --- a/pkgs/development/libraries/czmq/3.x.nix +++ b/pkgs/development/libraries/czmq/3.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.2"; - name = "czmq-${version}"; + pname = "czmq"; src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; + url = "http://download.zeromq.org/${pname}-${version}.tar.gz"; sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; }; diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 13cee8fe86b..05e499c73d0 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.2.0"; - name = "czmq-${version}"; + pname = "czmq"; src = fetchurl { - url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg"; }; diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix index 0c026b9f47a..079eb0806d2 100644 --- a/pkgs/development/libraries/czmqpp/default.nix +++ b/pkgs/development/libraries/czmqpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: stdenv.mkDerivation rec { - name = "czmqpp-${version}"; + pname = "czmqpp"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 163b0f4be88..2609f47b276 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, dbus, glib, pkgconfig, expat }: stdenv.mkDerivation rec { - name = "dbus-cplusplus-${version}"; + pname = "dbus-cplusplus"; version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 0f897d97467..22c0a9137ca 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: stdenv.mkDerivation rec { - name = "dbus-sharp-glib-${version}"; + pname = "dbus-sharp-glib"; version = "0.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix index cd020317f4c..496a109b58f 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-glib-${version}"; + pname = "dbus-sharp-glib"; version = "0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 18ea3ad3ecb..084beae5972 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-${version}"; + pname = "dbus-sharp"; version = "0.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 14db5baea3f..0fd638dbf8e 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-${version}"; + pname = "dbus-sharp"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index da7549aeea3..b940315aed8 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, db62, xercesc, xqilla }: stdenv.mkDerivation rec { - name = "dbxml-${version}"; + pname = "dbxml"; version = "6.1.4"; src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + url = "http://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz"; sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a"; }; diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index 5b05d64f072..93e5da5b792 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.2"; - name = "dirac-${version}"; + pname = "dirac"; src = fetchurl { - url = "mirror://sourceforge/dirac/${name}.tar.gz"; + url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz"; sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1"; }; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index d52f1b6a2cf..643e7d3cc5d 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "dleyna-connector-dbus"; - name = "${pname}-${version}"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 67a56855bb7..e28b1add7e2 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "19.16"; - name = "dlib-${version}"; + pname = "dlib"; src = fetchFromGitHub { owner = "davisking"; diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 83466b693f5..59578ef796e 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.6.2"; - name = "docopt.cpp-${version}"; + pname = "docopt.cpp"; src = fetchFromGitHub { owner = "docopt"; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 095697762dd..bc4bc8b2352 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "double-conversion-${version}"; + pname = "double-conversion"; version = "3.1.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index c85f6de0405..756a03503b3 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "drumstick-${version}"; + pname = "drumstick"; version = "1.1.2"; src = fetchurl { - url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp"; }; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 9be19f51e7e..779e6b07762 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "dssi-${version}"; + pname = "dssi"; version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/project/dssi/dssi/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/dssi/dssi/${version}/${pname}-${version}.tar.gz"; sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; }; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index 832b013123d..8d8b41e0609 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "3.12.2"; - name = "dxflib-${version}"; + pname = "dxflib"; src = fetchurl { - url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; + url = "http://www.qcad.org/archives/dxflib/${pname}-${version}.src.tar.gz"; sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9"; }; diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 704f5c51c9c..a6ff37bee97 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dyncall-${version}"; + pname = "dyncall"; version = "1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 4ca9eab51bb..028cd221614 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -3,7 +3,7 @@ # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { - name = "easyloggingpp-${version}"; + pname = "easyloggingpp"; version = "9.96.7"; src = fetchFromGitHub { owner = "muflihun"; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 78f80d2baf4..a9a77f6a9da 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -5,7 +5,7 @@ , enableOpenMPThreads ? false}: with stdenv.lib; stdenv.mkDerivation rec { - name = "eccodes-${version}"; + pname = "eccodes"; version = "2.12.5"; src = fetchurl { diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 62f04e061cf..71229909431 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -13,7 +13,6 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "eclib"; version = "20190226"; # upgrade might break the sage interface # sage tests to run: diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 6dfd4edd071..5f9c72f04af 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "editline-${version}"; + pname = "editline"; version = "1.16.1"; src = fetchFromGitHub { owner = "troglobit"; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 710338842f8..566f8bfd8d1 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "elementary-cmake-modules-${version}"; + pname = "elementary-cmake-modules"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index c973c2bd944..4fc85aee69f 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -3,7 +3,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: stdenv.mkDerivation rec { - name = "embree-${version}"; + pname = "embree"; version = "2.17.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index b7303468cba..ed91f791149 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.6.1"; pname = "enchant"; src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz"; + url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz"; sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; }; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index c4285eadabc..d45767058bb 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "epoxy-${version}"; + pname = "epoxy"; version = "1.5.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 240f3c136ef..8e9b2a641cf 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, libosip, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "libexosip2-${version}"; + pname = "libexosip2"; version = "4.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index c568a670f55..7a5afd8e801 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -7,11 +7,11 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "faac-${version}"; + pname = "faac"; version = "1.29.9.2"; src = fetchurl { - url = "mirror://sourceforge/faac/${name}.tar.gz"; + url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl"; }; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index e7e4835d2ed..29c0252482e 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "faad2-${version}"; + pname = "faad2"; version = "2.8.8"; src = fetchurl { - url = "mirror://sourceforge/faac/${name}.tar.gz"; + url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index c23fc0bc59f..a29cbb9bbd1 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { - name = "farbfeld-${version}"; + pname = "farbfeld"; version = "4"; src = fetchgit { diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index bac867978f4..75d9146c335 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.99.8"; - name = "fastjson-${version}"; + pname = "fastjson"; src = fetchFromGitHub { repo = "libfastjson"; owner = "rsyslog"; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index de78647dc48..5eb7e3866ce 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "fcgi-${version}"; + pname = "fcgi"; version = "2.4.0"; src = fetchurl { diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 9b7cea3ebbc..70269002e2f 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fdk-aac-${version}"; + pname = "fdk-aac"; version = "2.0.0"; src = fetchurl { - url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; + url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp"; }; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index eae0326c832..4a276db12c0 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "1.6.0"; src = fetchurl { diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index a67210e860c..858bc209391 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,7 +2,6 @@ , gmpxx }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "2.4.0"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 65a48890e49..00131688f09 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -233,7 +233,7 @@ assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { - name = "ffmpeg-full-${version}"; + pname = "ffmpeg-full"; version = "4.1.4"; src = fetchurl { diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 4607d3e2f19..439342a50b8 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "ffmpeg-sixel-${version}"; + pname = "ffmpeg-sixel"; version = "nightly-2.3.x"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 72929e127bc..84260f3f57c 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -65,11 +65,11 @@ assert openglSupport -> libGLU_combined != null; stdenv.mkDerivation rec { - name = "ffmpeg-${version}"; + pname = "ffmpeg"; inherit version; src = fetchurl { - url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; + url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index a1cc11fb8c1..45238690fe0 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "ffmpegthumbnailer-${version}"; + pname = "ffmpegthumbnailer"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 1ad861fc63d..c404a12f3df 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-${version}"; + pname = "ffms"; version = "2.23"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 4a2bed6b497..07f1c7ec917 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "filter-audio-${version}"; + pname = "filter-audio"; version = "0.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 504b58b6aa4..d96ceb5d26b 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "flatbuffers-${version}"; + pname = "flatbuffers"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index d92a0c61aab..20a80119b13 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -12,7 +12,7 @@ assert withBlas -> openblas != null; stdenv.mkDerivation rec { - name = "flint-${version}"; + pname = "flint"; version = "2.5.2"; # remove libflint.so.MAJOR patch when updating src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 2cfc87d6a2e..6ade5eb833a 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.3.0"; - name = "fmt-${version}"; + pname = "fmt"; src = fetchFromGitHub { owner = "fmtlib"; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 3fba3db7a33..6a51154c459 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,7 +2,7 @@ , gflags, libiberty, openssl }: stdenv.mkDerivation rec { - name = "folly-${version}"; + pname = "folly"; version = "2019.07.22.00"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index f730e3e3408..186560ae101 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -17,11 +17,11 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-${version}"; + pname = "fontconfig"; version = "2.12.6"; src = fetchurl { - url = "http://fontconfig.org/release/${name}.tar.bz2"; + url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2"; sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; }; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 40430f34334..fa4a8c23e2f 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -2,11 +2,11 @@ , CoreServices ? null }: stdenv.mkDerivation rec { - name = "fox-${version}"; + pname = "fox"; version = "1.7.9"; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix index 952ecb0eade..1fd18254e10 100644 --- a/pkgs/development/libraries/fplll/20160331.nix +++ b/pkgs/development/libraries/fplll/20160331.nix @@ -2,7 +2,6 @@ , gmp, mpfr }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fplll"; version = "20160331"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 063217a4504..f06f7bf4a02 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -2,7 +2,6 @@ , gmp, mpfr }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fplll"; version = "5.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index e15626a160e..feccfd1bfd2 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -2,10 +2,10 @@ , stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "frame-${version}"; + pname = "frame"; version = "2.5.0"; src = fetchurl { - url = "https://launchpad.net/frame/trunk/v${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/frame/trunk/v${version}/+download/${pname}-${version}.tar.xz"; sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; }; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 3771880d360..41480789a08 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "freenect-${version}"; + pname = "freenect"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index ee63ce2f2f9..0ff9cea3d27 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -7,11 +7,11 @@ assert odbcSupport -> unixODBC != null; # Work is in progress to move to cmake so revisit that later stdenv.mkDerivation rec { - name = "freetds-${version}"; + pname = "freetds"; version = "1.1.6"; src = fetchurl { - url = "https://www.freetds.org/files/stable/${name}.tar.bz2"; + url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; }; diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index cdeddd82b71..560855c908b 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: stdenv.mkDerivation rec { - name = "frei0r-plugins-${version}"; + pname = "frei0r-plugins"; version = "1.6.1"; src = fetchurl { - url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz"; sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index 68f3c9d0ee5..5e8197d5e81 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, libtool, ghostscript, groff }: stdenv.mkDerivation rec { - name = "fstrcmp-${version}"; + pname = "fstrcmp"; version = "0.7"; src = fetchzip { diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 3fcf218d6b5..380f64cf523 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }: stdenv.mkDerivation rec { - name = "fstrm-${version}"; + pname = "fstrm"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 7e35ed2e530..a990da4b010 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { - name = "gbenchmark-${version}"; + pname = "gbenchmark"; version = "1.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 4762d1fb119..2589b6cfa16 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, flex, bison, file }: stdenv.mkDerivation rec { - name = "libstdc++5-${version}"; + pname = "libstdc++5"; version = "3.3.6"; src = [ diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 5ceded0546c..6f57d735980 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation rec { - name = "gd-${version}"; + pname = "gd"; version = "2.2.5"; src = fetchurl { - url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; + url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"; }; diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index 14113d8b87e..baf847d4e0a 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "2.4.0"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 0db16e2efe3..413d4e19dde 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "3.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 40308a95791..a6574053414 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -3,11 +3,11 @@ , libpng }: stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "1.11.5"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; }; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index a9b79dac7b8..b7043b61c8a 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -3,7 +3,7 @@ let newtonsoft-json = dotnetPackages.NewtonsoftJson; in stdenv.mkDerivation rec { - name = "gdata-sharp-${version}"; + pname = "gdata-sharp"; version = "2.2.0.0"; src = fetchsvn { diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index fa99dbe1d9f..29a30a1b157 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.1"; - name = "gdcm-${version}"; + pname = "gdcm"; src = fetchurl { - url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; + url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq"; }; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 32e1163e0f0..0d96b9b5a92 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { - name = "gecode-${version}"; + pname = "gecode"; version = "3.7.3"; src = fetchurl { - url = "http://www.gecode.org/download/${name}.tar.gz"; + url = "http://www.gecode.org/download/${pname}-${version}.tar.gz"; sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; }; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 9a6b5d9cf27..454e811447a 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: stdenv.mkDerivation rec { - name = "gecode-${version}"; + pname = "gecode"; version = "6.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 4b9f67b7aaf..97b9ba087e2 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -21,11 +21,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "geis-${version}"; + pname = "geis"; version = "2.2.17"; src = fetchurl { - url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 22e7d216e6c..0e0477cd24d 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "getdata-${version}"; + pname = "getdata"; version = "0.10.0"; src = fetchurl { - url = "mirror://sourceforge/getdata/${name}.tar.xz"; + url = "mirror://sourceforge/getdata/${pname}-${version}.tar.xz"; sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 0493071ee22..3a6c4ee1dbd 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "getdns"; - name = "${pname}-${version}"; version = "1.5.1"; src = fetchurl { diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 6eb8bae435b..9547c6c31ad 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -2,11 +2,11 @@ let allowBisonDependency = !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gettext-${version}"; + pname = "gettext"; version = "0.19.8.1"; src = fetchurl { - url = "mirror://gnu/gettext/${name}.tar.gz"; + url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"; }; patches = [ diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index a00e07376c7..b1a2524065a 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -4,7 +4,7 @@ , optimize ? false # impure hardware optimizations }: stdenv.mkDerivation rec { - name = "gf2x-${version}"; + pname = "gf2x"; version = "1.2"; # remember to also update the url src = fetchurl { diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index b0a115eb4a5..86c5b7949a1 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { - name = "gio-sharp-${version}"; + pname = "gio-sharp"; version = "0.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index 3101bc64333..debddc6723f 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "3.7.2"; src = fetchurl { diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index d73a448f166..efed0926bb3 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "3.8.0"; src = fetchurl { diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 1a97150aa48..79fb7a8d738 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "4.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index aadc6986f5a..8b522c6e92b 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.4.0"; - name = "gl2ps-${version}"; + pname = "gl2ps"; src = fetchurl { - url = "http://geuz.org/gl2ps/src/${name}.tgz"; + url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; }; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index d12b8a7c11d..6498419bc27 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "glbinding"; version = "3.1.0"; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 6944d5b9292..2ee36d405b3 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "glfw-${version}"; + pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 319a0359c58..e7d4c934db8 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.8.5"; - name = "glm-${version}"; + pname = "glm"; src = fetchzip { - url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip"; + url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip"; sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2"; }; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 3ef279616f7..28d32765e30 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "globalplatform-${version}"; + pname = "globalplatform"; version = "6.0.0"; src = fetchurl { - url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 10df82196c2..b4900bb953d 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, globalplatform, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "gppcscconnectionplugin-${version}"; + pname = "gppcscconnectionplugin"; version = "1.1.0"; src = fetchurl { - url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 9ae181e9453..6aa300e2b62 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, perl }: stdenv.mkDerivation rec { - name = "glog-${version}"; + pname = "glog"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 1d35c0696d2..84a7aff7107 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -14,10 +14,10 @@ assert withGmp -> gmp != null; stdenv.mkDerivation rec { version = "4.65"; - name = "glpk-${version}"; + pname = "glpk"; src = fetchurl { - url = "mirror://gnu/glpk/${name}.tar.gz"; + url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; }; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index b373095a814..3b4ad1393d0 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.23"; - name = "gmime-${version}"; + pname = "gmime"; src = fetchurl { - url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; + url = "mirror://gnome/sources/gmime/2.6/${pname}-${version}.tar.xz"; sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi"; }; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 699d2854f3d..81546e5c127 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.2.3"; - name = "gmime-${version}"; + pname = "gmime"; src = fetchurl { - url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz"; + url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a"; }; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 6423e1fce98..63d9d8c2762 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gmm-${version}"; + pname = "gmm"; version = "5.3"; src = fetchurl { - url = "mirror://savannah/getfem/stable/${name}.tar.gz"; + url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46"; }; diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix index 0fac97aaa43..10d584c6ccb 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -2,7 +2,7 @@ , libpulseaudio, mplayer, gnome_mplayer }: stdenv.mkDerivation rec { - name = "gmtk-${version}"; + pname = "gmtk"; version = "1.0.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5e525ad46af..36d42644e0b 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "gnome-sharp-${version}"; + pname = "gnome-sharp"; version = "2.24.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 7918fb7b9c4..e914f9d78ee 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -14,7 +14,7 @@ let }; in stdenv.mkDerivation rec { - name = "gnu-config-${version}"; + pname = "gnu-config"; version = "2019-04-15"; buildCommand = '' diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 036863c9c0b..af225cc50f2 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pciutils }: with stdenv.lib; stdenv.mkDerivation rec { - name = "gnu-efi-${version}"; + pname = "gnu-efi"; version = "3.0.9"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; + url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7"; }; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index c462f2e685a..26d5e9c88c7 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "gpgme-${version}"; + pname = "gpgme"; version = "1.13.1"; src = fetchurl { - url = "mirror://gnupg/gpgme/${name}.tar.bz2"; + url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4"; }; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index a48490ffae5..722fb79d5d6 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -2,11 +2,11 @@ stdenv, fetchurl, pkgconfig, xorg, python3, frame }: stdenv.mkDerivation rec { - name = "grail-${version}"; + pname = "grail"; version = "3.1.1"; src = fetchurl { - url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/grail/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 52c087b1914..3b14efe8a5f 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: mkDerivation rec { - name = "grantlee-${version}"; + pname = "grantlee"; version = "5.1.0"; grantleeCompatVersion = "5.1"; grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}"; @@ -9,7 +9,7 @@ mkDerivation rec { src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; buildInputs = [ qtbase qtscript ]; diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 1072c8f2cbf..dc3defac638 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "graphene-hardened-malloc-${version}"; + pname = "graphene-hardened-malloc"; version = "1"; src = fetchurl { diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 224cd125dce..38243ce5a6d 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -3,7 +3,7 @@ enablePython ? false, pythonPackages }: stdenv.mkDerivation rec{ - name = "grib-api-${version}"; + pname = "grib-api"; version = "1.28.0"; src = fetchurl { diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 81e90154aa5..af8fbcb9a54 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.22.0"; - name = "grpc-${version}"; + pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index d454ca63fd7..ffb8be85d3a 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -6,11 +6,11 @@ , gnome3 }: stdenv.mkDerivation rec { - name = "gsettings-desktop-schemas-${version}"; + pname = "gsettings-desktop-schemas"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; }; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 744d9eb6de9..812128fb12f 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gsettings-qt-${version}"; + pname = "gsettings-qt"; version = "0.1.20170824"; src = fetchbzr { diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 7c15e10620a..0ba3bf35423 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-lastfm-${version}"; + pname = "gsignond-plugin-lastfm"; version = "2018-05-07"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 887376d3187..d9afecc6d0c 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -3,7 +3,7 @@ , docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-oauth-${version}"; + pname = "gsignond-plugin-oauth"; version = "2018-10-15"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index 655f73931f6..b9eecaf0946 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-sasl-${version}"; + pname = "gsignond-plugin-sasl"; version = "2018-10-15"; src = fetchFromGitLab { diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 33583a4c6bb..1405d4782ad 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "gsm-${version}"; + pname = "gsm"; version = "1.0.18"; src = fetchurl { - url = "http://www.quut.com/gsm/${name}.tar.gz"; + url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; }; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index f099d3fabc0..a1a0da51017 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -4,7 +4,7 @@ let majorVersion = "2.8"; in stdenv.mkDerivation rec { - name = "gsoap-${version}"; + pname = "gsoap"; version = "${majorVersion}.53"; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 2ae0ad2b453..735ab4e6e18 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -51,7 +51,7 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-${version}"; + pname = "gst-plugins-bad"; version = "1.16.0"; meta = with stdenv.lib; { @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz"; sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"; }; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 87bbef227de..fb1d627d7b1 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -14,7 +14,7 @@ , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: stdenv.mkDerivation rec { - name = "gst-plugins-base-${version}"; + pname = "gst-plugins-base"; version = "1.16.0"; meta = with lib; { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz"; sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"; }; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index fa838d5ff77..f0f01a977fd 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-${version}"; + pname = "gstreamer"; version = "1.16.0"; meta = with lib ;{ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; + url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz"; sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"; }; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 703fcb58898..810cee650ca 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-${version}"; + pname = "gstreamer-editing-services"; version = "1.16.0"; meta = with stdenv.lib; { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; + url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz"; sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2"; }; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 557e3caa722..c801684b065 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -25,7 +25,7 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-good-${version}"; + pname = "gst-plugins-good"; version = "1.16.0"; meta = with stdenv.lib; { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz"; sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"; }; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 297c8ada884..1847b8d0c12 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-${version}"; + pname = "gst-libav"; version = "1.16.0"; meta = { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz"; sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"; }; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index c4620a29e94..5c571fa4a1e 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-rtsp-server-${version}"; + pname = "gst-rtsp-server"; version = "1.16.0"; meta = with stdenv.lib; { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz"; sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr"; }; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 5c3a56814ba..552ab1ec292 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-${version}"; + pname = "gst-plugins-ugly"; version = "1.16.0"; meta = with lib; { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz"; sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"; }; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index c0541857e8b..7e64636d96d 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-vaapi-${version}"; + pname = "gst-vaapi"; version = "1.16.0"; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 06d275078f3..ad013d1570e 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-${version}"; + pname = "gst-validate"; version = "1.16.0"; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz"; sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck"; }; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 9ceb571983e..5fecd45b7da 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -2,7 +2,7 @@ , static ? false }: stdenv.mkDerivation rec { - name = "gtest-${version}"; + pname = "gtest"; version = "1.8.1"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 7f35f088da2..1e3b7d45edd 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { - name = "gtk-sharp-beans-${version}"; + pname = "gtk-sharp-beans"; version = "2.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 659dc14800e..615ea66f4d9 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -23,7 +23,7 @@ }: stdenv.mkDerivation rec { - name = "gtk-sharp-${version}"; + pname = "gtk-sharp"; version = "2.12.45"; builder = ./builder.sh; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index c2f05b51a65..d26cc969259 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -4,7 +4,7 @@ let inherit (gst_all_1) gstreamer gst-plugins-base; in stdenv.mkDerivation rec { - name = "gtkd-${version}"; + pname = "gtkd"; version = "3.8.5"; src = fetchzip { diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 9d1751afaf9..1b35221f066 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -2,11 +2,11 @@ , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "3.24.11"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 553e9fd9cbb..fde94e79f05 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -2,11 +2,11 @@ , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "4.2.0"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 455cc4d4b81..1b66bfd031f 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { - name = "gtksourceviewmm-${version}"; + pname = "gtksourceviewmm"; version = "3.21.3"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; }; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index f0baecb1990..54b4b001d81 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { - name = "gtkspell-${version}"; + pname = "gtkspell"; version = "3.0.10"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index cb141f8c556..97f1a12c178 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "gtkspellmm-${version}"; + pname = "gtkspellmm"; version = "3.0.5"; src = fetchurl { url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" + - "${name}.tar.xz"; + "${pname}-${version}.tar.xz"; sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv"; }; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index d0da7f8cef6..9cc079d6103 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "gts-${version}"; + pname = "gts"; version = "0.7.6"; src = fetchurl { - url = "mirror://sourceforge/gts/${name}.tar.gz"; + url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz"; sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index 17ca323a5fe..2db8c1e6739 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "gumbo-${version}"; + pname = "gumbo"; version = "0.10.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 78a2d365033..2f39b03898d 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -3,7 +3,7 @@ , glib, systemd, libusb1, vala, hwdata }: stdenv.mkDerivation rec { - name = "gusb-${version}"; + pname = "gusb"; version = "0.3.0"; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix index d235c6cb086..063d416a8fc 100644 --- a/pkgs/development/libraries/half/default.nix +++ b/pkgs/development/libraries/half/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.12.0"; - name = "half-${version}"; + pname = "half"; src = fetchzip { url = "mirror://sourceforge/half/${version}/half-${version}.zip"; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index b9cd31432fc..000af7fd74e 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "hamlib"; version = "3.3"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index a5f8f00a6bf..ec86db036e9 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.1.0"; - name = "herqq-${version}"; + pname = "herqq"; nativeBuildInputs = [ qt5.qmake ]; buildInputs = [ qt5.qtbase unzip qtmultimedia ]; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 13f7c421906..6dc3871e1c1 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hiredis-${version}"; + pname = "hiredis"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 37f01372005..ca547faa2ab 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -2,11 +2,11 @@ , perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { - name = "hivex-${version}"; + pname = "hivex"; version = "1.3.18"; src = fetchurl { - url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; + url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la"; }; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 99777bbd6f0..a3a8c7baa09 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }: stdenv.mkDerivation rec { - name = "hpx-${version}"; + pname = "hpx"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 1537f9cc480..f0968c47822 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "htmlcxx-${version}"; + pname = "htmlcxx"; version = "0.86"; src = fetchurl { - url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz"; sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 3728c05e516..00e8dc3d4db 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; - name = "hunspell-${version}"; + pname = "hunspell"; src = fetchurl { url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index d4ebb5534d9..3d00d20f170 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "idnkit-${version}"; + pname = "idnkit"; version = "2.3"; src = fetchurl { - url = "https://jprs.co.jp/idn/${name}.tar.bz2"; + url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2"; sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16"; }; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index b97f62dcf25..6330347cd27 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: stdenv.mkDerivation rec { - name = "iksemel-${version}"; + pname = "iksemel"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 2d22788e1ec..5cc0f7c1f46 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-${version}"; + pname = "ilmbase"; version = "2.3.0"; src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; }; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index b55d13ecc3f..5ad3e249fc3 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,6 +1,6 @@ {stdenv, autoreconfHook, fetchurl, gmp, openblas}: stdenv.mkDerivation rec { - name = "iml-${version}"; + pname = "iml"; version = "1.0.5"; src = fetchurl { url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index a4a009c6658..2beff09d0b4 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, tcl}: stdenv.mkDerivation rec { - name = "incrtcl-${version}"; + pname = "incrtcl"; version = "4.0.4"; src = fetchurl { diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 36b637c62bb..f97f8b7d82d 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -6,7 +6,7 @@ with lib; stdenv.mkDerivation rec { - name = "indicator-application-gtk2-${version}"; + pname = "indicator-application-gtk2"; version = "12.10.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 8beda8663c5..51c6728e8b0 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "iniparser-${version}"; + pname = "iniparser"; version = "4.1"; src = fetchFromGitHub { @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { mkdir -p $out/include cp src/*.h $out/include - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} for i in AUTHORS INSTALL LICENSE README.md; do - bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; + bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2; done; - cp -r html $out/share/doc/${name} + cp -r html $out/share/doc/${pname}-${version} cp libiniparser.a $out/lib cp libiniparser.so.1 $out/lib diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 1212d3817d4..53b89f17ea5 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "intel-gmmlib-${version}"; + pname = "intel-gmmlib"; version = "19.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb"; }; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index e549067b11f..e3dbfa52db2 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "intel-media-driver-${version}"; + pname = "intel-media-driver"; version = "19.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 274058b7ec9..67bee86bfa9 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "intel-media-sdk-${version}"; + pname = "intel-media-sdk"; version = "19.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index a48908f41dd..50ae63f2d0d 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "ip2location-c-${version}"; + pname = "ip2location-c"; version = "7.0.2"; # meta.homepage might change after a major update src = fetchurl { diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index d28ae012e57..35ef14cbc13 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "irrlicht-${version}"; + pname = "irrlicht"; version = "1.8.4"; src = fetchzip { - url = "mirror://sourceforge/irrlicht/${name}.zip"; + url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip"; sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f"; }; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 43ab20da8ae..599e8dcc597 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { - name = "iso-codes-${version}"; + pname = "iso-codes"; version = "3.79"; src = fetchurl { - url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz"; sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; }; diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 29fabdbb3b6..26ec06fad7b 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, tnt}: stdenv.mkDerivation rec { - name = "jama-${version}"; + pname = "jama"; version = "1.2.5"; src = fetchurl { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ tnt ]; unpackPhase = '' - mkdir "${name}" + mkdir "${pname}-${version}" unzip "$src" ''; installPhase = '' diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 946bc17e764..1bad3394b6a 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-${version}"; + pname = "jasper"; version = "2.0.16"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 8d9b4e54fe8..4a2b030a3db 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.2"; - name = "commons-bcel-${version}"; + pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz"; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 3c729f42320..d418145e1b5 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.18"; - name = "commons-compress-${version}"; + pname = "commons-compress"; src = fetchurl { - url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1"; }; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 6fddc3cfe0c..0aca6bf8baa 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.3.1"; - name = "commons-fileupload-${version}"; + pname = "commons-fileupload"; src = fetchurl { - url = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 03b083328da..c545ad68e72 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6"; - name = "commons-io-${version}"; + pname = "commons-io"; src = fetchurl { - url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn"; }; diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 322cb486e93..675265ed4e3 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.9"; - name = "commons-lang-${version}"; + pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index 10c39f03789..7c4fc5c632e 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.6.1"; - name = "commons-math-${version}"; + pname = "commons-math"; src = fetchurl { url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz"; diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index de031a08fe8..e485eabe1cb 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jdk, ant } : stdenv.mkDerivation rec { - name = "java-cup-${version}"; + pname = "java-cup"; version = "11b-20160615"; src = fetchurl { diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 7d1fac39b1c..68e2a737791 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, ant, jdk }: stdenv.mkDerivation rec { - name = "hydra-ant-logger-${version}"; + pname = "hydra-ant-logger"; version = "2010.2"; src = fetchgit { diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 402f893034b..e25106e22c6 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }: stdenv.mkDerivation rec { - name = "jzmq-${version}"; + pname = "jzmq"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index 691b9905b04..c0eabe51657 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl} : stdenv.mkDerivation rec { - name = "lucene-${version}"; + pname = "lucene"; version = "1.4.3"; builder = ./builder.sh; src = fetchurl { - url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz"; + url = "https://archive.apache.org/dist/jakarta/lucene/${pname}-${version}.tar.gz"; sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index c2acd234893..591de48d319 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "4.5"; fullVersion = "${version}-201506032000"; - name = "swt-${version}"; + pname = "swt"; hardeningDisable = [ "format" ]; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index c14ac7c65ab..c41455a6544 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jemalloc-${version}"; + pname = "jemalloc"; inherit version; src = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 175097ef785..726e00b58bb 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jitterentropy-${version}"; + pname = "jitterentropy"; version = "2.1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index 47c87da065b..bc5be3172ec 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "jxrlib"; version = "1.1"; diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 0cd8ab50356..4a403a19964 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -7,10 +7,9 @@ mkDerivation rec { pname = "kdb"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg"; }; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index d2283f5c1d5..2eb9262d189 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "heimdal-${version}"; + pname = "heimdal"; version = "7.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index abbb2457f6a..0a130c017c0 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -5,11 +5,11 @@ let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "keybinder-${version}"; + pname = "keybinder"; version = "0.3.0"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz"; sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 91ad59ad27a..ed2dd341f45 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "keybinder3-${version}"; + pname = "keybinder3"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index d3733ea5f72..3f84706bffb 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "kmsxx"; version = "2018-10-23"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix index c49402b74e8..991fd4d27a7 100644 --- a/pkgs/development/libraries/kproperty/default.nix +++ b/pkgs/development/libraries/kproperty/default.nix @@ -8,10 +8,9 @@ mkDerivation rec { pname = "kproperty"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; }; diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index fc9c77e8fd6..46d55b1f550 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -7,10 +7,9 @@ mkDerivation rec { pname = "kreport"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92"; }; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 2f713cb5977..933d51b9575 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -22,11 +22,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "lame-${version}"; + pname = "lame"; version = "3.100"; src = fetchurl { - url = "mirror://sourceforge/lame/${name}.tar.gz"; + url = "mirror://sourceforge/lame/${pname}-${version}.tar.gz"; sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index e93467fba0a..f401f231de2 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "lasso-${version}"; + pname = "lasso"; version = "2.6.0"; src = fetchurl { diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index 839f0a75156..ae8fc1e22db 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ldacBT-${version}"; + pname = "ldacBT"; version = "2.0.2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 82496a54aea..1aa208c2044 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -4,10 +4,8 @@ stdenv.mkDerivation rec { pname = "ldns"; version = "1.7.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; + url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1"; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 95924050ff3..bf6efb9ef21 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: stdenv.mkDerivation rec { - name = "leatherman-${version}"; + pname = "leatherman"; version = "1.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index f4018cbf961..6137638222e 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.95"; - name = "lensfun-${version}"; + pname = "lensfun"; src = fetchurl { - url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz"; sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2"; }; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index dd3c42e8b7f..62c01e4f356 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "leptonica-${version}"; + pname = "leptonica"; version = "1.78.0"; src = fetchurl { - url = "http://www.leptonica.org/source/${name}.tar.gz"; + url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2"; }; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index b18af4cf834..17a754a027a 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "leveldb-${version}"; + pname = "leveldb"; version = "1.20"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 0d67c6b4dcb..bda7d560fcd 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -8,11 +8,11 @@ # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libaacs-${version}"; + pname = "libaacs"; version = "0.9.0"; src = fetchurl { - url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"; }; diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index 6df7bc22772..11b31d62b5d 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.6"; - name = "libaal-${version}"; + pname = "libaal"; src = fetchurl { - url = "mirror://sourceforge/reiser4/${name}.tar.gz"; + url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz"; sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di"; }; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index aa4a40cf32d..f953c170ab5 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }: stdenv.mkDerivation rec { - name = "libabw-${version}"; + pname = "libabw"; version = "0.1.2"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz"; sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 525ec6e35f6..7f9dbf3a21f 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { - name = "libaccounts-glib-${version}"; + pname = "libaccounts-glib"; version = "1.24"; outputs = [ "out" "dev" "devdoc" "py" ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 49e5bcdd905..a8ddab2978d 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -5,7 +5,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation rec { - name = "libagar-${version}"; + pname = "libagar"; inherit (srcs) version src; preConfigure = '' diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index c1e9ba7d1c7..43d66b8251c 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -2,7 +2,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation rec { - name = "libagar-test-${version}"; + pname = "libagar-test"; inherit (srcs) version src; sourceRoot = "agar-1.5.0/tests"; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index cc6c9464de3..325a7d71598 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "libamqpcpp-${version}"; + pname = "libamqpcpp"; version = "4.1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 826f72b1f5f..698182dbd4e 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.2.2"; - name = "libao-${version}"; + pname = "libao"; # the github mirror is more up to date than downloads.xiph.org src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 62e0a850bad..2d9a9f18fa2 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: stdenv.mkDerivation rec { - name = "libaom-${version}"; + pname = "libaom"; version = "1.0.0-errata1"; src = fetchgit { diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index dd3320005a4..5b9647d275c 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.2.7-9-g177589f"; - name = "libaosd-${version}"; + pname = "libaosd"; src = fetchFromGitHub { owner = "atheme-legacy"; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 3cf8a6da736..e3927f34fab 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -9,7 +9,7 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { - name = "libarchive-${version}"; + pname = "libarchive"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index a06ae978d51..0c8f82138e7 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl }: stdenv.mkDerivation rec { - name = "libasr-${version}"; + pname = "libasr"; version= "1.0.2"; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6"; }; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index d7ebf781a04..41406ce18ea 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -18,11 +18,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libass-${version}"; + pname = "libass"; version = "0.14.0"; src = fetchurl { - url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; }; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 313cb7f8d5d..348cfa9ed5b 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "libast-${version}"; + pname = "libast"; version = "0.7.1"; src = fetchurl { - url = "http://www.eterm.org/download/${name}.tar.gz"; + url = "http://www.eterm.org/download/${pname}-${version}.tar.gz"; sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 0df8ed0f969..b576896876e 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libatomic_ops-${version}"; + pname = "libatomic_ops"; version = "7.6.10"; src = fetchurl { diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index 6a7720b99bc..d39c12d58d5 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { - name = "libb2-${version}"; + pname = "libb2"; version = "0.98.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 09c5444a644..3c9a9768427 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libb64-${version}"; + pname = "libb64"; version = "1.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 2a129bc648f..b20850e88ff 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -2,7 +2,7 @@ which }: stdenv.mkDerivation rec { - name = "libbap-${version}"; + pname = "libbap"; version = "master-2019-04-05"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 3a1b7752514..3af98a578f2 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -8,11 +8,11 @@ # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libbdplus-${version}"; + pname = "libbdplus"; version = "0.1.2"; src = fetchurl { - url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2"; sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; }; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 64b3832d335..5af8acb5ed7 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libbfd-${version}"; + pname = "libbfd"; inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index d8f2426e477..d9639cf5c14 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libbluedevil"; # bluedevil must have the same major version (x.y) as libbluedevil! # do not update this package without checking bluedevil version = "2.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; }; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index b7ca9dda1ea..517251e137e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -18,11 +18,11 @@ assert withFonts -> freetype != null; # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libbluray-${version}"; + pname = "libbluray"; version = "1.1.2"; src = fetchurl { - url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3"; }; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index a8d1925e5c0..fe4af163a54 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "libbsd-${version}"; + pname = "libbsd"; version = "0.9.1"; src = fetchurl { - url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz"; + url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n"; }; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6244c3a351e..5bd6b11ac7a 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, perl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "libbson-${version}"; + pname = "libbson"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f68141ef3b4..01588187936 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libburn-${version}"; + pname = "libburn"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq"; }; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index f116360474e..48402b9ad45 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, nss }: stdenv.mkDerivation rec { - name = "libcacard-${version}"; + pname = "libcacard"; version = "2.6.1"; src = fetchurl { - url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz"; + url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz"; sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2"; }; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 6838362c794..42a49713a0b 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,7 +1,7 @@ { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: stdenv.mkDerivation rec { - name = "libcangjie-${version}"; + pname = "libcangjie"; version = "1.4_rev_${rev}"; rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index ecba18cd58c..e161948db40 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -13,7 +13,7 @@ let ]; in stdenv.mkDerivation rec { - name = "cef-binary-${version}"; + pname = "cef-binary"; version = "3.3497.1833.g13f506f"; src = fetchurl { url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2"; diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 410c83953aa..11617a0107c 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "libchardet-${version}"; + pname = "libchardet"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index d3ef799ef60..3c234d780ef 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sqlite }: stdenv.mkDerivation rec{ - name = "libchewing-${version}"; + pname = "libchewing"; version = "0.5.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index f101eb22310..d896cf63733 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "libcli-${version}"; + pname = "libcli"; version = "1.9.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index a2f6858a05c..325afc56ae7 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libclthreads-${version}"; + pname = "libclthreads"; version = "2.4.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 49bc2347ba7..d6e2ad398d7 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: stdenv.mkDerivation rec { - name = "libclxclient-${version}"; + pname = "libclxclient"; version = "3.9.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index f247c48821f..8eb7ff303de 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libcommuni-${version}"; + pname = "libcommuni"; version = "3.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index ee3f511d435..cfef09c480a 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, flex }: stdenv.mkDerivation rec { - name = "libconfuse-${version}"; + pname = "libconfuse"; version = "3.2.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 894faf0b910..23b39bca1f3 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: stdenv.mkDerivation rec { - name = "libcouchbase-${version}"; + pname = "libcouchbase"; version = "2.10.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index fff31a96ce7..ba9a6325b07 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoconf, automake, libtool, libpcap }: stdenv.mkDerivation rec { - name = "libcrafter-${version}"; + pname = "libcrafter"; version = "0.3"; src = fetchzip { diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index 3d32f4d0b95..4bf26bde228 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libcsptr-${version}"; + pname = "libcsptr"; version = "2.0.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index 94dc733a69b..f4e2e621c28 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "ctemplate-${version}"; + pname = "ctemplate"; version = "2.3"; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index e50b8a13b95..8ebab123524 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, bison, flex }: stdenv.mkDerivation rec { - name = "libcue-${version}"; + pname = "libcue"; version = "2.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 86d14fe7974..df2e4c367bf 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { version = "3.20.4"; - name = "libdap-${version}"; + pname = "libdap"; nativeBuildInputs = [ bison flex ]; buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { - url = "https://www.opendap.org/pub/source/${name}.tar.gz"; + url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i"; }; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 32b0c9758f7..2ae4eec99ec 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, qtbase }: stdenv.mkDerivation rec { - name = "libdbusmenu-qt-${version}"; + pname = "libdbusmenu-qt"; version = "0.9.3+16"; src = fetchgit { diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 86b9fcd0bef..0f2ba019d3f 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -2,11 +2,11 @@ , libusb1, CoreServices }: stdenv.mkDerivation rec { - name = "libdc1394-${version}"; + pname = "libdc1394"; version = "2.2.6"; src = fetchurl { - url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; + url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz"; sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; }; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 6c9fabf5cae..3c31ba805d8 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libde265-${version}"; + pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index db5448caa10..85aad4844ba 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libdeflate-${version}"; + pname = "libdeflate"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 78e7490cd99..afbff3dc0cf 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "libdevil-${version}"; + pname = "libdevil"; version = "1.7.8"; src = fetchurl { diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 7fe7319ff15..06ba10904a7 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.10.4"; - name = "libdigidoc-${version}"; + pname = "libdigidoc"; src = fetchurl { url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index e3172c2fc1f..4aec6fdef91 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.13.7"; - name = "libdigidocpp-${version}"; + pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 287494b6b1f..d7d88b38386 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin }: stdenv.mkDerivation rec { - name = "libdiscid-${version}"; + pname = "libdiscid"; version = "0.6.2"; nativeBuildInputs = [ cmake pkgconfig ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; src = fetchurl { - url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; + url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz"; sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index c94806b50c1..5598e6b2fa7 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdivecomputer-${version}"; + pname = "libdivecomputer"; version = "0.6.0"; src = fetchurl { - url = "https://www.libdivecomputer.org/releases/${name}.tar.gz"; + url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 0984eb6e00b..aed6f05fec4 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libdvbpsi-${version}"; + pname = "libdvbpsi"; version = "1.3.2"; src = fetchurl { - url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2"; sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc"; }; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index f18e0622d0c..fd89077a256 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, IOKit}: stdenv.mkDerivation rec { - name = "libdvdcss-${version}"; + pname = "libdvdcss"; version = "1.4.2"; buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; src = fetchurl { - url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq"; }; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index b0dfd1e8fc1..45a73a62488 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libdvdread}: stdenv.mkDerivation rec { - name = "libdvdnav-${version}"; + pname = "libdvdnav"; version = "6.0.0"; src = fetchurl { - url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2"; sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph"; }; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 5f0f0827503..c133c0ba6f9 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation rec { - name = "libdvdread-${version}"; + pname = "libdvdread"; version = "6.0.1"; src = fetchurl { - url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; sha256 = "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8"; }; diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix index 293b1c28e93..2fdb1d071b6 100644 --- a/pkgs/development/libraries/libeb/default.nix +++ b/pkgs/development/libraries/libeb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libeb-${version}"; + pname = "libeb"; version = "4.4.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 6a4078f92cf..16624a78079 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "libebur128-${version}"; + pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index be9f5e772d9..855386114c1 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }: stdenv.mkDerivation rec { - name = "libechonest-${version}"; + pname = "libechonest"; version = "2.3.0"; src = fetchurl { - url = "http://files.lfranchi.com/${name}.tar.bz2"; + url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2"; sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db"; }; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 26fe2d90963..1835b924ec1 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { version = "3258"; - name = "libelf-freebsd-${version}"; + pname = "libelf-freebsd"; src = fetchsvn { url = svn://svn.code.sf.net/p/elftoolchain/code/trunk; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 980cee2e687..8555449f28b 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libESMTP-${version}"; + pname = "libESMTP"; version = "1.0.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 365c128239d..56710945ecb 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libev-${version}"; + pname = "libev"; version="4.27"; src = fetchurl { - url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; + url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d"; }; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 611287b9aaa..5fb46bff075 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -5,7 +5,7 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { - name = "libevent-${version}"; + pname = "libevent"; version = "2.1.10"; src = fetchurl { diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index d150d4a0033..fd1e203ed37 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "20171104"; - name = "libewf-${version}"; + pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index a61d51aa6b7..2eee9bafe44 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "libexecinfo-${version}"; + pname = "libexecinfo"; version = "1.1"; src = fetchurl { - url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2"; + url = "http://distcache.freebsd.org/local-distfiles/itetcu/${pname}-${version}.tar.bz2"; sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9"; }; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index e36c4ee12b9..196f0e50bef 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: stdenv.mkDerivation rec { - name = "libfakekey-${version}"; + pname = "libfakekey"; version = "0.1"; src = fetchurl { - url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz"; sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index f553afdfc70..62f1b087de5 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "libfaketime-${version}"; + pname = "libfaketime"; version = "0.9.7"; src = fetchurl { diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix index 5ac7a244df2..5e1c985fe2c 100644 --- a/pkgs/development/libraries/libfann/default.nix +++ b/pkgs/development/libraries/libfann/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libfann-${version}"; + pname = "libfann"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 513a4dc3d38..8d11cd86c45 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libffcall-${version}"; + pname = "libffcall"; version = "2.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 4b02d651929..0c8a7084e09 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -3,7 +3,7 @@ zlib, libpng, boost, qt5, guile }: stdenv.mkDerivation rec { - name = "libfive-${version}"; + pname = "libfive"; version = "2018-07-01"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 2d2d56dda4f..9c9b6c8034c 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name="libfixposix-${version}"; + pname = "libfixposix"; version="0.4.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index cfae74b4b9e..c0595ac93d1 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -2,7 +2,7 @@ , libobjc ? null }: stdenv.mkDerivation rec { - name = "libfreefare-${version}"; + pname = "libfreefare"; version = "0.4.0"; src = fetchurl { diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index 5491fab3edf..ce7d615f4d3 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libfsm-${version}"; + pname = "libfsm"; version = "0.1pre1869_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index a6fe2bc1435..d83b43a782e 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libgaminggear-${version}"; + pname = "libgaminggear"; version = "0.15.1"; src = fetchurl { - url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2"; + url = "mirror://sourceforge/libgaminggear/${pname}-${version}.tar.bz2"; sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz"; }; diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix index 42e812ec1f5..b6a8ae3c8df 100644 --- a/pkgs/development/libraries/libgap/default.nix +++ b/pkgs/development/libraries/libgap/default.nix @@ -7,7 +7,7 @@ # - https://github.com/markuspf/gap/issues/2 # - https://trac.sagemath.org/ticket/22626 stdenv.mkDerivation rec { - name = "libgap-${version}"; + pname = "libgap"; # Has to be the same version as "gap" version = "4.8.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 4d8a7eac27c..36a1b7d3720 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -5,11 +5,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { - name = "libgcrypt-${version}"; + pname = "libgcrypt"; version = "1.8.4"; src = fetchurl { - url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; + url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"; }; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 51520eb0fe3..db75ff1784f 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; - name = "libgeotiff-${version}"; + pname = "libgeotiff"; src = fetchFromGitHub { owner = "OSGeo"; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 08fce9c521e..11affa5cbef 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "libgig-${version}"; + pname = "libgig"; version = "4.1.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6"; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 9bec00b9f52..24052ea4058 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -6,10 +6,9 @@ stdenv.mkDerivation rec { version = "2.0.12"; pname = "libgksu"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${name}.tar.gz"; + url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; }; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 62c6b45c5d4..ed6139d48f6 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: stdenv.mkDerivation rec { - name = "libglvnd-${version}"; + pname = "libglvnd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index e87f535a1f7..4c10a288474 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "7.64.0"; - name = "libgnurl-${version}"; + pname = "libgnurl"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 89fcfdfde8d..76d7ebcc8cc 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }: stdenv.mkDerivation rec { - name = "libgringotts-${version}"; + pname = "libgringotts"; version = "1.2.1"; src = fetchurl { - url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2"; + url = "https://sourceforge.net/projects/gringotts.berlios/files/${pname}-${version}.tar.bz2"; sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index bd5a5f06851..fd34f28c1e8 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.3.0"; - name = "libgroove-${version}"; + pname = "libgroove"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e3d7741ba86..9b50ddd4b7f 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -10,7 +10,7 @@ assert appliance == null || stdenv.lib.isDerivation appliance; assert javaSupport -> jdk != null; stdenv.mkDerivation rec { - name = "libguestfs-${version}"; + pname = "libguestfs"; version = "1.38.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index d5d35678b4f..b82c547fb33 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libgumath-${version}"; + pname = "libgumath"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 3182345bfd4..7e1bb2daa9e 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.0"; - name = "libheif-${version}"; + pname = "libheif"; src = fetchFromGitHub { owner = "strukturag"; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index b86a48ecd1b..d8881b929a0 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -2,7 +2,7 @@ , python3, tzdata, glib, libxml2, icu }: stdenv.mkDerivation rec { - name = "libical-${version}"; + pname = "libical"; version = "3.0.4"; outputs = [ "out" "dev" ]; #"devdoc" ]; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index c5379692ad3..7dc90d9ae3e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -6,11 +6,11 @@ # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross stdenv.mkDerivation rec { - name = "libiconv-${version}"; + pname = "libiconv"; version = "1.16"; src = fetchurl { - url = "mirror://gnu/libiconv/${name}.tar.gz"; + url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz"; sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6"; }; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 4b7d9bdc2e3..674862d694c 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { - name = "libid3tag-${version}"; + pname = "libid3tag"; version = "0.15.1b"; src = fetchurl { diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 5ec5b8e04dd..7e7b691e3c1 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libidn2-${version}"; + pname = "libidn2"; version = "2.2.0"; src = fetchurl { - url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; + url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz"; sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw"; }; diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 4fa3addc0a6..936d165a6cf 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; - name = "libiec61883-${version}"; + pname = "libiec61883"; src = fetchurl { url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz"; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index df5035461af..9392061a269 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libiio-${version}"; + pname = "libiio"; version = "0.18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 6464e4e5820..7eccfc37363 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -5,8 +5,6 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; version = "2019-04-04"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = pname; repo = pname; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c57590aad21..9be58ac537a 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -12,10 +12,10 @@ let mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; self = stdenv.mkDerivation rec { - name = "libinfinity-${version}"; + pname = "libinfinity"; version = "0.7.1"; src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; + url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz"; sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; }; diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index 6fc507daf64..75cd1a00507 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { - name = "libinotify-kqueue-${version}"; + pname = "libinotify-kqueue"; version = "20180201"; src = fetchzip { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0c759835183..c1ee68a2470 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -26,11 +26,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-${version}"; + pname = "libinput"; version = "1.13.4"; src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; }; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index fea5a86da44..c4dca659d36 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libipfix-${version}"; + pname = "libipfix"; version = "110209"; src = fetchurl { url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 71238dda162..561a5248278 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.10"; pname = "libircclient"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv"; }; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index ce2028e805d..cefce19d465 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: stdenv.mkDerivation rec { - name = "libisoburn-${version}"; + pname = "libisoburn"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs"; }; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index d5281448387..59726094c4a 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, attr, zlib }: stdenv.mkDerivation rec { - name = "libisofs-${version}"; + pname = "libisofs"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys"; }; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 0b00cf90ba0..73801102ba3 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: stdenv.mkDerivation rec { - name = "libite-${version}"; + pname = "libite"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 9419046db4e..8d81597351c 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }: stdenv.mkDerivation rec { - name = "libivykis-${version}"; + pname = "libivykis"; version = "0.42.3"; diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 68835c1414c..1790f3f68b2 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "148"; version = "hg-2012-12-02"; - name = "libixp-${version}"; + pname = "libixp"; src = fetchurl { url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip; diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 2167b447703..9e81c932405 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }: stdenv.mkDerivation rec { - name = "libjreen-${version}"; + pname = "libjreen"; version = "1.2.0"; src = fetchurl { - url = "https://qutim.org/dwnl/73/${name}.tar.bz2"; + url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2"; sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; }; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index f352c8e9ed1..a7c9427080d 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libjson-rpc-cpp-${version}"; + pname = "libjson-rpc-cpp"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 93f3b2a4f84..12205a6a63b 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fftw, qtbase, qmake }: stdenv.mkDerivation rec { - name = "libkeyfinder-${version}"; + pname = "libkeyfinder"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 24dd34d7a6a..67d525112cc 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liblangtag"; version = "0.6.1"; diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index cafd6a66aa0..dd999db2759 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.5"; - name = "liblaxjson-${version}"; + pname = "liblaxjson"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 9870e024687..fe513d378cd 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: stdenv.mkDerivation rec { - name = "liblcf-${version}"; + pname = "liblcf"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 1a177dc2237..e8d8e971bc5 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "liblinear-${version}"; + pname = "liblinear"; version = "2.30"; src = fetchurl { diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 1a5a4baf808..471f277fb52 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "liblscp-${version}"; + pname = "liblscp"; version = "0.6.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.gz"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 8ff02b49e58..3786c5e77d3 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: stdenv.mkDerivation rec { - name = "libmatchbox-${version}"; + pname = "libmatchbox"; version = "1.11"; buildInputs = [ libXft libICE pango libjpeg ]; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 0f43c0d4616..7f5c8b4c4c2 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { version = "1.1.11"; - name = "libmatheval-${version}"; + pname = "libmatheval"; nativeBuildInputs = [ pkgconfig autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { - url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; + url = "https://ftp.gnu.org/gnu/libmatheval/${pname}-${version}.tar.gz"; sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab"; }; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index f1b15a91cca..46ed250b7b1 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmaxminddb-${version}"; + pname = "libmaxminddb"; version = "1.3.2"; src = fetchurl { - url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; + url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76"; }; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index de8baa7ad19..a38e71bb540 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libmd"; version = "1.0.1"; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index bf6aa0d23fb..adf856544c4 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "19.07"; - name = "libmediainfo-${version}"; + pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss"; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index e46eb9208de..7ec06b51e8c 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: stdenv.mkDerivation rec { - name = "libmesode-${version}"; + pname = "libmesode"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index d3f30a75273..598f0b7f789 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "mhash"; version = "0.9.9.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; }; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index f75d32c4313..719053e7ecf 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: stdenv.mkDerivation rec { - name = "libmicrohttpd-${version}"; + pname = "libmicrohttpd"; version = "0.9.64"; src = fetchurl { - url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; + url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7"; }; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index aa606e2a177..3eb688f9572 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { - name = "libmilter-${version}"; + pname = "libmilter"; version = "8.15.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 9c89d2e8d7b..8b659c46792 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libtool, autoconf, automake }: stdenv.mkDerivation rec { - name = "libmkv-${version}"; + pname = "libmkv"; version = "0.6.5.1"; src = fetchgit { diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 512add5616a..99f04bc09de 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmowgli-${version}"; + pname = "libmowgli"; version = "2.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index 4df38a9cc3c..e8392f88ac7 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtool }: stdenv.mkDerivation rec { - name = "libmpack-${version}"; + pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { owner = "tarruda"; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index dac7cf48aac..4c886078aa8 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.5.1"; - name = "libmpeg2-${version}"; + pname = "libmpeg2"; src = fetchurl { - url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz"; + url = "http://libmpeg2.sourceforge.net/files/${pname}-${version}.tar.gz"; sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 2b59adf8f92..05532df1abd 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.1.0"; - name = "libmusicbrainz-${version}"; + pname = "libmusicbrainz"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake neon libdiscid libxml2 ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 6653025eb05..483c5ff1ff7 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libmx-${version}"; + pname = "libmx"; version = "1.4.7"; src = fetchurl { diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 2b7258031c3..166ff2ef5a0 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, boost, mysql }: stdenv.mkDerivation rec { - name = "libmysqlconnectorcpp-${version}"; + pname = "libmysqlconnectorcpp"; version = "1.1.9"; src = fetchurl { diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index b461bfb3ddf..9414ebdcc2a 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.7"; - name = "libnabo-${version}"; + pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 17626bb23e1..695d46ba38f 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnatpmp-${version}"; + pname = "libnatpmp"; version = "20150609"; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 222a0df055b..6019d79b00d 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libndctl-${version}"; + pname = "libndctl"; version = "65"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 51e4deed462..6c4fc798f33 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libndtypes-${version}"; + pname = "libndtypes"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index ba116e20177..75cea004143 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnet-${version}"; + pname = "libnet"; version = "1.2-rc3"; src = fetchurl { - url = "mirror://sourceforge/libnet-dev/${name}.tar.gz"; + url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz"; sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 95533696ddf..328688612b6 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libnetfilter_acct-${version}"; + pname = "libnetfilter_acct"; src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${pname}-${version}.tar.bz2"; sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; }; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 41245e6539f..85fbf458ac2 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_conntrack-${version}"; + pname = "libnetfilter_conntrack"; version = "1.0.7"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k"; }; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index a680e009ab6..563843cca46 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_cthelper-${version}"; + pname = "libnetfilter_cthelper"; version = "1.0.0"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2"; sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index d16155374ca..9f706d619c3 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_cttimeout-${version}"; + pname = "libnetfilter_cttimeout"; version = "1.0.0"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2"; sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 0d8de14513e..2b932bc0809 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_log-${version}"; + pname = "libnetfilter_log"; version = "1.0.1"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2"; sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; }; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 94b3dc90a0b..5f84bc03f82 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libnetfilter_queue-${version}"; + pname = "libnetfilter_queue"; src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; }; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index bef977caa28..695ddadb5f3 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libusb, readline }: stdenv.mkDerivation rec { - name = "libnfc-${version}"; + pname = "libnfc"; version = "1.7.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 8ed6dfa8ac0..d2848d9a1e9 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libnfs-${version}"; + pname = "libnfs"; version = "4.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index c6348b7b2e6..d9b2df6148a 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -3,7 +3,7 @@ # Note that this does not provide the ngspice command-line utility. For that see # the ngspice derivation. stdenv.mkDerivation rec { - name = "libngspice-${version}"; + pname = "libngspice"; version = "30"; src = fetchurl { diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index d53b1dc0830..7c14d8102fb 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libomxil-bellagio-${version}"; + pname = "libomxil-bellagio"; version = "0.9.3"; src = fetchurl { - url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz"; + url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${pname}-${version}.tar.gz"; sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r"; }; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 450b9058d0b..c42cd3206b4 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libopcodes-${version}"; + pname = "libopcodes"; inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix index a29f8dc4a80..4ad1e2b7735 100644 --- a/pkgs/development/libraries/libopenaptx/default.nix +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libopenaptx-${version}"; + pname = "libopenaptx"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 791e4d890f9..37b3e8c93d9 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }: stdenv.mkDerivation rec { - name = "libosmium-${version}"; + pname = "libosmium"; version = "2.15.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index 7797061a71a..fa0db0cd4ff 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.2p1"; - name = "libow-${version}"; + pname = "libow"; src = fetchFromGitHub { owner = "owfs"; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 774019de0d5..903aa66ce60 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -2,13 +2,13 @@ , openssl }: stdenv.mkDerivation rec { - name = "libp11-${version}"; + pname = "libp11"; version = "0.4.10"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz"; }; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index b4b72e5a36d..3c37cf82495 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.24"; - name = "libpaper-${version}"; + pname = "libpaper"; src = fetchurl { url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index bf1d26cf90d..d0572de537e 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.10.1"; - name = "libpfm-${version}"; + pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index bf516b33d02..63035f74ea0 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation rec { - name = "libpinyin-${version}"; + pname = "libpinyin"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index d622584c9da..19b700ca5e3 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { pname = "libplist"; version = "2019-04-04"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 3b050c3dc6a..09bb0e4aa3f 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -3,7 +3,7 @@ , SystemConfiguration, CoreFoundation, JavaScriptCore }: stdenv.mkDerivation rec { - name = "libproxy-${version}"; + pname = "libproxy"; version = "0.4.15"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index 7d697ee10f1..60c01565e63 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }: stdenv.mkDerivation rec { - name = "libpwquality-${version}"; + pname = "libpwquality"; version = "1.4.0"; src = fetchFromGitHub { owner = "libpwquality"; repo = "libpwquality"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd"; }; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 048ba48bb67..22245f5fa2a 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -8,7 +8,7 @@ with lib; mkDerivation rec { - name = "libqtav-${version}"; + pname = "libqtav"; version = "1.12.0"; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 5eb8049437c..360b2c15a63 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lcms2, jasper, pkgconfig }: stdenv.mkDerivation rec { - name = "libraw-${version}"; + pname = "libraw"; version = "0.19.3"; src = fetchurl { diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index d92b017712d..5b39940bb3f 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; - name = "liblrdf-${version}"; + pname = "liblrdf"; src = fetchurl { url = "https://github.com/swh/LRDF/archive/${version}.tar.gz"; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index c9debe61743..e365ec7a01a 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { version = "0.6.0"; - name = "libre-${version}"; + pname = "libre"; src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf"; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 392c5052e07..1ff0b2f646f 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}: stdenv.mkDerivation rec { - name = "librealsense-${version}"; + pname = "librealsense"; version = "2.23.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 50c20d12ccc..aeda663342e 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { version = "0.6.0"; - name = "librem-${version}"; + pname = "librem"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1"; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 2f78222cebb..f11a7eb1fe5 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "librep-${version}"; + pname = "librep"; version = "0.92.7"; sourceName = "librep_${version}"; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index d710c41a97c..63f6c904330 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -3,11 +3,11 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "libressl-${version}"; + pname = "libressl"; inherit version; src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; + url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index e4e96df86c1..79b05619ac5 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: stdenv.mkDerivation rec { - name = "librsync-${version}"; + pname = "librsync"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 479da52f8d9..b9ae1f829a1 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libscrypt-${version}"; + pname = "libscrypt"; version = "1.21"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 785dac4aef2..b2a79967477 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - name = "libsearpc-${version}"; + pname = "libsearpc"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 6b38bcf2c77..8c9c6ac107c 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, getopt, makeWrapper, utillinux }: stdenv.mkDerivation rec { - name = "libseccomp-${version}"; + pname = "libseccomp"; version = "2.4.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 82caacf93e6..970c4aff246 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -9,10 +9,9 @@ stdenv.mkDerivation rec { minor = "8"; level = "7"; version = "${major}.${minor}.${level}"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz"; + url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz"; sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da"; }; diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index 2da5d68d117..bc34318d0a9 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { version = "2.3.1"; - name = "libsieve-${version}"; + pname = "libsieve"; src = fetchurl { url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 34d959423a3..561b547a8d7 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { version = "1.8.2"; - name = "libsixel-${version}"; + pname = "libsixel"; src = fetchFromGitHub { repo = "libsixel"; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 19ebbd363e1..d0f822a23f5 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -4,7 +4,7 @@ libgee, json-glib, skk-dicts, libxkbcommon }: stdenv.mkDerivation rec { - name = "libskk-${version}"; + pname = "libskk"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 25f2a1e0846..208aa6c9d61 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -1,11 +1,11 @@ { stdenv , fetchurl }: stdenv.mkDerivation rec { - name = "libsmi-${version}"; + pname = "libsmi"; version = "0.5.0"; src = fetchurl { - url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz"; + url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${pname}-${version}.tar.gz"; sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; }; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 8ffae53be19..263623c3d37 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "libsolv-${version}"; + pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index f53db7241cf..e7ec858cc7b 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "libsoundio-${version}"; + pname = "libsoundio"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 52a52e7e732..5f88ba80cd6 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,12 +3,11 @@ , libpsl, python3 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libsoup"; version = "2.66.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"; }; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 00579600cb7..5f547a97370 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,10 +1,10 @@ {stdenv, pkgconfig, fetchurl}: stdenv.mkDerivation rec { - name = "libspiro-${version}"; + pname = "libspiro"; version = "0.5.20150702"; src = fetchurl { - url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; }; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index 7d9ea25e9d2..f8fc6a446d1 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "libsrs2-${version}"; + pname = "libsrs2"; version = "1.0.18"; src = fetchurl { diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index c1e6a1f7fb8..0ef96f67505 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }: stdenv.mkDerivation rec { - name = "libstrophe-${version}"; + pname = "libstrophe"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 6eb8b6b1a8e..fcd010b46cc 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libsvm-${version}"; + pname = "libsvm"; version = "3.23"; src = fetchurl { diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index 29d83bcd9d7..ca0407bd0aa 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "libtap-${version}"; + pname = "libtap"; version = "1.12.0"; src = fetchurl { - url = "https://web-cpan.shlomifish.org/downloads/${name}.tar.bz2"; + url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s"; }; diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index f2cb879b3e0..c4614103b3f 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.20"; - name = "libtar-${version}"; + pname = "libtar"; # Maintenance repo for libtar (Arch Linux uses this) src = fetchgit { diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 4e859c28227..7a25980a38b 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "libtcod-${version}"; + pname = "libtcod"; version = "1.5.1"; src = fetchFromBitbucket { diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 0bc619051c6..139de830972 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: stdenv.mkDerivation rec { - name = "libtelnet-${version}"; + pname = "libtelnet"; version = "0.21+45f2d5c"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 7261fb7b6b7..38a09218dd1 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }: stdenv.mkDerivation rec { - name = "libtermkey-${version}"; + pname = "libtermkey"; version = "0.20"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 55c747540f7..093d6a18544 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.0.10"; - name = "libtiff-${version}"; + pname = "libtiff"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index f9e7f9684ba..6520ddd0a9e 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "libtomcrypt-${version}"; + pname = "libtomcrypt"; version = "1.18.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index a90377dad34..8ce82bcf07c 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "libtommath-${version}"; + pname = "libtommath"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index 3b45d4de884..7080edcd738 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "7"; - name = "libuecc-${version}"; + pname = "libuecc"; src = fetchgit { url = "git://git.universe-factory.net/libuecc"; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index e21f9400848..35ec5dfed7c 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "libunarr-${version}"; + pname = "libunarr"; version = "1.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 50bc0539589..7e75954fb45 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libunibreak-${version}"; + pname = "libunibreak"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz"; sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn"; }; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b302e1d0ba0..b315d0f16b0 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { majorVer = "3.0"; minorVer = "2"; version = "${majorVer}.${minorVer}"; - name = "libunique3-${version}"; + pname = "libunique3"; srcName = "libunique-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index e066c072367..e02e5228aa4 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libunistring-${version}"; + pname = "libunistring"; version = "0.9.10"; src = fetchurl { - url = "mirror://gnu/libunistring/${name}.tar.gz"; + url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8"; }; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 9bea14bd8e8..70e6b698ec5 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { - name = "libunwind-${version}"; + pname = "libunwind"; version = "1.3.1"; src = fetchurl { - url = "mirror://savannah/libunwind/${name}.tar.gz"; + url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz"; sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3"; }; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 90be7740114..3ed45e788c4 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; - name = "liburcu-${version}"; + pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index ff88bdcaafd..5eeb50468de 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "liburing-${version}"; + pname = "liburing"; version = "1.0.0pre156_${builtins.substring 0 7 src.rev}"; src = fetchgit { diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index d9e008af977..debccb9087d 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; version = "2019-03-23"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix index f9703e3c593..ff2044242b9 100644 --- a/pkgs/development/libraries/libutempter/default.nix +++ b/pkgs/development/libraries/libutempter/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "libutempter-${version}"; + pname = "libutempter"; version = "1.1.6"; src = fetchurl { diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index 9883de59feb..c604ce71cb7 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libva-utils-${version}"; + pname = "libva-utils"; inherit (libva) version; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 6a067244543..9b12f83bcb8 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "libva-${version}"; + pname = "libva"; version = "1.7.3"; src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2"; sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 50b995a0356..039e3308f88 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -2,7 +2,7 @@ , libXext, libvdpau, glib, libva, ffmpeg, libGLU }: stdenv.mkDerivation rec { - name = "libvdpau-va-gl-${version}"; + pname = "libvdpau-va-gl"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index d6842226014..792a31bcf9f 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg, mesa }: stdenv.mkDerivation rec { - name = "libvdpau-${version}"; + pname = "libvdpau"; version = "1.2"; src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2"; sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c559d3f8407..d5f4ae0ce02 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -16,13 +16,13 @@ with stdenv.lib; let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "libvirt-${version}"; + pname = "libvirt"; version = "5.4.0"; src = if buildFromTarball then fetchurl { - url = "http://libvirt.org/sources/${name}.tar.xz"; + url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"; } else diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index a09e2cf2f72..a272d355c84 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "libvisio-${version}"; + pname = "libvisio"; version = "0.1.6"; outputs = [ "out" "bin" "dev" "doc" ]; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio/${pname}-${version}.tar.xz"; sha256 = "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y"; }; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 44b2a81b2d3..e49ab9b38a0 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libvmi-${version}"; + pname = "libvmi"; version = "0.12.0"; libVersion = "0.0.12"; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index cd0cc9798fa..ee36365c03f 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -55,7 +55,7 @@ assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { - name = "libvpx-${version}"; + pname = "libvpx"; version = "1.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index a1e10b6d003..a4f0a44e60b 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }: stdenv.mkDerivation rec { - name = "libwacom-${version}"; + pname = "libwacom"; version = "0.33"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index c11f70290a4..fc9932567cf 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -26,11 +26,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libwebp-${version}"; + pname = "libwebp"; version = "1.0.3"; src = fetchurl { - url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; + url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; }; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 7c1d58d2980..6bec6166246 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: stdenv.mkDerivation rec { - name = "libwebsockets-${version}"; + pname = "libwebsockets"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 2af550c7d99..18f6d37768a 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { - name = "libwhereami-${version}"; + pname = "libwhereami"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 76ac946d618..e8f39754885 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: stdenv.mkDerivation rec { - name = "libwps-${version}"; + pname = "libwps"; version = "0.4.10"; src = fetchurl { - url = "mirror://sourceforge/libwps/${name}.tar.bz2"; + url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4"; }; diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index d56c20cb75a..271823ace28 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libx86-${version}"; + pname = "libx86"; version = "1.1"; src = fetchurl { - url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${pname}-${version}.tar.gz"; sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; }; patches = [./constants.patch ./non-x86.patch ]; diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index 2e00b5b5ab9..f361b3e1b1f 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "libx86emu-${version}"; + pname = "libx86emu"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index b4ad501c2ef..fb1f4b29423 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { - name = "libxcomp-${version}"; + pname = "libxcomp"; version = "3.5.99.16"; src = fetchurl { diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index a2a576edc0f..12658996646 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libxls-${version}"; + pname = "libxls"; version = "1.5.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 33f818f7d62..04954f3e1f5 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -10,11 +10,11 @@ let python = python2; in stdenv.mkDerivation rec { - name = "libxml2-${version}"; + pname = "libxml2"; version = "2.9.9"; src = fetchurl { - url = "http://xmlsoft.org/sources/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl"; }; diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 9edb9b475e8..209a7328d12 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { - name = "libxmlb-${version}"; + pname = "libxmlb"; version = "0.1.10"; outputs = [ "out" "lib" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index cb93ec63e67..9eb891544b5 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libxnd-${version}"; + pname = "libxnd"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 2dde7fe32ef..1a3efee176a 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -11,10 +11,9 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; version = "1.1.33"; - name = pname + "-" + version; src = fetchurl { - url = "http://xmlsoft.org/sources/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; }; diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index af665c6d9a4..75b377ff8d4 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libyaml-cpp-${version}"; + pname = "libyaml-cpp"; version = "0.6.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index 710e7a3f072..e46064ae56e 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "libytnef-${version}"; + pname = "libytnef"; version = "1.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index f3cbddf1ec4..b16d897fb5f 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.1"; - name = "libzdb-${version}"; + pname = "libzdb"; src = fetchurl { diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index afa7696aca9..fbbfb5364b0 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.37"; - name = "libzen-${version}"; + pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn"; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 50ed00711df..43a5f7dc841 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libzip-${version}"; + pname = "libzip"; version = "1.3.0"; src = fetchurl { - url = "https://www.nih.at/libzip/${name}.tar.gz"; + url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; }; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 1413da4a18d..85b9308237f 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libzmf"; version = "0.0.2"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libzmf/${pname}-${version}.tar.xz"; sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 3f963c7ca19..8a5026e307f 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lightning-${version}"; + pname = "lightning"; version = "2.1.2"; src = fetchurl { - url = "mirror://gnu/lightning/${name}.tar.gz"; + url = "mirror://gnu/lightning/${pname}-${version}.tar.gz"; sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v"; }; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index ab0e51bae26..7f82d49462c 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "lightstep-tracer-cpp-${version}"; + pname = "lightstep-tracer-cpp"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 9af0c20d701..f5cb197dfe5 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -9,7 +9,6 @@ , withSage ? false # sage support }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "linbox"; version = "1.6.3"; diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 5fa1035868d..b105aa64bff 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "linenoise-ng-${version}"; + pname = "linenoise-ng"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 6bbcc725f22..857f5247cd5 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "linenoise-${version}"; + pname = "linenoise"; version = "1.0.10"; # Its version 1.0 plus 10 commits src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 99ea6343d70..8b0aecdab16 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "liquid-dsp-${version}"; + pname = "liquid-dsp"; version = "20170307"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 268476e079d..a5eec1805e1 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -2,7 +2,7 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { - name = "live555-${version}"; + pname = "live555"; version = "2019.06.28"; src = fetchurl { # the upstream doesn't provide a stable URL diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 690a42cfb30..830ec7bdaee 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "lmdb-${version}"; + pname = "lmdb"; version = "0.9.24"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 232a67c23f3..f4ecba7ad1e 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -3,7 +3,7 @@ , lmdb }: stdenv.mkDerivation rec { - name = "lmdbxx-${version}"; + pname = "lmdbxx"; version = "0.9.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix index f0904726eed..c4e55b14407 100644 --- a/pkgs/development/libraries/loadcaffe/default.nix +++ b/pkgs/development/libraries/loadcaffe/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}: stdenv.mkDerivation rec { - name = "loadcaffe-${version}"; + pname = "loadcaffe"; version = "0.0pre2016.08.01"; buildInputs = [cmake torch protobuf protobufc]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 8e854156424..04b91e5d80f 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "log4cxx-${version}"; + pname = "log4cxx"; version = "0.10.0"; src = fetchurl { - url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz"; + url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index b2fba7df509..ab8c2c9385f 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { - name = "log4shib-${version}"; + pname = "log4shib"; version = "1.0.9"; src = fetchgit { diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 2ff927048ad..631233f0ecb 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "loki-${version}"; + pname = "loki"; version = "0.1.7"; src = fetchurl { diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index cad5d0d7eca..e00fc07480e 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5.3"; - name = "loudmouth-${version}"; + pname = "loudmouth"; src = fetchurl { - url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2"; + url = "https://mcabber.com/files/loudmouth/${pname}-${version}.tar.bz2"; sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index c45fa6bc61a..32eec84e69e 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { - name = "lucene++-${version}"; + pname = "lucene++"; version = "3.0.7"; src = fetchurl { diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index 8a8a004a5e6..7355248b5c5 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, yasm }: stdenv.mkDerivation rec { - name = "mac-${version}"; + pname = "mac"; version = "4.11-u4-b5-s7"; src = fetchurl { diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index c7794b1a8bf..04f2208a35d 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mailcore2-${version}"; + pname = "mailcore2"; version = "0.6.3"; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 3a90a4cdf33..1feea915c02 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "mapnik-${version}"; + pname = "mapnik"; version = "3.0.22"; src = fetchzip { diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 064f04f220c..cec9e5adc29 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ant, jdk}: stdenv.mkDerivation rec { - name = "martyr-${version}"; + pname = "martyr"; version = "0.3.9"; src = fetchurl { - url = "mirror://sourceforge/martyr/${name}.tar.gz"; + url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index a72d5a825c6..a06d082b226 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { - name = "mbedtls-${version}"; + pname = "mbedtls"; version = "2.17.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw"; }; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 8f0a6317a25..04ebfced52e 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, hdf5 }: stdenv.mkDerivation rec { - name = "medfile-${version}"; + pname = "medfile"; version = "4.0.0"; src = fetchurl { diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index b8a8c64011c..ebd68134ba5 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mediastreamer-openh264-${version}"; + pname = "mediastreamer-openh264"; version = "0.0pre20160801"; src = fetchgit { diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 94622b8a8f9..902fd920568 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: stdenv.mkDerivation rec { - name = "glu-${version}"; + pname = "glu"; version = "9.0.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${pname}-${version}.tar.bz2"; sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz"; }; postPatch = '' diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index 788d2c5d618..0919ee6cd28 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -5,7 +5,7 @@ let nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform; in stdenv.mkDerivation rec { - name = "microsoft_gsl-${version}"; + pname = "microsoft_gsl"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 7a06f9277c9..5f4dc5eedde 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "mimetic"; version = "0.9.8"; - name = "${pname}-${version}"; src = fetchurl { url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 791cc9f3f91..3493bc5d967 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniball-${version}"; + pname = "miniball"; version = "3.0"; src = fetchurl { diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 972cc3e738c..5bdacbba11d 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mxml-${version}"; + pname = "mxml"; version = "3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index a56deff66e4..5099991c117 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "mlt-${version}"; + pname = "mlt"; version = "6.16.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f46ec57197f..f017e4452a6 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -6,7 +6,7 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "mlt-${version}"; + pname = "mlt"; version = "6.16.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 2a933ef7840..49116c349a8 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mongoc-${version}"; + pname = "mongoc"; version = "1.8.0"; src = fetchzip { diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 58905cce82a..2bba61975f9 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { - name = "mono-addins-${version}"; + pname = "mono-addins"; version = "1.3.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index ba9e2a741e4..89db7344f99 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, pkgconfig, mono }: stdenv.mkDerivation rec { - name = "mono-zeroconf-${version}"; + pname = "mono-zeroconf"; version = "0.9.0"; src = fetchurl { diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 51591c9d8e8..ba61cb8414a 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -8,11 +8,11 @@ # refer to the gentoo package stdenv.mkDerivation rec { - name = "motif-${version}"; + pname = "motif"; version = "2.3.6"; src = fetchurl { - url = "mirror://sourceforge/motif/${name}.tar.gz"; + url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz"; sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs"; }; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 96444ea4a23..8162d3bb911 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }: stdenv.mkDerivation rec { - name = "movit-${version}"; + pname = "movit"; version = "1.6.3"; src = fetchurl { - url = "https://movit.sesse.net/${name}.tar.gz"; + url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; }; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 6b607e94bd4..baefab487e5 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, mpfr}: stdenv.mkDerivation rec { - name = "mpfi-${version}"; + pname = "mpfi"; version = "1.5.3"; file_nr = "37331"; src = fetchurl { diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index e32c83af8a7..a91d220be33 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "4.0.2"; - name = "mpfr-${version}"; + pname = "mpfr"; src = fetchurl { urls = [ #"https://www.mpfr.org/${name}/${name}.tar.xz" - "mirror://gnu/mpfr/${name}.tar.xz" + "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx"; }; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 1c6b8df1511..2232bfb9a38 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -3,7 +3,7 @@ } : stdenv.mkDerivation rec { - name = "mpich-${version}"; + pname = "mpich"; version = "3.3.1"; src = fetchurl { diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index fe9cd6f492e..3b40f02c01c 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { - name = "mpir-${version}"; + pname = "mpir"; version = "3.0.0"; nativeBuildInputs = [ m4 which yasm ]; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 1430a3dfca1..3767b22ba0d 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, sqlite }: stdenv.mkDerivation rec { - name = "mps-${version}"; + pname = "mps"; version = "1.117.0"; src = fetchurl { diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index e177694e894..b200a12ef95 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "msgpuck-${version}"; + pname = "msgpuck"; version = "2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index ef8525cf54d..da41aceeef5 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -2,7 +2,7 @@ , boost, openssl, zlib, libsodium, olm, nlohmann_json }: stdenv.mkDerivation rec { - name = "mtxclient-${version}"; + pname = "mtxclient"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 53f348f93f8..d058322660c 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "muparser-${version}"; + pname = "muparser"; version = "2.2.3"; url-version = stdenv.lib.replaceChars ["."] ["_"] version; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index f4a869255f8..0907f0174c9 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -4,7 +4,7 @@ let renderSystem = if withOgre then "3" else "4"; in stdenv.mkDerivation rec { - name = "mygui-${version}"; + pname = "mygui"; version = "3.2.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index f29fb9564f3..5c0238fe41e 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "nanoflann-${version}"; + pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 8f72b333aa4..94bc8186f30 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.5"; - name = "nanomsg-${version}"; + pname = "nanomsg"; src = fetchFromGitHub { owner = "nanomsg"; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 55e9f44eae3..c842eac4311 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.8.1"; - name = "nco-${version}"; + pname = "nco"; buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl flex ]; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index 87f9b5effac..fbffb138e96 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { version = "0.29.6"; - name = "neon-${version}"; + pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; + url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; }; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 61a40753a56..ffefc8e51c4 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { version = "0.30.2"; - name = "neon-${version}"; + pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; + url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv"; }; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index a57884912ba..665145a92ac 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, netcdf, hdf5, curl }: stdenv.mkDerivation rec { - name = "netcdf-cxx4-${version}"; + pname = "netcdf-cxx4"; version = "4.3.0"; src = fetchurl { diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index bb621a3eda6..c9c52636a5b 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { - name = "netcdf-fortran-${version}"; + pname = "netcdf-fortran"; version = "4.4.5"; src = fetchurl { diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 3c5ae8537a4..4609fd1a376 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -2,7 +2,7 @@ , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { - name = "notify-sharp-${version}"; + pname = "notify-sharp"; version = "3.0.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 43732406064..2cbf88633e7 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npapi-sdk-${version}"; + pname = "npapi-sdk"; version = "0.27.2"; src = fetchurl { - url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${pname}-${version}.tar.bz2"; sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1"; }; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index b410686865f..b7b4ea45d8b 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { - name = "nss-${version}"; + pname = "nss"; inherit version; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; }; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index dac65e1c2f9..5ea43097b8c 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ntbtls-${version}"; + pname = "ntbtls"; version = "0.1.2"; src = fetchurl { diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 12d3c9ad942..e83fe2e7e7b 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -13,7 +13,7 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { - name = "ntl-${version}"; + pname = "ntl"; version = "11.3.2"; src = fetchurl { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { perl # needed for ./configure ]; - sourceRoot = "${name}/src"; + sourceRoot = "${pname}-${version}/src"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 91318c802d8..db542ec93a9 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: stdenv.mkDerivation rec { - name = "nuspell-${version}"; + pname = "nuspell"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 77167361ff2..73b5e3fe772 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "nvidia-texture-tools-${version}"; + pname = "nvidia-texture-tools"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index abdc7502052..6cab843a22b 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { - name = "ocl-icd-${version}"; + pname = "ocl-icd"; version = "2.2.10"; src = fetchurl { - url = "https://forge.imag.fr/frs/download.php/810/${name}.tar.gz"; + url = "https://forge.imag.fr/frs/download.php/810/${pname}-${version}.tar.gz"; sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index aa188650860..a540d89ed3b 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ode-${version}"; + pname = "ode"; version = "0.12"; src = fetchurl { diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 931ecc186be..34af3b0b9e0 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }: stdenv.mkDerivation rec { - name = "odpic-${version}"; + pname = "odpic"; version = "3.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 42babc32ecd..2855d1139c3 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { pname = "ogre"; version = "1.9.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "OGRECave"; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index f1b6060e166..dc3bf8cf009 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -10,7 +10,7 @@ , withSamples ? false }: stdenv.mkDerivation rec { - name = "ogre-${version}"; + pname = "ogre"; version = "1.12.1"; src = fetchurl { diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index e4045bcd5dc..0844c44c8a8 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { - name = "ogre-paged-${version}"; + pname = "ogre-paged"; version = "1.2.0"; src = fetchurl { diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 253d185fa0c..15e83cf9d76 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "ois-${version}"; + pname = "ois"; version = "${majorVersion}.${minorVersion}"; src = fetchurl { diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 49daff30e7b..dd3f83a0130 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "olm-${version}"; + pname = "olm"; version = "3.0.0"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; + url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz"; sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c"; }; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index b54f34fbb2c..8582580579d 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "onig-${version}"; + pname = "onig"; version = "6.9.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index b60a53e55ca..32b13115957 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "opae-${version}"; + pname = "opae"; version = "1.0.0"; # the tag has a silly name for some reason. drop this in the future if diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 3c082926e06..89ac85b752b 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -11,12 +11,12 @@ assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "1.19.1"; - name = "openal-soft-${version}"; + pname = "openal-soft"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi"; }; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 81754ffad4d..26bcf3d20ff 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: stdenv.mkDerivation rec { - name = "openbabel-${version}"; + pname = "openbabel"; version = "2.4.1"; src = fetchurl { diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 4d3e9e9a04e..5aeb07de923 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.5"; - name = "openbr-${version}"; + pname = "openbr"; src = fetchFromGitHub { owner = "biometrics"; diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index 2b2fc3ff4d5..292b824709b 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -2,13 +2,12 @@ stdenv.mkDerivation rec { pname = "openbsm"; - name = "${pname}-${version}"; version = "1.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}"; + rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}")}"; sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 613aeddd77b..5ed2dd5e23d 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, opencl-headers }: stdenv.mkDerivation rec { - name = "opencl-clhpp-${version}"; + pname = "opencl-clhpp"; version = "2.0.10"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index cd3da4a7960..9bd25bfb93a 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -2,7 +2,7 @@ , darwin}: stdenv.mkDerivation rec { - name = "opencollada-${version}"; + pname = "opencollada"; version = "1.6.68"; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 3081c6c839c..cbd05848173 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "opencolorio-${version}"; + pname = "opencolorio"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 11c66f0d497..1fdddf930cf 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.4.2"; - name = "opencsg-${version}"; + pname = "opencsg"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 5ad7eecace1..5f1c2b5c6f6 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "openct-${version}"; + pname = "openct"; version = "0.6.20"; src = fetchFromGitHub { owner = "OpenSC"; repo = "openct"; - rev = name; + rev = "${pname}-${version}"; sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2"; }; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d5dc716c4a8..e35f5375fd9 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -140,7 +140,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 85bb2f1effd..ab24dcb1944 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -153,7 +153,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 784071c6e4d..b91a1489eb6 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; version = "2.4.13"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 17e2c9098a1..77569590142 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "opendht-${version}"; + pname = "opendht"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 3d110910b15..fd8dadb5398 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -2,11 +2,11 @@ , perl, makeWrapper }: stdenv.mkDerivation rec { - name = "opendkim-${version}"; + pname = "opendkim"; version = "2.10.3"; src = fetchurl { - url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; + url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz"; sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; }; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 072848d7bbc..9eef138c532 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { - name = "openexr-${version}"; + pname = "openexr"; version = lib.getVersion ilmbase; src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; }; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 099bd8d1e97..5d26063adb6 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openexrid-unstable-${version}"; + pname = "openexrid-unstable"; version = "2017-09-17"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index cd3210dd08b..6554d025311 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "openfst"; version = "1.7.2"; src = fetchurl { - url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1"; }; meta = { diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index 42edb1958ce..abc60f026e5 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openfx-${version}"; + pname = "openfx"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index c8208ce27ba..cd91a132597 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { - name = "openh264-${version}"; + pname = "openh264"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index ed646b9e221..6d53d23ae0e 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "openpa"; version = "1.0.4"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz"; + url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${pname}-${version}.tar.gz"; sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy"; }; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 339f6064999..b217527269d 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "openpam-${version}"; + pname = "openpam"; version = "20170430"; src = fetchurl { - url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz"; + url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz"; sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 659c4fb7cff..1c753008022 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: stdenv.mkDerivation rec { - name = "opensaml-cpp-${version}"; + pname = "opensaml-cpp"; version = "2.6.1"; src = fetchgit { diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index f07ebad9e81..46028d3a7ea 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openssl-chacha-${version}"; + pname = "openssl-chacha"; version = "2016-08-22"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 72e532ae782..81ef6a3bf5d 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "opensubdiv-${version}"; + pname = "opensubdiv"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index 00f4f45df96..f29972a64bd 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "opentracing-cpp-${version}"; + pname = "opentracing-cpp"; version = "1.5.1"; src = fetchFromGitHub { owner = "opentracing"; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index af88172c57a..800acebac34 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openvdb-${version}"; + pname = "openvdb"; version = "6.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index a986b71bc1d..134ec74d530 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -2,7 +2,7 @@ , curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { - name = "openwsman-${version}"; + pname = "openwsman"; version = "2.6.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index fe260e0c2ad..2e90d867b5a 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -37,7 +37,7 @@ let extLib = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation rec { inherit version srcs; - name = "oracle-instantclient-${version}"; + pname = "oracle-instantclient"; buildInputs = [ stdenv.cc.cc.lib ] ++ optionals (stdenv.isLinux) [ libaio ] @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { unpackCmd = "unzip $curSrc"; installPhase = '' - mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"} + mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} install -Dm755 {sqlplus,adrci,genezi} $out/bin ${optionalString stdenv.isDarwin '' for exe in "$out/bin/"* ; do @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { install -Dm644 *${extLib}* $out/lib install -Dm644 *.jar $out/share/java install -Dm644 sdk/include/* $out/include - install -Dm644 sdk/demo/* $out/share/${name}/demo + install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo # PECL::oci8 will not build without this # this symlink only exists in dist zipfiles for some platforms diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index ce917ccbe7f..a243b5c0b51 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0"; }; - name = "libosip2-${version}"; + pname = "libosip2"; meta = { license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index a1e7215fd9a..551c70cebcc 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,7 +1,7 @@ { cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "osm-gps-map-${version}"; + pname = "osm-gps-map"; version = "1.1.0"; src = fetchzip { diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 47c6a27639d..67c4e75c1e1 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "pagmo2-${version}"; + pname = "pagmo2"; version = "2.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 6fb123f5094..44293d52da4 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "pangolin-${version}"; + pname = "pangolin"; version = "2017-08-02"; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index b45ed296691..d90a27ed545 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "partio-${version}"; + pname = "partio"; version = "2018-03-01"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 2050e5cdfe7..32fc27f9ab4 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -4,7 +4,7 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { - name = "pcaudiolib-${version}"; + pname = "pcaudiolib"; version = "2016-07-19"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 654698c1b32..58fbb26532e 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.94"; - name = "pcg-c-${version}"; + pname = "pcg-c"; src = fetchzip { - url = "http://www.pcg-random.org/downloads/${name}.zip"; + url = "http://www.pcg-random.org/downloads/${pname}-${version}.zip"; sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv"; }; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index f080de82ddc..e27c71314d9 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcre2-${version}"; + pname = "pcre2"; version = "10.33"; src = fetchurl { - url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2"; sha256 = "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m"; }; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 4cc607345e8..473fb3bfd48 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pHash"; version = "0.9.4"; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index d542c6cf1d7..5302ad21258 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }: stdenv.mkDerivation rec { - name = "apfel-${version}"; + pname = "apfel"; version = "3.0.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 983523e1f2f..2ba87024bc5 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { - name = "apfelgrid-${version}"; + pname = "apfelgrid"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 1ad5dcb8b25..edda5148068 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }: stdenv.mkDerivation rec { - name = "applgrid-${version}"; + pname = "applgrid"; version = "1.4.70"; src = fetchurl { - url = "https://www.hepforge.org/archive/applgrid/${name}.tgz"; + url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz"; sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index f01fab74635..2a1846e40a6 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2006"; - name = "cernlib-${version}"; + pname = "cernlib"; src = fetchurl { url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 3828cfda2af..826362cc586 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "fastjet-${version}"; + pname = "fastjet"; version = "3.3.2"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e3291907d31..5ef446319a8 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { - name = "fastnlo_toolkit-${version}"; + pname = "fastnlo_toolkit"; version = "2.3.1pre-2402"; src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; + url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 5f51c6a194c..fb108dd7c25 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { version = "10.4.1"; - name = "geant4-${version}"; + pname = "geant4"; src = fetchurl{ url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 0b1f3f0490d..dd39fbbc84b 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit (geant4_nomt) version src; - name = "g4py-${version}"; + pname = "g4py"; sourceRoot = "geant4.10.04.p01/environments/g4py"; diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index d61a68ebe34..665cd417dc0 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "hepmc-${version}"; + pname = "hepmc"; version = "2.06.10"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index c4717800f70..3116c4d36bb 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, coreutils, root }: stdenv.mkDerivation rec { - name = "hepmc3-${version}"; + pname = "hepmc3"; version = "3.1.1"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 7a146bb7309..d252e62286b 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "herwig-${version}"; + pname = "herwig"; version = "7.1.5"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 9c379f6a347..9e68fbd3fc4 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { - name = "hoppet-${version}"; + pname = "hoppet"; version = "1.2.0"; src = fetchurl { - url = "https://hoppet.hepforge.org/downloads/${name}.tgz"; + url = "https://hoppet.hepforge.org/downloads/${pname}-${version}.tgz"; sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 3ad0b3dc4cc..dff9fb1c1dd 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2, makeWrapper }: stdenv.mkDerivation rec { - name = "lhapdf-${version}"; + pname = "lhapdf"; version = "6.2.3"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index b287e52b243..74b4ba4224e 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fastnlo, rivet, pkgconfig }: stdenv.mkDerivation rec { - name = "mcgrid-${version}"; + pname = "mcgrid"; version = "2.0.2"; src = fetchurl { - url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz"; sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; }; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index a608a7f6b0f..1518c23718a 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gfortran }: stdenv.mkDerivation rec { - name = "mela-${version}"; + pname = "mela"; version = "2.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 2f79a2b76ab..20df49d9ae7 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nlojet++-${version}"; + pname = "nlojet++"; version = "4.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index e6b351c206d..0398175a9a2 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { - name = "pythia-${version}"; + pname = "pythia"; version = "8.243"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 620f227250d..ad5f994620f 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { - name = "QCDNUM-${version}"; + pname = "QCDNUM"; version = "17-01-13"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c068424e416..914eee5c286 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { - name = "rivet-${version}"; + pname = "rivet"; version = "2.7.2"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 272761977ba..fa293eab350 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { - name = "thepeg-${version}"; + pname = "thepeg"; version = "2.1.5"; src = fetchurl { diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 08afe6d6452..c6c6f742d0b 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { - name = "yoda-${version}"; + pname = "yoda"; version = "1.7.7"; src = fetchurl { diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d3bbb867974..1f9996ec213 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-${version}"; + pname = "pixman"; version = "0.38.4"; src = fetchurl { - url = "mirror://xorg/individual/lib/${name}.tar.bz2"; + url = "mirror://xorg/individual/lib/${pname}-${version}.tar.bz2"; sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 5cf5d34b9af..ce511544a42 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: stdenv.mkDerivation rec { - name = "pkcs11-helper-${version}"; + pname = "pkcs11-helper"; version = "1.25.1"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; - rev = "${name}"; + rev = "${pname}-${version}"; sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns"; }; diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index ceb49fc0153..e945154c003 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pmdk-${version}"; + pname = "pmdk"; version = "1.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 3f6a609121a..8509468f59a 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -4,7 +4,7 @@ assert docSupport -> doxygen != null; stdenv.mkDerivation rec { - name = "pngpp-${version}"; + pname = "pngpp"; version = "0.2.10"; src = fetchurl { diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 68ddf5c91d1..993e53f2133 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }: stdenv.mkDerivation rec { - name = "poco-${version}"; + pname = "poco"; version = "1.9.2"; src = fetchurl { - url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; + url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz"; sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd"; }; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 722c1cae872..809159b8c2f 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.9.6"; - name = "podofo-${version}"; + pname = "podofo"; src = fetchurl { - url = "mirror://sourceforge/podofo/${name}.tar.gz"; + url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; }; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index f790c62f5af..ffe7f46b77d 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: stdenv.mkDerivation rec { - name = "portmidi-${version}"; + pname = "portmidi"; version = "217"; src = fetchurl { diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index a18d768c288..8704356a537 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "protozero-${version}"; + pname = "protozero"; version = "1.6.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 74c6e8ef1b3..d1825171596 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: stdenv.mkDerivation rec { - name = "pugixml-${version}"; + pname = "pugixml"; version = "1.9"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index b5a01698e5e..66a395801b2 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, autoreconfHook }: stdenv.mkDerivation rec { - name = "libupnp-${version}"; + pname = "libupnp"; version = "1.8.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix index aa1f8d10ba9..7dfbdc4d64a 100644 --- a/pkgs/development/libraries/pybind11/default.nix +++ b/pkgs/development/libraries/pybind11/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }: stdenv.mkDerivation rec { - name = "pybind-${version}"; + pname = "pybind"; version = "2.2.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 4b5b7ace074..2b630de14b2 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2"; - name = "python-qt-${version}"; + pname = "python-qt"; src = fetchurl { url="mirror://sourceforge/pythonqt/PythonQt${version}.zip"; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index ec32c44a91f..33505f9b07f 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { - name = "qca-${version}"; + pname = "qca"; version = "2.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index a7077c69dd8..2156c0e5350 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "qjson-${version}"; + pname = "qjson"; src = fetchFromGitHub { owner = "flavio"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index ba62324d586..d3f4a8e88e2 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2018-11-24"; - name = "qmltermwidget-unstable-${version}"; + pname = "qmltermwidget-unstable"; src = fetchFromGitHub { repo = "qmltermwidget"; diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index ae99035d226..b7857372d1c 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; - name = "qt-mobility-${version}"; + pname = "qt-mobility"; src = fetchFromGitHub { owner = "qtproject"; repo = "qt-mobility"; diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index 1578593b8ae..3c4c192bd4b 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }: stdenv.mkDerivation rec { - name = "qtinstaller-${version}"; + pname = "qtinstaller"; propagatedBuildInputs = [ qtdeclarative qttools ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 84be9876c1c..2e47a213565 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -2,9 +2,8 @@ stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; }; buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ]; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 35d16ee5e19..14bfd40a593 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "quickder"; - name = "${pname}-${version}"; version = "1.2-6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 5ed05ec6b32..79d4d652424 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -1,7 +1,7 @@ { stdenv, which, coreutils, fetchzip, qt4 }: stdenv.mkDerivation rec { - name = "qxt-${version}"; + pname = "qxt"; version = "0.6.2"; src = fetchzip { diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 286c5c868df..fe48d99b383 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { - name = "rabbitmq-c-${version}"; + pname = "rabbitmq-c"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 256b756ed45..e02b22af756 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "range-v3-${version}"; + pname = "range-v3"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 9d8ce8cef20..92c42d19af6 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec{ - name = "rapidcheck-${version}"; + pname = "rapidcheck"; version = "unstable-2018-09-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index a1671aa3e0f..ea91c1507dc 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: stdenv.mkDerivation rec { - name = "rapidjson-${version}"; + pname = "rapidjson"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index 99f88091690..ca072f2ca4b 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "rapidxml"; version = "1.13"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.zip"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.zip"; sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63"; }; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 9f4fe54e805..165e9716a97 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: stdenv.mkDerivation rec { - name = "rdkafka-${version}"; + pname = "rdkafka"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index a6a5fbed4fc..e36b6f9488a 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "re2-${version}"; + pname = "re2"; version = "20190401"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index e96b4f1ebe2..11d5c378015 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "readline-${version}"; + pname = "readline"; version = "7.0p${toString (builtins.length upstreamPatches)}"; src = fetchurl { diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index eefef972766..cdc36617c52 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "readline-${version}"; + pname = "readline"; version = "8.0p${toString (builtins.length upstreamPatches)}"; src = fetchurl { diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 681fc3a012f..a43700ce439 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "rep-gtk-${version}"; + pname = "rep-gtk"; version = "0.90.8.3"; sourceName = "rep-gtk_${version}"; diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 195db9a1685..82a2998be1e 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "rote-${version}"; + pname = "rote"; version = "0.2.8"; src = fetchurl { sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky"; - url = "mirror://sourceforge/rote/${name}.tar.gz"; + url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index daa499061c5..b69cd56d35d 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "safefile"; version = "1.0.5"; src = fetchurl { - url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz"; + url = "http://research.cs.wisc.edu/mist/${pname}/releases/${pname}-${version}.tar.gz"; sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; }; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index ba0b8f4e996..9ffa2efc376 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { - name = "sblim-sfcc-${version}"; + pname = "sblim-sfcc"; version = "2.2.9"; # this is technically 2.2.9-preview src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index f727728943b..75beddcd22c 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "5.6.0"; - name = "papi-${version}"; + pname = "papi"; src = fetchurl { url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz"; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 2ee9144b316..367fc635c8b 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "htslib"; version = "1.9"; src = fetchurl { - url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0"; }; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 22bcc56c82a..e6c58b96e5c 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "mirtk-${version}"; + pname = "mirtk"; src = fetchFromGitHub { owner = "BioMedIA"; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 4668839ebb9..d4333146406 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "QuadProgpp-${version}"; + pname = "QuadProgpp"; version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 286be260052..9c412f93d13 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { - name = "blas-${version}"; + pname = "blas"; version = "3.8.0"; src = fetchurl { - url = "http://www.netlib.org/blas/${name}.tgz"; + url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; }; diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 16850fb1665..bc276b9923c 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.2.5"; - name = "brial-${version}"; + pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index 4746f77a216..d22858d64d0 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -61,7 +61,7 @@ let in stdenv.mkDerivation rec { - name = "caffe2-${version}"; + pname = "caffe2"; version = "0.8.1"; src = fetchFromGitHub { owner = "caffe2"; diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 537fcb93a87..52c775c9a0d 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -5,8 +5,6 @@ in let # SuiteSparse must use the same openblas suitesparse = suitesparse_.override { inherit openblas; }; in stdenv.mkDerivation rec { - - name = "${pname}-${version}"; pname = "cholmod-extra"; version = "1.2.0"; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 40dbfc53e2c..8a474e06e55 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "clblas-${version}"; + pname = "clblas"; version = "2.12"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 2441aff9fa3..5193c2db5c5 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.21"; - name = "cliquer-${version}"; + pname = "cliquer"; # autotoolized version of the original cliquer src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix index 645a865eb95..77973a95449 100644 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ecos-${version}"; + pname = "ecos"; version = "2.0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index 2891429c857..6fd16535459 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.0"; pname = "flintqs"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sagemath"; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 30453086d45..1995fb9c85d 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - name = "ipopt-${version}"; + pname = "ipopt"; version = "3.12.13"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 51fbd9f14cb..0f23f08145e 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.23"; pname = "lcalc"; - name = "${pname}-${version}"; src = fetchurl { # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index be650f3c3ce..c8f1138d69f 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "libbraiding-${version}"; + pname = "libbraiding"; src = fetchFromGitHub { owner = "miguelmarco"; diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index e96ee475d7d..a2c0dd4fa17 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.02r5"; - name = "llibhomfly-${version}"; + pname = "llibhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix index 3cf5c3619a9..b0cfbca5aa3 100644 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lrs"; version = "7.0"; diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index b9ee1e2a10d..b8c4fa67148 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20140914"; - name = "m4ri-${version}"; + pname = "m4ri"; src = fetchFromBitbucket { owner = "malb"; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 23fc03655cf..6a664b1dfff 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20150908"; - name = "m4rie-${version}"; + pname = "m4rie"; src = fetchFromBitbucket { owner = "malb"; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index d967bbf8c3e..d5ba7053de8 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -86,7 +86,7 @@ let mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); in stdenv.mkDerivation rec { - name = "openblas-${version}"; + pname = "openblas"; version = "0.3.6"; src = fetchFromGitHub { owner = "xianyi"; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 01b0faf89f9..6fc96623a33 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openlibm-${version}"; + pname = "openlibm"; version = "0.6.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 2dd63ebfc85..c6e065320a2 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -4,7 +4,7 @@ , pythonProtobuf }: stdenv.mkDerivation rec { - name = "or-tools-${version}"; + pname = "or-tools"; version = "v7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index ca35ce2f413..3a9ef770459 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "parmetis-${version}"; + pname = "parmetis"; version = "4.0.3"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index ac8129c9032..c2eda9dac48 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -6,7 +6,7 @@ , python }: stdenv.mkDerivation rec { - name = "petsc-${version}"; + pname = "petsc"; version = "3.8.4"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix index 7394fb9e1b4..e7dfaecf1de 100644 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "planarity"; version = "3.0.0.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "graph-algorithms"; diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix index 3eee63dbf4f..faa219044bd 100644 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "primesieve-${version}"; + pname = "primesieve"; version = "7.4"; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix index fda54fe44ab..66c573245db 100644 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "rankwidth"; version = "0.7"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/rw/rw-${version}.tar.gz"; diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 624885c501a..207406388e0 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "rubiks"; version = "20070912"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index b4c6574d13a..14277c8c631 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "scalapack-${version}"; + pname = "scalapack"; version = "2.0.2"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index f9d1a84b1f0..51a72585c0c 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }: stdenv.mkDerivation rec { - name = "scs-${version}"; + pname = "scs"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 7e71eafef69..48de128edc5 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { version = "4.2.1"; - name = "suitesparse-${version}"; + pname = "suitesparse"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 9938a3096a0..570c9814485 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "5.2.1"; - name = "superlu-${version}"; + pname = "superlu"; src = fetchurl { url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz"; diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index fd9285ebf79..15dd898c455 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2.023.4"; - name = "sympow-${version}"; + pname = "sympow"; src = fetchFromGitLab { group = "rezozer"; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index ad4d4c01737..4ee6f6cb992 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { version = "0.9.1"; pname = "zn_poly"; - name = "${pname}-${version}"; # sage has picked up the maintenance (bug fixes and building, not development) # from the original, now unmaintained project which can be found at diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 5f2263d821d..640eefbd733 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "ispike-${version}"; + pname = "ispike"; version = "2.1.1"; src = fetchurl { - url = "mirror://sourceforge/ispike/${name}.tar.gz"; + url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz"; sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp"; }; diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index ba291dc97ff..eb8d17c6457 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { - name = "scriptaculous-${version}"; + pname = "scriptaculous"; version = "1.9.0"; src = fetchurl { diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 533fefa9f19..63b6ae94a38 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "serd-${version}"; + pname = "serd"; version = "0.30.0"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; }; diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index 1e9a8ba6a58..261658b0547 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sfsexp-${version}"; + pname = "sfsexp"; version = "1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 74f861297d1..da417c35a6c 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }: stdenv.mkDerivation rec { - name = "shibboleth-sp-${version}"; + pname = "shibboleth-sp"; version = "2.6.1"; src = fetchgit { diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f795dfef9e4..14af55c2afc 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.6"; - name = "graphite2-${version}"; + pname = "graphite2"; src = fetchurl { url = "https://github.com/silnrsi/graphite/releases/download/" diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 90dfe8ebfab..e35be7eda42 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "simpleitk"; version = "1.2.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz"; diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index 941e75b8ba9..14cefdea77b 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "smarty-i18n-${version}"; + pname = "smarty-i18n"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index 66bfd601a62..4876c39ce83 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "smarty3-${version}"; + pname = "smarty3"; version = "3.1.33"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 36077d71126..73cc88882d0 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "snappy-${version}"; + pname = "snappy"; version = "1.1.7"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 48ee1af0e30..edcb3549c31 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "sonic-${version}"; + pname = "sonic"; version = "2016-03-01"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 10258e791ba..c1c22cb910d 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }: stdenv.mkDerivation rec { - name = "sord-${version}"; + pname = "sord"; version = "0.16.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; }; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index be2fc503e39..c2dc20cc392 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, audiofile, libtiff}: stdenv.mkDerivation rec { version = "0.0.6"; - name = "spandsp-${version}"; + pname = "spandsp"; src=fetchurl { url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index cab0e69ad1a..a18edc0a6df 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }: stdenv.mkDerivation rec { - name = "spdk-${version}"; + pname = "spdk"; version = "19.04"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index b27fd0843bc..43360d781cd 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -27,11 +27,11 @@ let else throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { - name = "speech-dispatcher-${version}"; + pname = "speech-dispatcher"; version = "0.8.8"; src = fetchurl { - url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; + url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz"; sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw"; }; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 40d272fd07d..98c8ced5b47 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "spirv-headers-${version}"; + pname = "spirv-headers"; version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit src = fetchFromGitHub { diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 6cf8d97cb67..9365ee006d1 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -3,7 +3,7 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { - name = "sqlcipher-${version}"; + pname = "sqlcipher"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index f0390486b10..3c5761b767e 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { - name = "sqlite-analyzer-${version}"; + pname = "sqlite-analyzer"; version = "3.28.0"; src = assert version == sqlite.version; fetchurl { diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ea1c38ea476..9ba5da0c910 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "sqlite-${version}"; + pname = "sqlite"; version = "3.28.0"; # NB! Make sure to update analyzer.nix src (in the same directory). diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index e5d322330e8..e4c1f8eb5f6 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fuse, zlib }: stdenv.mkDerivation rec { - name = "sqlar-${version}"; + pname = "sqlar"; version = "2018-01-07"; src = fetchurl { diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index c9073fc0b7e..3940faf1d6d 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libsrtp-${version}"; + pname = "libsrtp"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 4f36ac2ba1c..440f0c22ea6 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "stb-${version}"; + pname = "stb"; version = "20180211"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 36768acd991..8121b7a501f 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "strigi-${version}"; + pname = "strigi"; version = "0.7.8"; src = fetchurl { - url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2"; + url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 2244803f4d3..5589a5560eb 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "stxxl-${version}"; + pname = "stxxl"; version = "1.4.1"; src = fetchurl { diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index 35bacff0525..9a5f4db2deb 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -3,11 +3,11 @@ # NOTE: for subunit python library see pkgs/top-level/python-packages.nix stdenv.mkDerivation rec { - name = "subunit-${version}"; + pname = "subunit"; version = "1.1.0"; src = fetchurl { - url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; }; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index 2e6e2d3fbbf..628ab7e28ef 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, nss, nspr }: stdenv.mkDerivation rec { - name = "svrcore-${version}"; + pname = "svrcore"; version = "4.0.4"; src = fetchurl { - url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; + url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index e30da732a46..c8c60c1f8ea 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,6 +1,6 @@ { stdenv, python, fetchurl, openssl, boost, scons }: stdenv.mkDerivation rec { - name = "swiften-${version}"; + pname = "swiften"; version = "4.0.2"; nativeBuildInputs = [ scons]; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index a8a110cf9b1..3d146a5a227 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "sword-${version}"; + pname = "sword"; version = "1.7.4"; src = fetchurl { - url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz"; sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 424dc116c7e..47b93ab373a 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "symengine-${version}"; + pname = "symengine"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 6577ebeae28..6fd1d1ca941 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "szip-${version}"; + pname = "szip"; version = "2.1.1"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 27ac0fdd5ff..227d3c4c547 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -12,10 +12,10 @@ assert withPngSupport -> libpng != null; assert stdenv.isDarwin -> Carbon != null; stdenv.mkDerivation rec { - name = "tachyon-${version}"; + pname = "tachyon"; version = "0.99b2"; src = fetchurl { - url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz"; + url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 86006806baa..28ce5c60481 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: stdenv.mkDerivation rec { - name = "taglib-sharp-${version}"; + pname = "taglib-sharp"; version = "2.1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 89b163a0917..6fe4e45521e 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: with stdenv.lib; stdenv.mkDerivation rec { - name = "tbb-${version}"; + pname = "tbb"; version = "2019_U8"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 24b1d477b8a..40e137204e2 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { - name = "tcllib-${version}"; + pname = "tcllib"; version = "1.19"; src = fetchurl { diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 4e1f0bcab03..f1fd6760c61 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl, openssl }: stdenv.mkDerivation rec { - name = "tcltls-${version}"; + pname = "tcltls"; version = "1.6.7"; src = fetchurl { diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index eefc976a62b..8ebf0156be8 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: stdenv.mkDerivation rec { - name = "termbox-${version}"; + pname = "termbox"; version = "1.1.2"; src = fetchFromGitHub { owner = "nsf"; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 8d72d9a7d8e..646cc60406a 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.5"; - name = "theft-${version}"; + pname = "theft"; src = fetchFromGitHub { owner = "silentbicycle"; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 92cc76273ba..0fce957df22 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "thrift-${version}"; + pname = "thrift"; version = "0.12.0"; src = fetchurl { - url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3"; }; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 7f1b3ebcbf5..4fc1da1fe0a 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "tinyxml-2-${version}"; + pname = "tinyxml-2"; version = "6.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 232c95e6257..61d9c710801 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.4.3"; - name = "tix-${version}"; + pname = "tix"; src = fetchurl { url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz"; sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn"; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 229e4cfaa6c..d7162067deb 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "tnt-${version}"; + pname = "tnt"; version = "3.0.12"; src = fetchurl { diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 9edfcc88f16..13b4e6b97a9 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }: stdenv.mkDerivation rec { - name = "tntdb-${version}"; + pname = "tntdb"; version = "1.3"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index aaff759525b..86b0080a824 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cxxtools, zlib, openssl, zip }: stdenv.mkDerivation rec { - name = "tntnet-${version}"; + pname = "tntnet"; version = "2.2.1"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; }; diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix index e5803d644f3..6dd51944111 100644 --- a/pkgs/development/libraries/torch-hdf5/default.nix +++ b/pkgs/development/libraries/torch-hdf5/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, torch, cmake, hdf5}: stdenv.mkDerivation rec { - name = "torch-hdf5-${version}"; + pname = "torch-hdf5"; version = "0.0pre2016-07-01"; buildInputs = [cmake torch hdf5]; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix index d4c61890afb..ff8c26062d3 100644 --- a/pkgs/development/libraries/torch/default.nix +++ b/pkgs/development/libraries/torch/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec{ version = "0.0pre20160820"; - name = "torch-${version}"; + pname = "torch"; buildInputs = [ luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 libjpeg zeromq3 ncurses openssl libpng readline pkgconfig diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 552bd4c1c51..af2fc6c879a 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "trompeloeil-${version}"; + pname = "trompeloeil"; version = "34"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index bcc91d058f0..d5af39d3f2a 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tsocks-${version}"; + pname = "tsocks"; version = "1.8beta5"; src = fetchurl { - url = "mirror://sourceforge/tsocks/${name}.tar.gz"; + url = "mirror://sourceforge/tsocks/${pname}-${version}.tar.gz"; sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; }; diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index a752da8cb57..46b65a08eaa 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "twolame-${version}"; + pname = "twolame"; version = "2017-09-27"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 9c899eb21ba..18f270e70db 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -4,7 +4,7 @@ # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1 stdenv.mkDerivation rec { - name = "udns-${version}"; + pname = "udns"; version = "0.4"; configurePhase = "./configure --enable-ipv6"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s"; src = fetchurl { - url = "http://www.corpit.ru/mjt/udns/${name}.tar.gz"; + url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz"; sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i"; }; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 664bc29a72d..faee73fd393 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "udunits-${version}"; + pname = "udunits"; version = "2.2.27.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 6eef95309aa..1b5fbe6c2ca 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version="0.5.0"; - name = "uhttpmock-${version}"; + pname = "uhttpmock"; src = fetchFromGitLab { repo = "uhttpmock"; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 07892e97087..347efb4d3bd 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -2,7 +2,7 @@ , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { - name = "umockdev-${version}"; + pname = "umockdev"; version = "0.12.1"; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 717edda18a2..73ca55cffd0 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }: stdenv.mkDerivation rec { - name = "unibilium-${version}"; + pname = "unibilium"; version = "2.0.0"; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index a902b6f8451..7fa8fe81c11 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { - name = "libunicap-${version}"; + pname = "libunicap"; version="0.9.12"; src = fetchurl { - url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz"; + url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix index aa4a7890b23..96f318ff0ef 100644 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { - name = "unicorn-emulator-${version}"; + pname = "unicorn-emulator"; version = "1.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 90a28df6a15..0e5971945f3 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "unittest-cpp-${version}"; + pname = "unittest-cpp"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 1275df69f59..3a51e2c986a 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "unixODBC-${version}"; + pname = "unixODBC"; version = "2.3.7"; src = fetchurl { - url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; + url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"; sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; }; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 7b72e12a66b..14f44aaebee 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -4,11 +4,11 @@ { psql = stdenv.mkDerivation rec { - name = "psqlodbc-${version}"; + pname = "psqlodbc"; version = "10.01.0000"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz"; sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7"; }; @@ -28,11 +28,11 @@ }; mariadb = stdenv.mkDerivation rec { - name = "mariadb-connector-odbc-${version}"; + pname = "mariadb-connector-odbc"; version = "2.0.10"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${name}-ga-src.tar.gz"; + url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz"; sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz"; }; @@ -57,12 +57,12 @@ }; mysql = stdenv.mkDerivation rec { - name = "mysql-connector-odbc-${version}"; + pname = "mysql-connector-odbc"; majorVersion = "5.3"; version = "${majorVersion}.6"; src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${name}-src.tar.gz"; + url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${pname}-${version}-src.tar.gz"; sha256 = "1smi4z49i4zm7cmykjkwlxxzqvn7myngsw5bc35z6gqxmi8c55xr"; }; @@ -86,7 +86,7 @@ }; sqlite = stdenv.mkDerivation rec { - name = "sqlite-connector-odbc-${version}"; + pname = "sqlite-connector-odbc"; version = "0.9993"; src = fetchurl { @@ -121,7 +121,7 @@ }; msodbcsql17 = stdenv.mkDerivation rec { - name = "msodbcsql17-${version}"; + pname = "msodbcsql17"; version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 89efdc006a5..9c48488bff8 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: stdenv.mkDerivation rec { - name = "uriparser-${version}"; + pname = "uriparser"; version = "0.9.1"; # Release tarball differs from source tarball src = fetchurl { - url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; + url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; }; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 3d09545c931..2eee80a7696 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb }: stdenv.mkDerivation rec { - name = "usbredir-${version}"; + pname = "usbredir"; version = "0.8.0"; src = fetchurl { - url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; + url = "https://spice-space.org/download/usbredir/${pname}-${version}.tar.bz2"; sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; }; diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index c15259c585a..18eae87e11c 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ustr-${version}"; + pname = "ustr"; version = "1.0.4"; src = fetchurl { - url = "http://www.and.org/ustr/${version}/${name}.tar.bz2"; + url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2"; sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx"; }; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 827274251ed..7f9e8508a65 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index a7dddd14124..e134c9ea60f 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -10,12 +10,12 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "3.16.14.11"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" - + "${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2"; sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj"; }; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index 2b9fa5cc04c..cb53765e394 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -102,7 +102,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "5.4.232"; inherit doCheck; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index f7c4f34e8e6..2d9c5d4b92a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -44,7 +44,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "7.4.255"; doCheck = true; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index 8d2276def70..bda3f07f0a4 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -109,7 +109,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "6.4.388.40"; inherit doCheck; diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 56ded2c5644..678d7dd265c 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { - name = "intel-hybrid-driver-${version}"; + pname = "intel-hybrid-driver"; version = "1.0.2"; src = fetchurl { diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 640f50eb45b..722079ff347 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "intel-vaapi-driver-${version}"; + pname = "intel-vaapi-driver"; # TODO: go back to stable releases with the next stable release after 2.3.0. # see: https://github.com/NixOS/nixpkgs/issues/55975 (and the libva comment v) rev = "329975c63123610fc750241654a3bd18add75beb"; # generally try to match libva version, but not required diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index abdf9fbeed3..8a2e3af4791 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "vapoursynth-mvtools-${version}"; + pname = "vapoursynth-mvtools"; version = "21"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 1af70056d2e..18b2659cc5d 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "Vc-${version}"; + pname = "Vc"; version = "0.7.5"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 66c8e4fbc53..2194c7be38b 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "Vc-${version}"; + pname = "Vc"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index b7249c8ee82..eb37d14b532 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, eigen }: stdenv.mkDerivation rec { - name = "vcg-${version}"; + pname = "vcg"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index e516c94866a..eb88b36a142 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "vid-stab-${version}"; + pname = "vid-stab"; version = "0.98b"; src = fetchurl { diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index fb69d4bf63e..625ec2cee38 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -5,7 +5,7 @@ let inherit (python2Packages) python numpy; # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... in stdenv.mkDerivation rec { - name = "vigra-${version}"; + pname = "vigra"; version = "1.11.1"; src = fetchurl { diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 72803e09f07..71bd608e93a 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { - name = "virglrenderer-${version}"; + pname = "virglrenderer"; version = "0.7.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2"; sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; }; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index e0398487abc..a68880c2f95 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "vmime-${version}"; + pname = "vmime"; version = "0.9.2"; src = fetchFromGitHub { owner = "kisli"; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 18b9278539f..b9eb29422c5 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; - name = "vmmlib-${version}"; + pname = "vmmlib"; src = fetchFromGitHub { owner = "VMML"; diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix index 4f72cc138ac..efd60fe66fb 100644 --- a/pkgs/development/libraries/vrb/default.nix +++ b/pkgs/development/libraries/vrb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "vrb-${version}"; + pname = "vrb"; version = "0.5.1"; src = fetchurl { - url = "http://vrb.sourceforge.net/download/${name}.tar.bz2"; + url = "http://vrb.sourceforge.net/download/${pname}-${version}.tar.bz2"; sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f"; }; diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index e706c730ddd..fd0e90941b8 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, sqlite }: stdenv.mkDerivation rec { - name = "vsqlite-${version}"; + pname = "vsqlite"; version = "0.3.13"; src = fetchurl { diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index f7c1bf9a65b..de233b49f3a 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "vulkan-headers-${version}"; + pname = "vulkan-headers"; version = "1.1.106"; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index a44e91e1bf5..d8b94c40c7e 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -7,7 +7,7 @@ in assert version == vulkan-headers.version; stdenv.mkDerivation rec { - name = "vulkan-loader-${version}"; + pname = "vulkan-loader"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 8af33c10319..f3f87b3ba60 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libiconv, fetchpatch }: stdenv.mkDerivation rec { - name = "wavpack-${version}"; + pname = "wavpack"; version = "5.1.0"; enableParallelBuilding = true; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; src = fetchurl { - url = "http://www.wavpack.com/${name}.tar.bz2"; + url = "http://www.wavpack.com/${pname}-${version}.tar.bz2"; sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r"; }; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 3fda417d8e1..7572051b1de 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -7,11 +7,11 @@ assert expat != null; stdenv.mkDerivation rec { - name = "wayland-${version}"; + pname = "wayland"; version = "1.9.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index b14dc03385c..d2af8b084e6 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "wayland-protocols-${version}"; + pname = "wayland-protocols"; version = "1.17"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"; }; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 44e6370e640..fbf0162eab3 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "6.3"; - name = "wcslib-${version}"; + pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { - url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; sha256 ="1si272bms58yv1zmymx9ypx1ycka8bfqy8wk03rvl6nmciyz0dsc"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 04758ace7fa..25868cdb886 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage; with stdenv.lib; stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; + pname = "webkitgtk"; version = "2.4.11"; meta = with stdenv.lib; { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 927301589b4..71b30960bac 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; + pname = "webkitgtk"; version = "2.24.3"; meta = { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; sha256 = "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl"; }; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index d84f30aad55..84fbda503ea 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "websocket++-${version}"; + pname = "websocket++"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c45f521dcbb..e54e0d4b306 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -25,7 +25,7 @@ let optLeveldb = shouldUsePkg leveldb; in stdenv.mkDerivation rec { - name = "wiredtiger-${version}"; + pname = "wiredtiger"; version = "2.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 549e492e944..780d7df47cb 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "wolfssl-${version}"; + pname = "wolfssl"; version = "4.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 2aa28a2ccf4..bd893892d98 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "wxSVG-${version}"; + pname = "wxSVG"; srcName = "wxsvg-${version}"; version = "1.5.19"; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 49f12842533..a528166f68a 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -2,7 +2,7 @@ , darwin }: stdenv.mkDerivation rec { - name = "wxsqlite3-${version}"; + pname = "wxsqlite3"; version = "3.3.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 998f6a9e5f6..9ca15d4977b 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: stdenv.mkDerivation rec { - name = "wxsqliteplus-${version}"; + pname = "wxsqliteplus"; version = "0.3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index b952e8b1267..38ee4376ac2 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.8.12.1"; - name = "wxGTK-${version}"; + pname = "wxGTK"; src = fetchurl { url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index b33b0b15331..a12447562b8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "3.0.4"; - name = "wxwidgets-${version}"; + pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index cbe8bd8ac5e..5236996199d 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.0.4"; - name = "wxmac-${version}"; + pname = "wxmac"; src = fetchzip { url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index cee967ef2aa..8fe75153de6 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "3.1.2"; - name = "wxwidgets-${version}"; + pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index f2189cb014e..634847941d0 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation rec { - name = "x265-${version}"; + pname = "x265"; version = "3.1.1"; src = fetchurl { diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index aeb741dbae7..92a932a01a4 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -5,7 +5,7 @@ let if stdenv.isDarwin then "macosx" else throw "Unsupported platform"; in stdenv.mkDerivation rec { - name = "xalan-c-${version}"; + pname = "xalan-c"; version = "1.11"; src = fetchurl { diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 1203f19d6c8..6c8eda6358b 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { - name = "xapian-omega-${version}"; + pname = "xapian-omega"; inherit (xapian) version; src = fetchurl { diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index 31c31164e01..d7ec3ae9c1e 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn }: stdenv.mkDerivation rec { - name = "xavs-${version}"; + pname = "xavs"; version = "55"; src = fetchsvn { diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index e343c301127..705bd6b87fc 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -2,7 +2,7 @@ , xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { - name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; + pname = "xcb-util-cursor-0.1.1-3-unstable"; version = "2017-04-05"; src = fetchgit { diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 8ad4e6d6a8a..704884c23f3 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xerces-c-${version}"; + pname = "xerces-c"; version = "3.2.2"; src = fetchurl { - url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; + url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx"; }; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 74d263a9417..f4687bd46f8 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -7,7 +7,7 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { - name = "xgboost-${version}"; + pname = "xgboost"; version = "0.90"; # needs submodules diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 718554b20a4..3d1b4ea74db 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { - name = "xlslib-${version}"; + pname = "xlslib"; version = "2.5.0"; src = fetchurl { diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index fec4bbe8efe..5d9e5c29f3c 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "xml-security-c-${version}"; + pname = "xml-security-c"; version = "1.7.3"; src = fetchurl { - url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; + url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz"; sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583"; }; diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 8e1d71fab3f..a1d9b60418c 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, boost, curl, openssl, log4shib, xercesc, xml-security-c }: stdenv.mkDerivation rec { - name = "xml-tooling-c-${version}"; + pname = "xml-tooling-c"; version = "1.6.3"; src = fetchgit { diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 051a194af98..5a267bbfe76 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -4,7 +4,7 @@ let fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in stdenv.mkDerivation rec { - name = "xsd-${version}"; + pname = "xsd"; version = "4.0.0"; src = fetchurl { diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 17d7320cb64..5ec96157a79 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "xvidcore-${version}"; + pname = "xvidcore"; version = "1.3.5"; src = fetchurl { - url = "http://downloads.xvid.org/downloads/${name}.tar.bz2"; + url = "http://downloads.xvid.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w"; }; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 9f2b83d7597..39e9fc49382 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "xxHash-${version}"; + pname = "xxHash"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index c9c84f4e1d8..155e46c8f8c 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: stdenv.mkDerivation rec { - name = "xylib-${version}"; + pname = "xylib"; version = "1.5"; src = fetchurl { - url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd"; }; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 82b53402fc7..a2e60eacf98 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "zeroc-ice-${version}"; + pname = "zeroc-ice"; version = "3.6.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 8a89d2ae1c7..db5d90e2f02 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: stdenv.mkDerivation rec { - name = "zeromq-${version}"; + pname = "zeromq"; version = "4.3.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 9b7a9026628..1b74b8c5388 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lzma }: stdenv.mkDerivation rec { - name = "zimlib-${version}"; + pname = "zimlib"; version = "1.4"; src = fetchurl { - url = "http://www.openzim.org/download/${name}.tar.gz"; + url = "http://www.openzim.org/download/${pname}-${version}.tar.gz"; sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq"; }; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 330b91e995d..5c601575742 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.14"; - name = "zlog-${version}"; + pname = "zlog"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz"; sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5"; }; diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix index f7e849f6a33..98211e6e3eb 100644 --- a/pkgs/development/libraries/zmqpp/default.nix +++ b/pkgs/development/libraries/zmqpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }: stdenv.mkDerivation rec { - name = "zmqpp-${version}"; + pname = "zmqpp"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 65509d766b9..78983f09543 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zxcvbn-c-${version}"; + pname = "zxcvbn-c"; version = "2.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 010c73336b9..8b199d3e89a 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,7 @@ { docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: stdenv.mkDerivation rec { - name = "zziplib-${version}"; + pname = "zziplib"; version = "0.13.69"; src = fetchurl { diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index b0e97038b7b..e176fc31909 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -37,7 +37,7 @@ let lispPackages = rec { }; quicklisp-to-nix-system-info = stdenv.mkDerivation rec { - name = "quicklisp-to-nix-system-info-${version}"; + pname = "quicklisp-to-nix-system-info"; version = "1.0.0"; src = ./quicklisp-to-nix; nativeBuildInputs = [sbcl]; @@ -58,7 +58,7 @@ let lispPackages = rec { }; quicklisp-to-nix = stdenv.mkDerivation rec { - name = "quicklisp-to-nix-${version}"; + pname = "quicklisp-to-nix"; version = "1.0.0"; src = ./quicklisp-to-nix; buildDependencies = [sbcl quicklisp-to-nix-system-info]; diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix index 5ef83ed77b3..d16f63152b8 100644 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ b/pkgs/development/misc/amdadl-sdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.0"; - name = "amdadl-sdk-${version}"; + pname = "amdadl-sdk"; src = requireFile { name = "ADL_SDK_6.0.zip"; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index b6d35051733..8578e51e939 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, python3, platform-tools, makeWrapper }: stdenv.mkDerivation rec { - name = "adb-sync-${version}"; + pname = "adb-sync"; version = "2016-08-31"; src = fetchgit { diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index fffe2fbbcbe..2033fa78ae5 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: stdenv.mkDerivation rec { - name = "adbfs-rootless-${version}"; + pname = "adbfs-rootless"; version = "2016-10-02"; src = fetchFromGitHub { diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index 9cee1c9e5de..706fa2c6599 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, bzip2, openssl, zlib }: stdenv.mkDerivation rec { - name = "imgpatchtools-${version}"; + pname = "imgpatchtools"; version = "0.3"; src = fetchzip { diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix index f149cb622e1..cd58ea4e20c 100644 --- a/pkgs/development/mobile/webos/cmake-modules.nix +++ b/pkgs/development/mobile/webos/cmake-modules.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "cmake-modules-webos-${version}"; + pname = "cmake-modules-webos"; version = "19"; src = fetchFromGitHub { diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index 52b50635e33..e7afdb32137 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "novacom-${version}"; + pname = "novacom"; version = "18"; src = fetchFromGitHub { diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index f82009b0c39..4d62dd305d3 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -4,7 +4,7 @@ webos, cmake, pkgconfig, libusb }: stdenv.mkDerivation rec { - name = "novacomd-${version}"; + pname = "novacomd"; version = "127"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index a7e591e049e..21897e3bf10 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -5,7 +5,7 @@ then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "camomile-${version}"; + pname = "camomile"; version = "0.8.2"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index 48517036dc6..a30b574f19b 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation rec { - name = "camomile-${version}"; + pname = "camomile"; version = "0.8.5"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 4832f5c39af..2a4d7004faa 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; - name = "ocaml-cow-${version}"; + pname = "ocaml-cow"; src = fetchFromGitHub { owner = "mirage"; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 7720650ddfc..17da11708c6 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -5,7 +5,7 @@ then throw "cryptgps is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml-cryptgps-${version}"; + pname = "ocaml-cryptgps"; version = "0.2.1"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 41214624427..1811e21cf58 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -18,7 +18,7 @@ let param = in stdenv.mkDerivation rec { - name = "cryptokit-${version}"; + pname = "cryptokit"; inherit (param) version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index d08259af247..dc6b1751283 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ncurses }: stdenv.mkDerivation rec { - name = "ocaml-curses-${version}"; + pname = "ocaml-curses"; version = "1.0.4"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 010df7d8df9..25e75ceeba3 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { pname = "eliom"; version = "6.7.0"; - name = "${pname}-${version}"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index e8d9267aa85..93e2b3b8429 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: stdenv.mkDerivation rec { - name = "higlo-${version}"; + pname = "higlo"; version = "0.6"; src = fetchFromGitHub { owner = "zoggy"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 6b01929db76..e78dd91f00a 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -14,7 +14,7 @@ let param = in stdenv.mkDerivation rec { - name = "lablgtk-${version}"; + pname = "lablgtk"; inherit (param) version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index c0532ff0325..d0a539ce8a1 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "lambda-term-${version}"; + pname = "lambda-term"; src = fetchurl { url = https://github.com/diml/lambda-term/archive/1.6.tar.gz; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index b789b133aaf..11405c0ebe5 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-libvirt-${version}"; + pname = "ocaml-libvirt"; rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4 diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 10d8484e3ef..e210ffa1152 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { - name = "ocaml-text-${version}"; + pname = "ocaml-text"; version = "0.8"; src = fetchzip { diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 20b63e3a8ee..27442075064 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: stdenv.mkDerivation rec { - name = "ocamlfuse-${version}"; + pname = "ocamlfuse"; version = "2.7.1_cvs5"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index e005024d222..887dce58689 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib, lablgtk}: stdenv.mkDerivation rec { - name = "ocamlgraph-${version}"; + pname = "ocamlgraph"; version = "1.8.8"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 9c4c2e21edd..468e387f8f1 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -4,11 +4,11 @@ assert lib.versionOlder ocaml.version "4"; stdenv.mkDerivation rec { - name = "ocamlnat-${version}"; + pname = "ocamlnat"; version = "0.1.1"; src = fetchurl { - url = "http://benediktmeurer.de/files/source/${name}.tar.bz2"; + url = "http://benediktmeurer.de/files/source/${pname}-${version}.tar.bz2"; sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; }; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 6117d30665f..0452b1b7dfe 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -4,7 +4,7 @@ if stdenv.lib.versionOlder ocaml.version "4.03" then throw "ocf not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocf-${version}"; + pname = "ocf"; version = "0.5.0"; src = fetchFromGitHub { owner = "zoggy"; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 147b4200cf6..9499bff84a1 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { version = "2.11.0"; - name = "ocsigenserver-${version}"; + pname = "ocsigenserver"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index bbe38ac8994..83d47fbb3af 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "piqi-ocaml-${version}"; + pname = "piqi-ocaml"; src = fetchurl { url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index 6be1595f7c5..fb06820f196 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.6.14"; - name = "piqi-${version}"; + pname = "piqi"; src = fetchurl { url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 38e1b3c7467..0b3f13bc54f 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }: stdenv.mkDerivation rec { - name = "ocaml-sqlite3-${version}"; + pname = "ocaml-sqlite3"; version = "2.0.9"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 125b117bcd8..15d79c43aa3 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.6"; - name = "uuidm-${version}"; + pname = "uuidm"; src = fetchurl { url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc"; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 8282c38a1e7..2f633eed7a3 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017.02.28"; - name = "pharo-launcher-${version}"; + pname = "pharo-launcher"; src = fetchurl { url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip"; sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0"; diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 3bd72434eb3..ec4168508a7 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "pharo-share-${version}"; + pname = "pharo-share"; dontUnpack = true; diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index de041c0f4c8..12a3529f864 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "augeas"; version = "1.0.3"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "hercules-team"; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 9bd7e586820..bd19b8eb33e 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -16,7 +16,7 @@ let visualizationSupport = (pyqtgraph != null); in buildPythonPackage rec { - name = "binwalk-${version}"; + pname = "binwalk"; version = "2.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index fde330d706f..7b67997fa08 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "blockdiag"; version = "1.5.3"; - name = pname + "-" + version; src = fetchurl { url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index c4db013ea34..21492dc152c 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "Bottleneck"; version = "1.2.1"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index 6e2e703dd56..069358a4d6d 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "btchip-python"; version = "0.1.28"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 2c97cbd4a33..7496e7e1fcc 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "0.6"; pname = "cgroup-utils"; - name = pname + "-" + version; buildInputs = [ pep8 nose ]; # Pep8 tests fail... diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 67120bf0f3d..234bb46f97b 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "cx_Freeze"; version = "5.1.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 6862d6447e5..b3d4a40bf66 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "cymem"; version = "2.0.2"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "explosion"; diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix index a459e3c0e10..9baafed4b75 100644 --- a/pkgs/development/python-modules/django/1_8.nix +++ b/pkgs/development/python-modules/django/1_8.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { - name = "Django-${version}"; + pname = "Django"; version = "1.8.19"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; + url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz"; sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k"; }; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 5c0e57cddc0..6e03a33f29b 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "dyn"; version = "1.8.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index b09bef9fec4..1ad5ea1ab3b 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "edward"; version = "1.3.5"; - name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index 3b91fb717bc..de7342d67ca 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "first"; version = "2.0.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index a9ac85e6248..de313dc1c7d 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "geopandas"; version = "0.5.1"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix index dd5d90bb968..82553f3e956 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/development/python-modules/glances/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - name = "glances-${version}"; + pname = "glances"; version = "3.1.1"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 8bbcaed377a..2a65df18fa5 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "GPy"; version = "1.9.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index cfaaa563611..51d42e5c8b7 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "hcs_utils"; version = "2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 9938d405387..32c79b17136 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "hmmlearn"; version = "0.2.2"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; + url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4"; }; diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index c4afe809cfb..59528723d80 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -16,7 +16,7 @@ let components = { in stdenv.mkDerivation rec { version = "2.3.4"; - name = "hoomd-blue-${version}"; + pname = "hoomd-blue"; src = fetchgit { url = "https://bitbucket.org/glotzer/hoomd-blue"; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 81301f337e6..e22ab22d5a7 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -2,7 +2,7 @@ , pbr, ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { - name = "ldappool-${version}"; + pname = "ldappool"; version = "2.4.1"; src = fetchPypi { diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 6babc6ae014..40a4f6f7429 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -18,7 +18,6 @@ assert cudaSupport -> nvidia_x11 != null buildPythonPackage rec { pname = "libgpuarray"; version = "0.7.5"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "Theano"; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 745f83fe508..c456d67ac49 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -8,7 +8,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "libsoundtouch"; version = "0.4.0"; diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 7f9aa3fa2e4..6a497358404 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "llfuse"; version = "1.3.6"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2"; sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"; }; diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/development/python-modules/mps-youtube/default.nix index 4a3ff00f835..4610b052ff8 100644 --- a/pkgs/development/python-modules/mps-youtube/default.nix +++ b/pkgs/development/python-modules/mps-youtube/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - name = "mps-youtube-${version}"; + pname = "mps-youtube"; version = "0.2.7.1"; disabled = (!isPy3k); diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index e45a0033c82..2da580abd92 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "nilearn"; version = "0.5.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index 5dd95380891..6aadd7f4533 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "python-notify-${version}"; + pname = "python-notify"; version = "0.1.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 7fb1de53dbd..7e34f3897bc 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "nwdiag"; version = "1.0.4"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; + url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz"; sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa"; }; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 73230b2e8fb..4c0d4346ee7 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 # This is not the "released" 3.0.0 just a commit version = "3.0.0"; - name = "ovito-${version}"; + pname = "ovito"; src = fetchgit { url = "https://gitlab.com/stuko/ovito"; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 0183379ac00..029ce4a1712 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "paramz"; version = "0.9.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 24539c7bbce..6f82c446a1f 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "passlib"; version = "1.7.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 39a2789a360..8fb6259c574 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "pathspec"; version = "0.5.9"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index b35c9de19dc..f8db636520f 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -11,11 +11,10 @@ buildPythonPackage rec { version = "2.7"; pname = "powerline"; - name = pname + "-" + version; src = fetchurl { url = "https://github.com/powerline/powerline/archive/${version}.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5"; }; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index be409e348ea..5ffe46e5b6f 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "PyGithub"; version = "1.36"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "PyGithub"; diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index eb6de23e0ea..1cd95c83fa2 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "pyblock-${version}"; + pname = "pyblock"; version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = pkgs.fetchurl rec { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix index 192d60cec46..c441cea5f45 100644 --- a/pkgs/development/python-modules/pycuda/compyte.nix +++ b/pkgs/development/python-modules/pycuda/compyte.nix @@ -5,7 +5,6 @@ mkDerivation rec { pname = "compyte"; version = "git-20150817"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "inducer"; diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix index e393265ae37..b5ca0c7ef6c 100644 --- a/pkgs/development/python-modules/pyev/default.nix +++ b/pkgs/development/python-modules/pyev/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "pyev"; version = "0.9.0"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/p/pyev/${name}.tar.gz"; + url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz"; sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; }; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 2b20ba95600..bf92f7360dd 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -12,11 +12,10 @@ in buildPythonPackage rec { pname = "pyftgl"; version = "0.4b"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "umlaeute"; - repo = name; + repo = "${pname}-${version}"; rev = version; sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 4826db3a8c0..d685e3541f9 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { pname = "pygobject"; version = "2.28.6"; format = "other"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; + url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; }; @@ -31,7 +30,7 @@ buildPythonPackage rec { # used to select a specific version, in our setup it should have no # effect, but we leave it in case somebody expects and calls it. postInstall = '' - mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth} + mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} # Prevent wrapping of codegen files as these are meant to be # executed by the python program diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index a03be0ac04d..947b5733a7e 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pygtksourceview"; format = "other"; version = "2.10.1"; - name = pname + "-" + version; src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix index 0770520ceee..272774a23ff 100644 --- a/pkgs/development/python-modules/pykde4/default.nix +++ b/pkgs/development/python-modules/pykde4/default.nix @@ -14,10 +14,10 @@ let }); in stdenv.mkDerivation rec { version = "4.14.3"; - name = "pykde4-${version}"; + pname = "pykde4"; src = fetchurl { - url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz"; + url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz"; sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz"; }; diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix index c5e148d1500..5d1db9efc01 100644 --- a/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { version = "4.14.38"; - name = "kdelibs-${version}"; + pname = "kdelibs"; src = fetchurl { - url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz"; + url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz"; sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p"; }; diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index 97fbe28e50d..f366f6e57f6 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pylibacl"; version = "0.5.3"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 47a73c9c80a..ca606767f4d 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "pyocr"; version = "0.5.3"; - name = pname + "-" + version; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 1a477ab2328..3defe979d37 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - name = "pyparted-${version}"; + pname = "pyparted"; version = "3.10.7"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index 76503122a1b..0313632e6fd 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -2,7 +2,7 @@ , isPy3k, isPyPy }: buildPythonPackage rec { - name = "pypillowfight-${version}"; + pname = "pypillowfight"; version = "0.2.4"; src = fetchFromGitLab { diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 65ff765a584..8851b046414 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -13,8 +13,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "Pyro4"; version = "4.75"; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 47e269c2ff5..beb57ac491a 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -3,11 +3,11 @@ # Should be bumped along with EFL! buildPythonPackage rec { - name = "python-efl-${version}"; + pname = "python-efl"; version = "1.22.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; + url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63"; }; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 1ff1f651264..24f56ae53b2 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "python-fedora"; version = "0.10.0"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index f667e09892c..7a137f5204c 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pyxattr"; version = "0.6.1"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index 91c2009744f..06010b40ed9 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -11,7 +11,7 @@ disabledIf (isPy3k || isPyPy) (buildPythonPackage rec { # TODO: Qt5 support - name = "qscintilla-${version}"; + pname = "qscintilla"; version = pkgs.qscintilla.version; format = "other"; diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index aaa095c5398..9644055b007 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "python-recursive-pth-loader"; version = "1.0"; - name = pname + "-" + version; dontUnpack = true; diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 8bac32ba911..4db1db04acc 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { version = "1.2.3"; pname = "robotframework-ride"; disabled = isPy3k; - name = pname + "-" + version; src = fetchurl { - url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz"; sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; }; diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index 3164be5aa86..bbe20fd1e82 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -4,12 +4,11 @@ buildPythonPackage rec { pname = "rpkg"; version = "1.50"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { - url = "https://releases.pagure.org/rpkg/${name}.tar.gz"; + url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz"; sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv"; }; diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index 079e88378c0..7bb66be3096 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -6,8 +6,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "selectors34"; version = "1.2"; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 158d9a054df..1f6307f2cbb 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "seqdiag"; version = "0.9.6"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; + url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz"; sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf"; }; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 5ea59eb6a2a..887d0c54424 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -9,8 +9,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "serpent"; version = "1.27"; diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix index ac625cf1fa0..514a3005725 100644 --- a/pkgs/development/python-modules/smugline/default.nix +++ b/pkgs/development/python-modules/smugline/default.nix @@ -8,7 +8,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "smugline"; version = "20160106"; diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix index 5eb8d77a244..c2028228c31 100644 --- a/pkgs/development/python-modules/smugpy/default.nix +++ b/pkgs/development/python-modules/smugpy/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - name = pname + "-" + version; pname = "smugpy"; version = "20131218"; diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 3309f1e9978..f1455f945a9 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "sphfile"; version = "1.0.1"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/s/sphfile/${name}.tar.gz"; + url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz"; sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8"; }; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 9a414e31360..70471aedbd7 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "spotipy"; version = "2.4.4"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 51c80e0fa91..7821c7b3d74 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -8,11 +8,10 @@ buildPythonPackage rec { pname = "python-sybase"; version = "0.40pre2"; - name = pname + "-" + version; disabled = isPy3k; src = fetchurl { - url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz"; + url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j"; }; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index ec5b3b325dd..cbe2a213191 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "systemd"; version = "234"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "systemd"; diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index 318c47d2160..4eff644a161 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { version = "0.5.3-2016-09-28"; - name = "tempita-${version}"; + pname = "tempita"; src = fetchFromGitHub { owner = "gjhiggins"; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 0915bc300c5..0413fd33f6f 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { version = "0.2.1"; pname = "torchvision"; - name = "${pname}-${version}"; format = "wheel"; diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index 416c857bdc6..95c0d628697 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { pname = "umemcache"; version = "1.6.3"; disabled = isPy3k; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/u/umemcache/${name}.zip"; + url = "mirror://pypi/u/umemcache/${pname}-${version}.zip"; sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; }; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 35afe10f8d2..dcb8eca187e 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPackages, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "unicorn"; version = "1.0.1"; diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 6835f8c48e0..cf3d36c3e5d 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "uritools"; version = "2.2.0"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 528846d7238..940f6234187 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "urlgrabber"; version = "3.10.2"; - name = "${pname}-${version}"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index bcbaa0b728c..8b397d3c42c 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "usbtmc"; version = "0.8"; - name = pname + "-" + version; src = fetchurl { url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 584200ff2b0..8b30cc6be87 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -21,7 +21,6 @@ assert wxGTK.unicode; buildPythonPackage rec { pname = "wxPython"; version = "3.0.2.0"; - name = pname + "-" + version; disabled = isPy3k || isPyPy; doCheck = false; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 4bd95a8d745..8b44203a7d2 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ammonite-${version}"; + pname = "ammonite"; version = "1.6.9"; scalaVersion = "2.12"; diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index a8b8a965256..16b4be47d8b 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -4,7 +4,6 @@ with python3Packages; buildPythonApplication rec { pname = "autoflake"; version = "1.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 95f5a418a61..ac2c6795a42 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.23"; - name = "checkstyle-${version}"; + pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 2e01e4d8f28..6b0c1b401f6 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }: stdenv.mkDerivation rec { - name = "clang-analyzer-${version}"; + pname = "clang-analyzer"; version = "3.4"; src = fetchurl { diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 2b4a87ffcb8..951c46e2166 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.0.1"; - name = "coan-${version}"; + pname = "coan"; src = fetchurl { - url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz"; sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44"; }; diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix index bd0a4ee5e40..bd8c5c37c86 100644 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ b/pkgs/development/tools/analysis/cov-build/default.nix @@ -7,7 +7,7 @@ let ''; in stdenv.mkDerivation rec { - name = "cov-build-${version}"; + pname = "cov-build"; version = "7.0.2"; src = diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 09901afdd20..8b6eb71f90f 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "cppcheck"; version = "1.88"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv"; }; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index 00c020e3f40..ed338a6e0d9 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, which, openssl, readline }: stdenv.mkDerivation rec { - name = "eresi-${version}"; + pname = "eresi"; version = "0.83-a3-phoenix"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 77bfa548068..36fa7bb1f16 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "evmdis-unstable-${version}"; + pname = "evmdis-unstable"; version = "2018-03-23"; goPackagePath = "github.com/Arachnid/evmdis"; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 5f6b894f984..8f170993370 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "frama-c-${version}"; + pname = "frama-c"; version = "19.0"; slang = "Potassium"; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 4222f72248a..fabd4dc03e5 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, llvmPackages, python2 }: stdenv.mkDerivation rec { - name = "include-what-you-use-${version}"; + pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! version = "0.10"; src = fetchurl { sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s"; - url = "${meta.homepage}/downloads/${name}.src.tar.gz"; + url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ]; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 939ae10c089..455ff7722fa 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { - name = "jdepend-${version}"; + pname = "jdepend"; version = "2.9.1"; src = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share - install dist/${name}.jar $out/share + install dist/${pname}-${version}.jar $out/share cat > "$out/bin/jdepend" < $out/share/man/man1/nuweb.1.gz - cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name} + cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index 404f3758ced..573e2aefb80 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "makerpm-${version}"; + pname = "makerpm"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index 7e5cbaddd8b..3029ee38518 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "maligned-unstable-${version}"; + pname = "maligned-unstable"; version = "2018-07-07"; rev = "6e39bd26a8c8b58c5a22129593044655a9e25959"; diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix index db0e41d27ab..37d49b1f35b 100644 --- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: stdenv.mkDerivation rec { - name = "abi-compliance-checker-${version}"; + pname = "abi-compliance-checker"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix index 047cd466baa..ca59bf28b1e 100644 --- a/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/pkgs/development/tools/misc/abi-dumper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: stdenv.mkDerivation rec { - name = "abi-dumper-${version}"; + pname = "abi-dumper"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 7810ba6349c..664e7d28d79 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -15,7 +15,7 @@ let }; in stdenv.mkDerivation rec { - name = "arcanist-${version}"; + pname = "arcanist"; version = "20180916"; src = [ arcanist libphutil ]; diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index d7cea5c3d4e..9901e46d578 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "autoconf-archive-${version}"; + pname = "autoconf-archive"; version = "2019.01.06"; src = fetchurl { diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index ff5ce659d2e..dc719789719 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { - name = "autogen-${version}"; + pname = "autogen"; version = "5.18.12"; src = fetchurl { diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index 38d2194dab8..8892142ad77 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "awf-${version}"; + pname = "awf"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 16182d26db3..72848d04930 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python3Packages }: stdenv.mkDerivation rec { - name = "bashdb-${version}"; + pname = "bashdb"; version = "4.4-1.0.0"; src = fetchurl { - url = "mirror://sourceforge/bashdb/${name}.tar.bz2"; + url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2"; sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml"; }; diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index ac7eb557f2e..ea9b340fb0b 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf, txt2man }: stdenv.mkDerivation rec { - name = "bin_replace_string-${version}"; + pname = "bin_replace_string"; version = "0.2"; src = fetchurl { diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 359ab125be9..dd84e3830c4 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: stdenv.mkDerivation rec { - name = "bsdbuild-${version}"; + pname = "bsdbuild"; version = "3.1"; src = fetchurl { - url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz"; + url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz"; sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; }; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ae7ecad7ea1..0577165bcff 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { - name = "ccache-${version}"; + pname = "ccache"; version = "3.4.1"; src = fetchurl { sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; - url = "mirror://samba/ccache/${name}.tar.xz"; + url = "mirror://samba/ccache/${pname}-${version}.tar.xz"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index f643ecab69d..008701615e7 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -2,7 +2,7 @@ , cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { - name = "ccls-${version}"; + pname = "ccls"; version = "0.20190314.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 31e720b13f2..e5bbdc562b1 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, readline, flex, texinfo }: stdenv.mkDerivation rec { - name = "cgdb-${version}"; + pname = "cgdb"; version = "0.7.0"; src = fetchurl { - url = "https://cgdb.me/files/${name}.tar.gz"; + url = "https://cgdb.me/files/${pname}-${version}.tar.gz"; sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; }; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 5f98df54c0a..887a0f16ec1 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "2.0.0.2"; - name = "checkbashisms-${version}"; + pname = "checkbashisms"; src = fetchurl { url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index ed96befca5e..1aac0bd651c 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -8,7 +8,7 @@ let ''; in stdenv.mkDerivation rec { - name = "chruby-${version}"; + pname = "chruby"; version = "0.3.9"; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 4040eda141f..861a6eff164 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: stdenv.mkDerivation rec { - name = "coccinelle-${version}"; + pname = "coccinelle"; version = "1.0.6"; src = fetchurl { - url = "http://coccinelle.lip6.fr/distrib/${name}.tgz"; + url = "http://coccinelle.lip6.fr/distrib/${pname}-${version}.tgz"; sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4"; }; diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index d95c67fea6d..a2a39b81055 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autogen }: stdenv.mkDerivation rec { - name = "complexity-${version}"; + pname = "complexity"; version = "1.10"; src = fetchurl { - url = "mirror://gnu/complexity/${name}.tar.gz"; + url = "mirror://gnu/complexity/${pname}-${version}.tar.gz"; sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522"; }; diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index 8a0cb095d44..973caee64e8 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "cproto-${version}"; + pname = "cproto"; version = "4.7o"; src = fetchurl { diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 54ad7ca7071..02d480cf2cd 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "cquery-${version}"; + pname = "cquery"; version = "2018-10-14"; inherit src; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index eff1af8cdb4..34cbadb38af 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: stdenv.mkDerivation rec { - name = "csmith-${version}"; + pname = "csmith"; version = "2.3.0"; src = fetchurl { - url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz"; + url = "https://embed.cs.utah.edu/csmith/${pname}-${version}.tar.gz"; sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ - --replace '$CSMITH_HOME/runtime' $out/include/${name} \ - --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \ + --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \ + --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \ --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith substituteInPlace $out/bin/launchn.pl \ diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index d8deb75d2d4..3a54a17a93a 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, tie }: stdenv.mkDerivation rec { - name = "cwebbin-${version}"; + pname = "cwebbin"; version = "22p"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 2657e570106..bf1effbe71a 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name="dfu-util-${version}"; + pname = "dfu-util"; version = "0.9"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; }; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index efb850d5ade..378cc4683b4 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -8,13 +8,13 @@ assert withLibrary -> libtool != null; assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { - name = "dialog-${version}"; + pname = "dialog"; version = "1.3-20190211"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/dialog/${name}.tgz" - "https://invisible-mirror.net/archives/dialog/${name}.tgz" + "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz" + "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz" ]; sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29"; }; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 51a5f52d375..23c01338f60 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "elfinfo-${version}"; + pname = "elfinfo"; version = "0.7.5"; goPackagePath = "github.com/xyproto/elfinfo"; diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index 905fa0d4093..c7eaafd9c7a 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "elfkickers-${version}"; + pname = "elfkickers"; version = "3.1"; src = fetchurl { diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 424032e21af..7a3579f0635 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -2,11 +2,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { - name = "elfutils-${version}"; + pname = "elfutils"; version = "0.176"; src = fetchurl { - url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; + url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"; }; diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index f58d0659965..b449c0a2d01 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, rpm}: stdenv.mkDerivation rec { - name = "epm-${version}"; + pname = "epm"; version = "4.4"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index e84aa0ef555..152792dcee2 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fsatrace-${version}"; + pname = "fsatrace"; version = "0.0.1-160"; src = fetchFromGitHub { @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; preConfigure = '' - mkdir -p $out/libexec/${name} - export makeFlags=INSTALLDIR=$out/libexec/${name} + mkdir -p $out/libexec/${pname}-${version} + export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version} ''; postInstall = '' mkdir -p $out/bin - ln -s $out/libexec/${name}/fsatrace $out/bin/ + ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 73de8eb8cb6..a5c32bd3dc1 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "fswatch-${version}"; + pname = "fswatch"; version = "1.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 70a157bc084..1484e54289e 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { - name = "gede-${version}"; + pname = "gede"; version = "2.14.1"; src = fetchurl { - url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; + url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9"; }; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index b2c71388fc5..2d756a655a4 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "global-${version}"; + pname = "global"; version = "6.6.3"; src = fetchurl { - url = "mirror://gnu/global/${name}.tar.gz"; + url = "mirror://gnu/global/${pname}-${version}.tar.gz"; sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb"; }; diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 25043f89463..108d6190cb7 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gpshell-${version}"; + pname = "gpshell"; version = "1.4.4"; src = fetchurl { diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix index aaaee20b81a..37a7a8c931c 100644 --- a/pkgs/development/tools/misc/gputils/default.nix +++ b/pkgs/development/tools/misc/gputils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gputils-${version}"; + pname = "gputils"; version = "1.5.0-1"; src = fetchurl { - url = "mirror://sourceforge/gputils/${name}.tar.bz2"; + url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2"; sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; }; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 0f9219f10a0..d3afbbc1bc7 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -7,7 +7,7 @@ }: buildGoPackage rec { - name = "hound-unstable-${version}"; + pname = "hound-unstable"; version = "2018-11-02"; rev = "74ec7448a234d8d09e800b92e52c92e378c07742"; diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix index 294d1fa10dd..996dda4ca94 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.9.16"; - name = "igprof-${version}"; + pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 8bc35ba01a6..b04de1832ab 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "inotify-tools-${version}"; + pname = "inotify-tools"; version = "3.20.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 281b09393b5..12197c2de40 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -3,7 +3,7 @@ , procps, utilmacros, gtk-doc, openssl, peg }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-${version}"; + pname = "intel-gpu-tools"; version = "1.23"; src = fetchurl { diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index a9f451d31e7..c837728f72d 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, gettext, perlPackages }: stdenv.mkDerivation rec { - name = "intltool-${version}"; + pname = "intltool"; version = "0.51.0"; src = fetchurl { - url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/intltool/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index b431e804d8d..8da3cd57703 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "kdbg-${version}"; + pname = "kdbg"; version = "3.0.0"; src = fetchurl { - url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz"; sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in"; }; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 782bff68e34..ce88838cc73 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -16,11 +16,11 @@ let "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; }; in stdenv.mkDerivation rec { - name = "kibana-${version}"; + pname = "kibana"; version = elk5Version; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz"; sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); }; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 240d52ca7d0..ace34f35059 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { - name = "loccount-${version}"; + pname = "loccount"; version = "1.2"; goPackagePath = "gitlab.com/esr/loccount"; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 63003f338eb..d55dd65e5f1 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -3,7 +3,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { - name = "lsof-${version}"; + pname = "lsof"; version = "4.91"; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 42ca1a1b7d5..17837a54877 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { - name = "lttng-tools-${version}"; + pname = "lttng-tools"; version = "2.10.7"; src = fetchurl { - url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; + url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd"; }; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index adc4bbd5c39..ad5276e5e1a 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -12,11 +12,11 @@ # Debian builds with std.h (systemtap). stdenv.mkDerivation rec { - name = "lttng-ust-${version}"; + pname = "lttng-ust"; version = "2.10.4"; src = fetchurl { - url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm"; }; diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index ebe62452440..ce62634e7d7 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "macdylibbundler-${version}"; + pname = "macdylibbundler"; version = "20180825"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 23b7119e7d7..7cbd9246081 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "go-md2man-${version}"; + pname = "go-md2man"; version = "1.0.6"; goPackagePath = "github.com/cpuguy83/go-md2man"; diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix index c45e7841d45..a5e4572d18d 100644 --- a/pkgs/development/tools/misc/moby/default.nix +++ b/pkgs/development/tools/misc/moby/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "moby-${version}"; + pname = "moby"; version = "2017-07-06"; rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40"; diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index a449c28ea28..dea6256824d 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "objconv-${version}"; + pname = "objconv"; version = "2.51"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. - url = "https://archive.org/download/objconv/${name}.zip"; + url = "https://archive.org/download/objconv/${pname}-${version}.zip"; sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; }; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 874aa04157d..21e825ac0bf 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { - name = "opengrok-${version}"; + pname = "opengrok"; version = "1.0"; # binary distribution src = fetchurl { - url = "https://github.com/oracle/opengrok/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i"; }; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 7141fdcee7e..d85a05ca245 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { - name = "openocd-${version}"; + pname = "openocd"; version = "0.10.0"; src = fetchurl { diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 29d713a9af4..c673bd26109 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; + pname = "patchelf"; version = "0.10-pre-20190328"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index fbb21a8b7c6..0b91953a7c7 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pmccabe-${version}"; + pname = "pmccabe"; version = "2.6"; src = fetchurl { diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 8ceb3d4a436..d9d28580210 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "premake5-${version}"; + pname = "premake5"; version = "5.0.0-alpha12"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 8f27609abab..7182144fd20 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -15,7 +15,7 @@ , }: stdenv.mkDerivation rec { - name = "pwndbg-${version}"; + pname = "pwndbg"; version = "2019.01.25"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 19e4423f7d8..0519e4d05e0 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -27,7 +27,6 @@ assert stdenv.hostPlatform.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.18"; - name = "${pname}-${version}"; src = fetchurl { name = "saleae-logic-${version}-64bit.zip"; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index a506831cd8e..004975f10d8 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.5.1"; - name = "sipp-${version}"; + pname = "sipp"; src = fetchFromGitHub { owner = "SIPp"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index acdc712786f..c809437f6fb 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libunwind, buildPackages }: stdenv.mkDerivation rec { - name = "strace-${version}"; + pname = "strace"; version = "5.2"; src = fetchurl { - url = "https://strace.io/files/${version}/${name}.tar.xz"; + url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"; }; diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index b50aa088ac5..9872c91ac4b 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { - name = "tcptrack-${version}"; + pname = "tcptrack"; version = "1.4.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index 77b362c712c..29d809b5f05 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { version = "3.8"; - name = "tet-${version}"; + pname = "tet"; src = fetchurl { url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 63e5bea19d7..5f4478bd4fb 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo, ncurses, lzma }: stdenv.mkDerivation rec { - name = "texinfo-${version}"; + pname = "texinfo"; version = "4.13a"; src = fetchurl { - url = "mirror://gnu/texinfo/${name}.tar.lzma"; + url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma"; sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"; }; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index c380243a898..5e40152df8d 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tie-${version}"; + pname = "tie"; version = "2.4"; src = fetchurl { - url = "http://mirrors.ctan.org/web/tie/${name}.tar.gz"; + url = "http://mirrors.ctan.org/web/tie/${pname}-${version}.tar.gz"; sha256 = "1m5952kdfffiz33p1jw0wv7dh272mmw28mpxw9v7lkb352zv4xsj"; }; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 11caf8e7b20..65a17fd1242 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -6,7 +6,7 @@ assert stdenv.lib.versionOlder "4.02" ocaml.version; stdenv.mkDerivation rec { - name = "trv-${version}"; + pname = "trv"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index ebc85c19b39..68409a59f37 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: stdenv.mkDerivation rec { - name = "universal-ctags-${version}"; + pname = "universal-ctags"; version = "unstable-2019-07-30"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix index 0fa854f9b2a..fb43ff61a81 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, tcl, usb-modeswitch }: stdenv.mkDerivation rec { - name = "usb-modeswitch-data-${version}"; + pname = "usb-modeswitch-data"; version = "20170806"; src = fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2"; sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff"; }; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index d34a94e0467..7c119c92943 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "usb-modeswitch-${version}"; + pname = "usb-modeswitch"; version = "2.5.2"; src = fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2"; sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb"; }; diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix index e806a779638..2b6e349b9fd 100644 --- a/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libelf }: stdenv.mkDerivation rec { - name = "vtable-dumper-${version}"; + pname = "vtable-dumper"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index d6b8eb5b95f..e2ea96cd590 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "watson-ruby-${version}"; + pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; env = bundlerEnv rec { diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 8f3f6c1b22a..6edf6551b06 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "787"; - name = "xc3sprog-${version}"; + pname = "xc3sprog"; src = fetchsvn rec { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 2e67da18ae9..b409009b524 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "ycmd-${version}"; + pname = "ycmd"; version = "2018-09-20"; src = fetchgit { diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 76130f255fd..5520a4a30be 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, perl, icmake, utillinux }: stdenv.mkDerivation rec { - name = "yodl-${version}"; + pname = "yodl"; version = "4.02.01"; nativeBuildInputs = [ icmake ]; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 6390c1d7fd2..60e948d593f 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "mod-${version}"; + pname = "mod"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index 2b5f42b2cbe..1d7784ae1cc 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, unzip }: stdenv.mkDerivation rec { - name = "msgpack-tools-${version}"; + pname = "msgpack-tools"; version = "0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 0b060624de3..41e74bc120f 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mustache-go-${version}"; + pname = "mustache-go"; version = "1.0.1"; goPackagePath = "github.com/cbroglie/mustache"; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 57beec8f171..e052b724439 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -20,7 +20,7 @@ let }; in stdenv.mkDerivation rec { - name = "nwjs-${version}"; + pname = "nwjs"; version = "0.12.3"; src = fetchurl { diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 234f5a5bfae..081e86c44dd 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }: stdenv.mkDerivation rec { - name = "nrpl-${version}"; + pname = "nrpl"; version = "20150522"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 7117d7dd628..0539e8de92b 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchzip, scons, zlib }: stdenv.mkDerivation rec { - name = "nsis-${version}"; + pname = "nsis"; version = "3.04"; src = diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 96516bfda48..30f531d7db2 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -32,7 +32,7 @@ let }; in stdenv.mkDerivation rec { - name = "nwjs-${version}"; + pname = "nwjs"; version = "0.33.4"; src = if sdk then fetchurl { diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index a83959fba39..4a4203a2f59 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -26,7 +26,7 @@ let param = { in stdenv.mkDerivation rec { - name = "camlp4-${version}"; + pname = "camlp4"; inherit (param) version; src = fetchzip { diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 91870a570b0..fb1eb4276d6 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { - name = "ocaml-findlib-${version}"; + pname = "ocaml-findlib"; version = "1.8.1"; src = fetchurl { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index 1307635abb9..90e88979de4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-${version}"; + pname = "js_of_ocaml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index ff59fa7cf8a..e9e7f9d279e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "js_of_ocaml-camlp4-${version}"; + pname = "js_of_ocaml-camlp4"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index c5a345f505b..c1526892312 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -7,7 +7,7 @@ then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "js_of_ocaml-compiler-${version}"; + pname = "js_of_ocaml-compiler"; version = "3.3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index e7a31c1ce2e..65afee16afb 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-lwt-${version}"; + pname = "js_of_ocaml-lwt"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index bf33b4e59e5..4b2b14d317b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ocamlbuild-${version}"; + pname = "js_of_ocaml-ocamlbuild"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 0649aee162a..277973afba8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ppx-${version}"; + pname = "js_of_ocaml-ppx"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index ddea73b3c76..5b5f7d18f79 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ppx_deriving_json-${version}"; + pname = "js_of_ocaml-ppx_deriving_json"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index 1ba9ddd0ab7..c24162cccf7 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-tyxml-${version}"; + pname = "js_of_ocaml-tyxml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 2364058729e..90b092f0e4b 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.10"; - name = "ocaml-oasis-${version}"; + pname = "ocaml-oasis"; # You must manually update the url, not just the version. OCamlforge keys off # the number after download.php, not the filename. diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 87d592bd112..e7528d4f772 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocamlPackages }: stdenv.mkDerivation rec { - name = "obelisk-${version}"; + pname = "obelisk"; version = "0.4.0"; src = fetchFromGitHub { owner = "lelio-brun"; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 74dee630d29..dbf33424439 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { - name = "ocamlmod-${version}"; + pname = "ocamlmod"; version = "0.0.9"; src = fetchurl { diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index f91ae713200..09ab9587ddb 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; - name = "${pname}-${version}"; version = "3.4.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 0f536c489eb..da7a5b439ab 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "omake-${version}"; + pname = "omake"; version = "0.10.3"; src = fetchurl { - url = "http://download.camlcity.org/download/${name}.tar.gz"; + url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"; }; diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix index fa5393c1871..a49749ad716 100644 --- a/pkgs/development/tools/ocaml/opaline/default.nix +++ b/pkgs/development/tools/ocaml/opaline/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.3.2"; - name = "opaline-${version}"; + pname = "opaline"; src = fetchFromGitHub { owner = "jaapb"; diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index ddd8d4b9920..87490bcb617 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -44,7 +44,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "opam-${version}"; + pname = "opam"; version = "1.2.2"; buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 452f162b235..763642e5da1 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -60,7 +60,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "opam-${version}"; + pname = "opam"; version = "2.0.5"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index d9e563952ea..1dcea0da4cb 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -8,7 +8,7 @@ else stdenv.mkDerivation rec { version = "2.3.0"; - name = "utop-${version}"; + pname = "utop"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 725219c3d7c..f2915333427 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "omniorb-${version}"; + pname = "omniorb"; version = "4.2.3"; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 85f8955185f..784895845e5 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - name = "omnisharp-roslyn-${version}"; + pname = "omnisharp-roslyn"; version = "1.32.19"; src = fetchurl { diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 24a6404dc03..9e0da00dd52 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "packer-${version}"; + pname = "packer"; version = "1.4.1"; goPackagePath = "github.com/hashicorp/packer"; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 82849be40b2..54100dfdee9 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "packet-${version}"; + pname = "packet"; version = "v2.2.2"; goPackagePath = "github.com/ebsarr/packet"; diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix index 616a2049c77..0f8ead579d0 100644 --- a/pkgs/development/tools/parse-cli-bin/default.nix +++ b/pkgs/development/tools/parse-cli-bin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "parse-cli-bin-${version}"; + pname = "parse-cli-bin"; version = "3.0.5"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index b53116b888e..9e86a29cf93 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre}: stdenv.mkDerivation rec { - name = "antlr-${version}"; + pname = "antlr"; version = "3.4"; src = fetchurl { url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 9b3fd86b555..23ea39c6fa9 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "byacc-${version}"; + pname = "byacc"; version = "20190617"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/byacc/${name}.tgz" - "https://invisible-mirror.net/archives/byacc/${name}.tgz" + "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" + "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q"; }; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index d7d27ac9a1c..e46a494de76 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "flex-${version}"; + pname = "flex"; version = "2.6.4"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 681f90bbe5a..93f1d1ee649 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bobcat, icmake, yodl }: stdenv.mkDerivation rec { - name = "flexc++-${version}"; + pname = "flexc++"; version = "2.05.00"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index bf5a2374fde..d41c113821a 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, glib, pkgconfig, python, scons }: stdenv.mkDerivation rec { - name = "hammer-${version}"; + pname = "hammer"; version = "e7aa734"; src = fetchgit { diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 108576d0b11..aa7b63dafea 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "lemon-${version}"; + pname = "lemon"; version = "1.69"; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 1d0545f6889..f6e35f08639 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "re2c-${version}"; + pname = "re2c"; version = "1.0.3"; sourceRoot = "${src.name}/re2c"; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index ce562bbf5ac..7953a55c7d9 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "pet-${version}"; + pname = "pet"; version = "0.3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 6f26a48b9c4..e4b50f31776 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,6 +1,5 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "pew"; version = "1.1.2"; diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index 47b426604da..8aaae2b1c43 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "pgloader"; version = "3.6.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz"; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index a37de2a3f62..29b8d4d5ae1 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -15,7 +15,7 @@ let ''; in stdenv.mkDerivation rec { - name = "phantomjs-${version}"; + pname = "phantomjs"; version = "2.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 8155f3016c3..b02ae3c544f 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.1-7"; - name = "EZTrace-${version}"; + pname = "EZTrace"; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz"; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 5ff0d2ca2b1..5aaf3d436de 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "heaptrack-${version}"; + pname = "heaptrack"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 9130f31f21d..120fd89377b 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "pprof-unstable-${version}"; + pname = "pprof-unstable"; version = "2018-08-15"; rev = "781f11b1fcf71fae9d185e7189b5e686f575075a"; diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 559383f45fe..6d6a02ab49f 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "protoc-gen-doc-unstable-${version}"; + pname = "protoc-gen-doc-unstable"; version = "2019-04-22"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 10a10fa21ef..13e8c233ec3 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "pup-${version}"; + pname = "pup"; version = "0.4.0"; rev = "v${version}"; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 9292d124545..16bb654aa6b 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "quicktemplate-unstable-${version}"; + pname = "quicktemplate-unstable"; version = "2019-01-31"; goPackagePath = "github.com/valyala/quicktemplate"; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index a5683e7a953..a2ab9a47a79 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, openssh }: stdenv.mkDerivation rec { - name = "rdocker-${version}"; + pname = "rdocker"; version = "unstable-2018-07-17"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 939febae693..dfa31b30a7e 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -37,7 +37,7 @@ let xorg.libXScrnSaver ]; in stdenv.mkDerivation rec { - name = "react-native-debugger-${version}"; + pname = "react-native-debugger"; version = "0.9.10"; src = fetchurl { diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix index 3e69b4ffa07..b82c0694fec 100644 --- a/pkgs/development/tools/reflex/default.nix +++ b/pkgs/development/tools/reflex/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { - name = "reflex-${version}"; + pname = "reflex"; version = "0.2.0"; goPackagePath = "github.com/cespare/reflex"; diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 6ef724022e8..2d5346f2112 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "reftools-unstable-${version}"; + pname = "reftools-unstable"; version = "2018-09-14"; rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399"; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index 35aab138292..80c64a65083 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: with pythonPackages; buildPythonApplication rec { - name = "reno-${version}"; + pname = "reno"; version = "2.3.2"; src = fetchurl { - url = "mirror://pypi/r/reno/${name}.tar.gz"; + url = "mirror://pypi/r/reno/${pname}-${version}.tar.gz"; sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4"; }; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index ffd9774ee44..44654e052d1 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre_headless, gawk }: stdenv.mkDerivation rec { - name = "nexus-${version}"; + pname = "nexus"; version = "3.16.1-02"; src = fetchurl { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln"; }; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index aa537df1508..507402deed6 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "richgo-${version}"; + pname = "richgo"; version = "0.2.8"; goPackagePath = "github.com/kyoh86/richgo"; diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 499cec2e6a7..51801864796 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }: stdenv.mkDerivation rec { - name = "ronn-${version}"; + pname = "ronn"; version = env.gems.ronn.version; env = bundlerEnv rec { diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index da3b27ebacc..3a9ecb7697a 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: stdenv.mkDerivation rec { - name = "rtags-${version}"; + pname = "rtags"; version = "2.16"; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix index 09008c9d63d..12b00ce93f3 100644 --- a/pkgs/development/tools/rucksack/default.nix +++ b/pkgs/development/tools/rucksack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - name = "rucksack-${version}"; + pname = "rucksack"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index c6b3d0b4cd0..4cd8b328353 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "sauce-connect-${version}"; + pname = "sauce-connect"; version = "4.5.4"; src = fetchurl ( diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f9128582092..5937b00f459 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -27,7 +27,7 @@ let ]; in stdenv.mkDerivation rec { - name = "chromedriver-${version}"; + pname = "chromedriver"; version = "76.0.3809.68"; src = fetchurl { diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index a8085399b3d..3f4b8a22d64 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "htmlunit-driver-standalone-${version}"; + pname = "htmlunit-driver-standalone"; version = "2.27"; src = fetchurl { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - installPhase = "install -D $src $out/share/lib/${name}/${name}.jar"; + installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; meta = { homepage = https://github.com/SeleniumHQ/htmlunit-driver; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 61b74ce108d..d3a8efaadb6 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -8,7 +8,7 @@ let patchVersion = "0"; in stdenv.mkDerivation rec { - name = "selenium-server-standalone-${version}"; + pname = "selenium-server-standalone"; version = "${minorVersion}.${patchVersion}"; src = fetchurl { @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { buildInputs = [ jre makeWrapper ]; installPhase = '' - mkdir -p $out/share/lib/${name} - cp $src $out/share/lib/${name}/${name}.jar + mkdir -p $out/share/lib/${pname}-${version} + cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ - --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ + --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 04076a8f0cf..71f488c760a 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -4,7 +4,7 @@ , GLUT }: stdenv.mkDerivation rec { - name = "simavr-${version}"; + pname = "simavr"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d5a6f3915f2..92199094f5d 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "skaffold-${version}"; + pname = "skaffold"; version = "0.30.0"; # rev is the 0.30.0 commit, mainly for skaffold version command output rev = "fe31429012110e6fd70f97971288bd266ba95bed"; diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 35ba9f8c006..c60238b93d2 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -4,7 +4,7 @@ qtbase, qttools, glm }: stdenv.mkDerivation rec { - name = "solarus-quest-editor-${version}"; + pname = "solarus-quest-editor"; version = "1.6.0"; src = fetchFromGitLab { diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index f2f50c18e0b..d84322bb547 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -2,7 +2,7 @@ , zlib, expat, dbus, openssl, python3 }: stdenv.mkDerivation rec { - name = "sourcetrail-${version}"; + pname = "sourcetrail"; version = "2019.2.39"; src = fetchurl { diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index c9df2703daa..b44eaaf2d7d 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -6,7 +6,7 @@ in assert version == spirv-headers.version; stdenv.mkDerivation rec { - name = "spirv-tools-${version}"; + pname = "spirv-tools"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 4acfa4a2b0e..52c33f3e444 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -4,11 +4,11 @@ let mainVersion = "2.5"; in stdenv.mkDerivation rec { - name = "sqsh-${version}"; + pname = "sqsh"; version = "${mainVersion}.16.1"; src = fetchurl { - url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz"; + url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${pname}-${version}.tgz"; sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; }; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 21068a8b05f..f1a1ceb9bb1 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -1,7 +1,7 @@ { stdenv, libgit2, fetchgit }: stdenv.mkDerivation rec { - name = "stagit-${version}"; + pname = "stagit"; version = "0.9.1"; src = fetchgit { diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 0ad7d7f78d4..c005ebeee78 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "statik-unstable-${version}"; + pname = "statik-unstable"; version = "2018-11-28"; goPackagePath = "github.com/rakyll/statik"; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index a3499258a99..cc865e2bd52 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { - name = "textql-${version}"; + pname = "textql"; version = "2.0.3"; goPackagePath = "github.com/dinedal/textql"; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index f07451ae840..50c34dc39ed 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -14,7 +14,7 @@ let ]; }; in stdenv.mkDerivation rec { - name = "thrust-${version}"; + pname = "thrust"; version = "0.7.6"; src = fetchurl { diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 90d36c71caa..df6279b5a4c 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.93"; - name = "toluapp-${version}"; + pname = "toluapp"; src = fetchFromGitHub { owner = "LuaDist"; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 2bbe2cfe16d..7f35d3c438d 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -5,7 +5,7 @@ let qscintillaLib = (qscintilla.override { withQt5 = true; }); in mkDerivation rec { - name = "tora-${version}"; + pname = "tora"; version = "3.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 565ec7904f1..a5c13e2266e 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "toxiproxy-${version}"; + pname = "toxiproxy"; version = "2.1.3"; src = fetchFromGitHub { owner = "Shopify"; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index a348e295933..565811b2048 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -7,7 +7,7 @@ let boostWithPython3 = boost.override { python = python3; enablePython = true; }; in stdenv.mkDerivation rec { - name = "trellis-${version}"; + pname = "trellis"; version = "2019.04.22"; srcs = [ diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 775e26eb6a8..01531d23c78 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }: buildGoPackage rec { - name = "tychus-${version}"; + pname = "tychus"; version = "0.6.3"; goPackagePath = "github.com/devlocker/tychus"; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index f62cd1aabb1..796d3509c1c 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "uftrace-${version}"; + pname = "uftrace"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix index 1e81c5b9f86..a6c087d7be7 100644 --- a/pkgs/development/tools/unconvert/default.nix +++ b/pkgs/development/tools/unconvert/default.nix @@ -5,7 +5,7 @@ }: buildGoPackage rec { - name = "unconvert-unstable-${version}"; + pname = "unconvert-unstable"; version = "2018-07-03"; rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b"; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 54ace72c5fb..0ca7e37ef70 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -23,7 +23,7 @@ let build = "f2"; in stdenv.mkDerivation rec { - name = "unity-editor-${version}"; + pname = "unity-editor"; version = "${ver}x${build}"; src = fetchurl { diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index ebeb81c90ec..71c47a7394b 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}: stdenv.mkDerivation rec { version = "0.36.2"; - name = "valadoc-${version}"; + pname = "valadoc"; src = fetchurl { - url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h"; }; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index f6c160de65c..8f3bc560905 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -4,7 +4,6 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "vcstool"; version = "0.1.36"; diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 9601771f75f..e8173a6b5b0 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -8,7 +8,7 @@ }: buildGoPackage rec { - name = "vgo2nix-${version}"; + pname = "vgo2nix"; version = "unstable-2019-02-06"; goPackagePath = "github.com/adisbladis/vgo2nix"; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 3e8a228bacf..27296edfac0 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -3,7 +3,7 @@ with python3Packages; buildPythonApplication rec { - name = "vim-vint-${version}"; + pname = "vim-vint"; version = "0.3.20"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 42cf6f07f4d..197f48dbbfb 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vndr-unstable-${version}"; + pname = "vndr-unstable"; version = "2018-06-23"; rev = "81cb8916aad3c8d06193f008dba3e16f82851f52"; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index e87ba2b52c1..b0768ca4b7e 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -8,7 +8,7 @@ }: mkDerivation rec { - name = "vogl-${version}"; + pname = "vogl"; version = "2016-05-13"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 3c189d09f1c..984dbc1ee44 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -2,7 +2,7 @@ , vulkan-headers, vulkan-loader, glslang , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { - name = "vulkan-validation-layers-${version}"; + pname = "vulkan-validation-layers"; version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! src = fetchFromGitHub { diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 8e17c531547..7cc8ce6fe13 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vultr-${version}"; + pname = "vultr"; version = "1.15.0"; goPackagePath = "github.com/JamesClonk/vultr"; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index e9ced0e753a..f8936e27516 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { - name = "wabt-${version}"; + pname = "wabt"; version = "1.0.11"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 4a056db6c0c..3a58e1088ea 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "watchman-${version}"; + pname = "watchman"; version = "4.9.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix index aaf1b20ea6f..8db830b3284 100644 --- a/pkgs/development/tools/wiiload/default.nix +++ b/pkgs/development/tools/wiiload/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, zlib }: stdenv.mkDerivation rec { version = "v0.5.1"; - name = "wiiload-${version}"; + pname = "wiiload"; nativeBuildInputs = [ autoconf automake ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 17c64f0548b..da1b493b0d2 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "ws-${version}"; + pname = "ws"; version = "0.2.1"; rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 29717d75394..0874c9e5515 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -16,7 +16,7 @@ let sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; }; in stdenv.mkDerivation rec { - name = "xcbuild-${version}"; + pname = "xcbuild"; # Once a version is released that includes # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index c163c4cbcf6..44a7254a3d7 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xercesc }: stdenv.mkDerivation rec { - name = "xqilla-${version}"; + pname = "xqilla"; version = "2.3.4"; src = fetchurl { diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index 1a8d7f13aff..ece440c692f 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { - name = "yaml2json-${version}"; + pname = "yaml2json"; version = "unstable-2017-05-03"; goPackagePath = "github.com/bronze1man/yaml2json"; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 3520bcfc1b1..a2076668f60 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "yj-${version}"; + pname = "yj"; version = "4.0.0"; rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558"; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index c157ddd65a8..82fac9f6be7 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "yuicompressor-${version}"; + pname = "yuicompressor"; version = "2.4.8"; src = fetchurl { - url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar"; + url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; }; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4159e369049..4db0da4f418 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.10.0"; - name = "csslint-${version}"; + pname = "csslint"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/${name}.tgz"; + url = "https://registry.npmjs.org/csslint/-/${pname}-${version}.tgz"; sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid"; }; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 24f56789198..5427f66478f 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -10,7 +10,7 @@ let ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { - name = "grails-${version}"; + pname = "grails"; version = "4.0.0"; src = fetchurl { diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 26cec8f3730..81417f6287b 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -17,7 +17,7 @@ let stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "insomnia-${version}"; + pname = "insomnia"; version = "6.5.3"; src = fetchurl { diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 485c4026afa..ec1ec527c5e 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "kcgi"; version = "0.10.8"; underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "kristapsdz"; diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 91b4fe15e5a..eb3254dcd3a 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "now-cli-${version}"; + pname = "now-cli"; version = "15.8.7"; # TODO: switch to building from source, if possible diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 58b0f0e876f..1767eaab8bc 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { - name = "postman-${version}"; + pname = "postman"; version = "7.0.7"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index 22404481f35..f27f143df04 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - name = "remarkjs-${version}"; + pname = "remarkjs"; version = "0.7.0"; diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 266217d94e2..a625a815603 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -2,7 +2,7 @@ , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { - name = "valum-${version}"; + pname = "valum"; version = "0.3.15"; src = fetchFromGitHub { diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index bda6dab14d8..b77184e5652 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,7 +1,7 @@ { brotli, cmake, fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "woff2-${version}"; + pname = "woff2"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index f0966357d93..b9b0ccf7272 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex }: stdenv.mkDerivation rec { - name = "xmlindent-${version}"; + pname = "xmlindent"; version = "0.2.17"; src = fetchurl { - url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${pname}-${version}.tar.gz"; sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs"; }; diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 2cfddd1066b..eeedae92440 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zeroad-unwrapped }: stdenv.mkDerivation rec { - name = "0ad-data-${version}"; + pname = "0ad-data"; inherit (zeroad-unwrapped) version; src = fetchurl { diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 74bc52875d2..ef285f8cb93 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -9,7 +9,7 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { - name = "0ad-${version}"; + pname = "0ad"; version = "0.0.23b"; src = fetchurl { diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index 5d91bc04114..446252062fa 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "2048-in-terminal-${version}"; + pname = "2048-in-terminal"; version = "2017-11-29"; src = fetchFromGitHub { diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 02ea6f68806..19d2a01b472 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, SDL, SDL_image }: stdenv.mkDerivation rec { - name = "airstrike-pre-${version}"; + pname = "airstrike-pre"; version = "6a"; src = fetchurl { diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix index b5c7f4b730b..fcde2d591f1 100644 --- a/pkgs/games/amoeba/data.nix +++ b/pkgs/games/amoeba/data.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "amoeba-data-${version}"; + pname = "amoeba-data"; version = "1.1"; src = fetchurl { diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 4bdfc87d8da..3b0693705b7 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.1.3"; - name = "angband-${version}"; + pname = "angband"; src = fetchFromGitHub { owner = "angband"; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index a8e9063a35f..5b1f240e7b5 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "arx-libertatis-${version}"; + pname = "arx-libertatis"; version = "2019-02-16"; src = fetchFromGitHub { diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index b2c86222f2b..37593d3bd72 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.2"; - name = "astromenace-${version}"; + pname = "astromenace"; src = fetchurl { url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2"; diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index de9eb9bbb58..b11a177e045 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { - name = "atanks-${version}"; + pname = "atanks"; version = "6.5"; src = fetchurl { - url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/atanks/atanks/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j"; }; diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index 27ddec616bc..85b6fcefdd2 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }: stdenv.mkDerivation rec { - name = "bastet-${version}"; + pname = "bastet"; version = "0.43.2"; buildInputs = [ ncurses boost ]; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index af1228108d8..d3eb2348a0d 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -2,7 +2,7 @@ , pkgconfig, unzip}: stdenv.mkDerivation rec { version = "1.0"; - name = "blobby-volley-${version}"; + pname = "blobby-volley"; src = fetchurl { url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix index 808d7e37807..deb542e3a86 100644 --- a/pkgs/games/braincurses/default.nix +++ b/pkgs/games/braincurses/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "braincurses-${version}"; + pname = "braincurses"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 5040886eaa0..e34dfc383a1 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }: stdenv.mkDerivation rec { - name = "brogue-${version}"; + pname = "brogue"; version = "1.7.5"; src = fetchurl { diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 6c7e9ac76a9..56d2866a235 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -3,12 +3,11 @@ , Carbon, CoreServices }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "bzflag"; version = "2.4.18"; src = fetchurl { - url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; + url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2"; sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx"; }; diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 47432bca163..3b460daefd1 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "chessx-${version}"; + pname = "chessx"; version = "1.5.0"; src = fetchurl { diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 47ab73ca269..81f1ee0cd15 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }: stdenv.mkDerivation rec { - name = "ckan-${version}"; + pname = "ckan"; version = "1.16.1"; src = fetchFromGitHub { diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index a38678882c8..56164cfc017 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "commandergenius-${version}"; + pname = "commandergenius"; version = "2.3.3"; src = fetchFromGitLab { diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index c6ccac69b8c..9528c6d06cb 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }: stdenv.mkDerivation rec { - name = "construo-${version}"; + pname = "construo"; version = "0.2.3"; src = fetchurl { - url = "https://github.com/Construo/construo/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/Construo/construo/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa"; }; diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 9526512f15c..c9dcd2d9d40 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "crafty-${version}"; + pname = "crafty"; version = "25.0.1"; src = fetchurl { diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index c77e0c8b485..756436c1ffc 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qttools, qtsvg }: stdenv.mkDerivation rec { - name = "cutemaze-${version}"; + pname = "cutemaze"; version = "1.2.4"; src = fetchurl { - url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; + url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; sha256 = "0l727j28igs7cx6gvxs43vvzhp3hk0z61df7sprp1vdxzpzzfifl"; }; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index 19d857a8e78..f4e5290df27 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_mixer, zlib }: stdenv.mkDerivation rec { - name = "cuyo-${version}"; + pname = "cuyo"; version = "2.1.0"; src = fetchurl { diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 8b92c2e9d6f..441e9f66981 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -2,7 +2,7 @@ , openal, curl }: stdenv.mkDerivation rec { - name = "dhewm3-${version}"; + pname = "dhewm3"; version = "1.5.0"; src = fetchFromGitHub { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 652e4c18475..bcef336f342 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,7 +2,7 @@ , qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { - name = "dwarf-therapist-${version}"; + pname = "dwarf-therapist"; version = "41.0.2"; src = fetchFromGitHub { diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index caa9adeefd0..a59c8730690 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; dfVersion = "0.44.12"; inherit soundPack; - name = "soundsense-${version}"; + pname = "soundsense"; src = fetchzip { url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip"; sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk"; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 86d233b0378..518b63ed483 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -9,7 +9,7 @@ let }; in stdenv.mkDerivation rec { - name = "dxx-rebirth-${version}"; + pname = "dxx-rebirth"; version = "0.59.100"; src = fetchurl { diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index c8b85da213a..1ebe219a736 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -4,7 +4,7 @@ , mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }: stdenv.mkDerivation rec { - name = "easyrpg-player-${version}"; + pname = "easyrpg-player"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 6815041c96b..18c83b8c5a4 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -9,7 +9,7 @@ let version = "${major}.${minor}.${patch}"; serious-proton = stdenv.mkDerivation rec { - name = "serious-proton-${version}"; + pname = "serious-proton"; inherit version; src = fetchFromGitHub { @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { - name = "empty-epsilon-${version}"; + pname = "empty-epsilon"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index 742ca959135..af002a690e4 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, cmake, qtbase }: stdenv.mkDerivation rec { - name = "enyo-doom-${version}"; + pname = "enyo-doom"; version = "1.06.9"; src = fetchFromGitLab { diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 911308a078a..86a83d68f02 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "eternity-engine-${version}"; + pname = "eternity-engine"; version = "3.42.02"; src = fetchFromGitHub { owner = "team-eternity"; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index fba1ce01c45..30788c7ec5c 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "extremetuxracer-${version}"; + pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 85433e116fb..e06975e8db4 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -3,7 +3,6 @@ , pkgconfig, SDL2, vim }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "ezquake"; version = "3.0.1"; diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index 1aab0933b1b..44ed91da168 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "fairymax-${version}"; + pname = "fairymax"; version = "4.8"; src = fetchurl { url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c"; diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 2ab6e04e2d8..47f72c52c1f 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}: stdenv.mkDerivation rec { - name = "fish-fillets-ng-${version}"; + pname = "fish-fillets-ng"; version = "1.0.1"; src = fetchurl { url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz"; diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index ef46ea840b7..957452aa162 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, fltk, which, libjpeg }: stdenv.mkDerivation rec { - name = "fltrator-${version}"; + pname = "fltrator"; version = "2.3"; src = fetchurl { diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 35bc22e8789..3ba383c7427 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "freecell-solver-${version}"; + pname = "freecell-solver"; version = "4.18.0"; src = fetchurl { - url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; + url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz"; sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn"; }; diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 125f02005a3..d0f514f239d 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4.8"; - name = "freeorion-${version}"; + pname = "freeorion"; src = fetchFromGitHub { owner = "freeorion"; diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index dd0707fe5c3..94efe1b650a 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -2,7 +2,7 @@ updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { - name = "freesweep-${version}"; + pname = "freesweep"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 3b4fb6842db..3dbd7bd928b 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.44"; - name = "frotz-${version}"; + pname = "frotz"; src = fetchFromGitHub { owner = "DavidGriffith"; diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix index dd27f96f7d4..f5089b6395f 100644 --- a/pkgs/games/galaxis/default.nix +++ b/pkgs/games/galaxis/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "galaxis-${version}"; + pname = "galaxis"; version = "1.10"; src = fetchurl{ - url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz"; + url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz"; sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r"; }; diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index dabcfb19db0..de4a89eac07 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, scons, qt4 }: stdenv.mkDerivation rec { - name = "gambatte-${version}"; + pname = "gambatte"; version = "2016-05-03"; src = fetchFromGitHub { diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 066cadb13b1..4c57538e234 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, allegro }: stdenv.mkDerivation rec { - name = "garden-of-coloured-lights-${version}"; + pname = "garden-of-coloured-lights"; version = "1.0.9"; buildInputs = [ allegro autoconf automake ]; diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 8d41070a61e..e5a4bca6192 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { version = "0.96"; - name = "gcompris-${version}"; + pname = "gcompris"; src = fetchurl { url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index b718a92143c..3665467407a 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -29,10 +29,10 @@ let sha256 = "085jpp9mpv5kw00zds9sywmfq31mrlbrgahnwcjkx0z9i22amz4g"; }; in stdenv.mkDerivation rec { - name = "gcs-${version}"; + pname = "gcs"; version = "4.8.0"; - src = runCommand "${name}-src" { preferLocalBuild = true; } '' + src = runCommand "${pname}-${version}-src" { preferLocalBuild = true; } '' mkdir -p $out cd $out diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index fc7bf7168dd..72afca4cd2c 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -3,7 +3,7 @@ , libiconv }: stdenv.mkDerivation rec { - name = "gemrb-${version}"; + pname = "gemrb"; version = "0.8.5"; src = fetchFromGitHub { diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index b9694811fa5..fb60808bab7 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gl-117-${version}"; + pname = "gl-117"; version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${name}.tar.bz2"; + url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${pname}-${version}.tar.bz2"; sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4"; }; diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 2952edaa78d..fa8d59c0503 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gnugo-${version}"; + pname = "gnugo"; version = "3.8"; src = fetchurl { diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 64c3954ba48..4bf460836d9 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: stdenv.mkDerivation rec { - name = "gnujump-${version}"; + pname = "gnujump"; version = "1.0.8"; src = fetchurl { - url = "mirror://gnu/gnujump/${name}.tar.gz"; + url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz"; sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; }; buildInputs = [ SDL SDL_image SDL_mixer ]; diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix index e8567455030..381b4fd5959 100644 --- a/pkgs/games/gnushogi/default.nix +++ b/pkgs/games/gnushogi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gnushogi-${version}"; + pname = "gnushogi"; version = "1.4.2"; buildInputs = [ zlib ]; src = fetchurl { - url = "mirror://gnu/gnushogi/${name}.tar.gz"; + url = "mirror://gnu/gnushogi/${pname}-${version}.tar.gz"; sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"; }; diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index b29b045a421..6031762d1d6 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, libiconv, ncurses, perl, fortune}: stdenv.mkDerivation rec { - name = "gtypist-${version}"; + pname = "gtypist"; version = "2.9.5"; src = fetchurl { diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index ed24f44356a..35a19179a52 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -3,7 +3,7 @@ , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { - name = "gzdoom-${version}"; + pname = "gzdoom"; version = "4.1.3"; src = fetchFromGitHub { diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 470e1d090fc..97aee425fd1 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.12.1"; - name = "hawkthorne-${version}"; + pname = "hawkthorne"; src = fetchgit { url = "https://github.com/hawkthorne/hawkthorne-journey.git"; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index ea229db6a74..7ef5c6a49b3 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { version = "1.0.0-beta1"; - name = "hedgewars-${version}"; + pname = "hedgewars"; src = fetchhg { url = "https://hg.hedgewars.org/hedgewars/"; rev = "7ab5cf405686"; diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix index e6d6febeac6..c20cce723c2 100644 --- a/pkgs/games/holdingnuts/default.nix +++ b/pkgs/games/holdingnuts/default.nix @@ -2,12 +2,11 @@ let mirror = "http://download.holdingnuts.net"; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "holdingnuts"; version = "0.0.5"; src = fetchurl { - url = "${mirror}/release/${version}/${name}.tar.bz2"; + url = "${mirror}/release/${version}/${pname}-${version}.tar.bz2"; sha256 = "0iw25jmnqzscg34v66d4zz70lvgjp4l7gi16nna6491xnqha5a8g"; }; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 760d82c026d..b4f5e4f7f63 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -2,7 +2,7 @@ libpng, glew, makeDesktopItem }: stdenv.mkDerivation rec { - name = "hyperrogue-${version}"; + pname = "hyperrogue"; version = "10.5e"; src = fetchFromGitHub { diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix index 39324843e5e..10d29657d7c 100644 --- a/pkgs/games/instead-launcher/default.nix +++ b/pkgs/games/instead-launcher/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }: stdenv.mkDerivation rec { - name = "instead-launcher-${version}"; + pname = "instead-launcher"; version = "0.7.0"; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index f84b83a3010..86f3f721446 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "ivan-${version}"; + pname = "ivan"; version = "056"; src = fetchFromGitHub { diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 37c45e7aa60..94c614598bf 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -27,7 +27,7 @@ let }; in stdenv.mkDerivation rec { - name = "ja2-stracciatella-${version}"; + pname = "ja2-stracciatella"; inherit src; inherit version; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 4cea30c79e6..e2a4cff291b 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }: stdenv.mkDerivation rec { - name = "klavaro-${version}"; + pname = "klavaro"; version = "3.08"; src = fetchurl { - url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; + url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc"; }; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index b5f858b99ad..0e6941a8acd 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: stdenv.mkDerivation rec { - name = "lbreakout2-${version}"; + pname = "lbreakout2"; version = "2.6.5"; buildInputs = [ SDL SDL_mixer zlib libpng libintl ]; src = fetchurl { - url = "mirror://sourceforge/lgames/${name}.tar.gz"; + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; }; diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index d00072d2455..d4621682cc6 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -2,7 +2,7 @@ , opencl-headers, ocl-icd, qtbase , zlib }: stdenv.mkDerivation rec { - name = "leela-zero-${version}"; + pname = "leela-zero"; version = "0.17"; src = fetchFromGitHub { diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index daf7dd7f61f..505d98c92db 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -2,7 +2,7 @@ , htmlcxx, rhash, tinyxml-2, help2man }: stdenv.mkDerivation rec { - name = "lgogdownloader-${version}"; + pname = "lgogdownloader"; version = "3.5"; src = fetchFromGitHub { diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index fef6e11d9be..0e819278dc3 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2016-07-06"; - name = "liberal-crime-squad-${version}"; + pname = "liberal-crime-squad"; src = fetchFromGitHub { owner = "Kamal-Sadek"; diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 0abbfda33c7..fb98b1a3811 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }: stdenv.mkDerivation rec { - name = "lincity-${version}"; + pname = "lincity"; version = "1.13.1"; src = fetchurl { - url = "mirror://sourceforge/lincity/${name}.tar.gz"; + url = "mirror://sourceforge/lincity/${pname}-${version}.tar.gz"; sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v"; }; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index b860d2ee58b..cfc06e11e19 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "lincity-ng-${version}"; + pname = "lincity-ng"; version = "2.9beta.20170715"; src = fetchFromGitHub { diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index d748c96da24..0bd90f77b24 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { version = "5.6.4"; - name = "liquidwar5-${version}"; + pname = "liquidwar5"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz"; sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j"; diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index af7101f216d..800ac0fc4c7 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -6,11 +6,11 @@ , libogg, libvorbis, libcaca, csound, cunit } : stdenv.mkDerivation rec { - name = "liquidwar6-${version}"; + pname = "liquidwar6"; version = "0.6.3902"; src = fetchurl { - url = "mirror://gnu/liquidwar6/${name}.tar.gz"; + url = "mirror://gnu/liquidwar6/${pname}-${version}.tar.gz"; sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn"; }; diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix index 10a79a69673..d580d7586ff 100644 --- a/pkgs/games/ltris/default.nix +++ b/pkgs/games/ltris/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, SDL, SDL_mixer }: stdenv.mkDerivation rec { - name = "ltris-${version}"; + pname = "ltris"; version = "1.0.19"; buildInputs = [ SDL SDL_mixer ]; src = fetchurl { - url = "mirror://sourceforge/lgames/${name}.tar.gz"; + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg"; }; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index da711f59af0..ed0b2be0d97 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "MAR1D-${version}"; + pname = "MAR1D"; version = "0.2.0"; options = "-w${toString width}" + " -s${toString sensitivity}" diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 21d2ad87dfb..8b0808d8e8c 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: stdenv.mkDerivation rec { - name = "meritous-${version}"; + pname = "meritous"; version = "1.4"; src = fetchFromGitLab { diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 4fd44880b82..9ddae8b65bf 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "minecraft-server-${version}"; + pname = "minecraft-server"; version = "1.14.4"; src = fetchurl { diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index dab83ddc900..4dcc7a6262f 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -2,7 +2,7 @@ , boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }: stdenv.mkDerivation rec { - name = "mudlet-${version}"; + pname = "mudlet"; version = "3.0.0-delta"; src = fetchurl { diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index c806dfa5b80..c465b413db1 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: stdenv.mkDerivation rec { - name = "newtonwars-${version}"; + pname = "newtonwars"; version = "20150609"; src = fetchFromGitHub { diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 8ac020f3ce0..b39519193e7 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -1,7 +1,7 @@ { fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: stdenv.mkDerivation rec { - name = "openarena-${version}"; + pname = "openarena"; version = "0.8.8"; src = fetchurl { diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index fa041119631..cce643e9f7d 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -11,7 +11,7 @@ let }; in stdenv.mkDerivation rec { version = "8.1"; - name = "openclonk-${version}"; + pname = "openclonk"; src = fetchurl { url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index d2f1e27b10e..751eb6d5933 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -7,7 +7,7 @@ # - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php stdenv.mkDerivation rec { - name = "opendune-${version}"; + pname = "opendune"; version = "0.9"; src = fetchFromGitHub { diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 3c4e85a91e5..d59afc330a7 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }: stdenv.mkDerivation rec { - name = "opendungeons-${version}"; + pname = "opendungeons"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index c57fe642dc3..c611190b3a9 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -12,12 +12,12 @@ let }); in stdenv.mkDerivation rec { version = "0.45.0"; - name = "openmw-${version}"; + pname = "openmw"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4"; }; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 63fb24dc4d7..fab4de64ee2 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2017-09-17"; - name = "openrw-${version}"; + pname = "openrw"; src = fetchgit { url = "https://github.com/rwengine/openrw"; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index e0acf60144e..de05e1944f3 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "openspades-${version}"; + pname = "openspades"; version = "0.1.3"; devPakVersion = "33"; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 91969a335f8..e3c23ad2671 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { - name = "openttd-${version}"; + pname = "openttd"; version = "1.9.2"; src = fetchurl { - url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; + url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr"; }; diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index c91f9807581..2dae58df976 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchzip, SDL, SDL_net}: stdenv.mkDerivation rec { - name = "opentyrian-${version}"; + pname = "opentyrian"; version = "2.1.20130907"; src = fetchurl { diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix index 59e7c874d14..a0169debfef 100644 --- a/pkgs/games/pacvim/default.nix +++ b/pkgs/games/pacvim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "pacvim-${version}"; + pname = "pacvim"; version = "2018-05-16"; src = fetchFromGitHub { owner = "jmoon018"; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index c73c346512f..28487a7f8e8 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "performous-${version}"; + pname = "performous"; version = "1.1"; meta = with stdenv.lib; { diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index 6991735962d..4cfd7de6a55 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: stdenv.mkDerivation rec { version = "1.0.13"; - name = "pro-office-calculator-${version}"; + pname = "pro-office-calculator"; src = fetchFromGitHub { owner = "RobJinman"; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 924101c2d4a..92429218178 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "qgo-${version}"; + pname = "qgo"; version = "unstable-2017-12-18"; meta = with stdenv.lib; { diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index dfd38476192..f161f53bfe1 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "qqwing-${version}"; + pname = "qqwing"; version = "1.3.4"; src = fetchFromGitHub { diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 1564ba19bd2..0602aace319 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -14,7 +14,7 @@ let wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; }; yquake2 = stdenv.mkDerivation rec { - name = "yquake2-${version}"; + pname = "yquake2"; version = "7.30"; src = fetchFromGitHub { diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 7bc0863a33f..7f0fb6fd062 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ioquake3-git-${version}"; + pname = "ioquake3-git"; version = "2019-05-29"; src = fetchFromGitHub { diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index f61b0e23792..a8d740ea512 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,6 +1,6 @@ { stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: stdenv.mkDerivation rec { - name = "quakespasm-${version}"; + pname = "quakespasm"; majorVersion = "0.93"; version = "${majorVersion}.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd"; }; - sourceRoot = "${name}/Quake"; + sourceRoot = "${pname}-${version}/Quake"; buildInputs = [ gzip SDL libvorbis libmad diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 4cd073869dc..114f862888d 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,7 +1,7 @@ { stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: stdenv.mkDerivation rec { - name = "vkquake-${version}"; + pname = "vkquake"; majorVersion = "1.01"; version = "${majorVersion}.0"; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index c44072309b1..79d657e668d 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.1.1"; - name = "residualvm-${version}"; + pname = "residualvm"; src = fetchurl { url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2"; diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index b6a74ad8be6..9ab63553053 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "rftg-${version}"; + pname = "rftg"; version = "0.9.4"; src = fetchurl { diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 274a095de6f..09550339f83 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4.7.0"; - name = "rigsofrods-${version}"; + pname = "rigsofrods"; src = fetchFromGitHub { owner = "RigsOfRods"; diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix index 7cbfacd0b40..780025f5222 100644 --- a/pkgs/games/riko4/default.nix +++ b/pkgs/games/riko4/default.nix @@ -5,7 +5,7 @@ let # and this library does not have a proper release version, so let the # derivation for this stay next to the Riko4 derivation for now. sdl-gpu = stdenv.mkDerivation rec { - name = "sdl-gpu-${version}"; + pname = "sdl-gpu"; version = "2018-11-01"; src = fetchFromGitHub { owner = "grimfang4"; @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { - name = "riko4-${version}"; + pname = "riko4"; version = "0.1.0"; src = fetchFromGitHub { owner = "incinirate"; diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 00d73f95bdb..fa1eb338a89 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "robotfindskitten-${version}"; + pname = "robotfindskitten"; version = "2.7182818.701"; src = fetchurl { - url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${name}.tar.gz"; + url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${pname}-${version}.tar.gz"; sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp"; }; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index a56365778fb..eaf1b3dc4fd 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }: stdenv.mkDerivation rec { - name = "runelite-${version}"; + pname = "runelite"; version = "1.6.0"; src = fetchurl { diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 79fef674002..345ce33fca0 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { - name = "scid-vs-pc-${version}"; + pname = "scid-vs-pc"; version = "4.20"; src = fetchurl { diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 301991c1a6f..040902ffd73 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: stdenv.mkDerivation rec { - name = "scid-${version}"; + pname = "scid"; version = "4.3"; src = fetchurl { diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 430b22c9ba9..1527f61c4d0 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "44"; - name = "scorched3d-${version}"; + pname = "scorched3d"; src = fetchurl { url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz"; sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw"; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 2ebc2c82e50..cb8223daa2b 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "scummvm-${version}"; + pname = "scummvm"; version = "2.0.0"; src = fetchurl { - url = "http://scummvm.org/frs/scummvm/${version}/${name}.tar.xz"; + url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p"; }; diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 9f90c9f14aa..7811b4b7373 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { version = "0.151.u0-1"; - name = "sdlmame-${version}"; + pname = "sdlmame"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-x86_64.pkg.tar.xz"; + url = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-x86_64.pkg.tar.xz"; sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9"; } else fetchurl { - url = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-i686.pkg.tar.xz"; + url = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-i686.pkg.tar.xz"; sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7"; }; diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index de91f26d95d..a998a86370d 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -9,7 +9,7 @@ let ''; in stdenv.mkDerivation rec { - name = "Sil-${version}"; + pname = "Sil"; version = "1.3.0"; src = fetchzip { diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index e8d915dd31a..1334f555bbd 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "snipes-${version}"; + pname = "snipes"; version = "20180930"; src = fetchFromGitHub { diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 7f9f49f363a..2ffd3f3d053 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -2,12 +2,12 @@ , boost, eigen2, lua, luabind, libGLU_combined, SDL }: stdenv.mkDerivation rec { - name = "soi-${version}"; + pname = "soi"; version = "0.1.2"; src = fetchurl { url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2"; - name = "${name}.tar.bz2"; + name = "${pname}-${version}.tar.bz2"; sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd"; }; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 1049b10d0b1..63a29a4f591 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -4,7 +4,7 @@ qtbase, qttools }: stdenv.mkDerivation rec { - name = "solarus-${version}"; + pname = "solarus"; version = "1.6.0"; src = fetchFromGitLab { diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index 162db967269..2b69dfccad1 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "space-orbit-${version}"; + pname = "space-orbit"; version = "1.01"; patchversion = "9"; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 1dcf432ccd4..9bfd917d1aa 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { - name = "spring-${version}"; + pname = "spring"; version = "104.0"; src = fetchurl { diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 8df4450d13d..b7c9b691c04 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,7 +3,7 @@ , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: stdenv.mkDerivation rec { - name = "springlobby-${version}"; + pname = "springlobby"; version = "0.267"; src = fetchurl { diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index 1408b66ab41..9de9bd37e8d 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -2,11 +2,11 @@ , libXi, libXmu, libXext, libGLU_combined }: stdenv.mkDerivation rec { - name = "stardust-${version}"; + pname = "stardust"; version = "0.1.13"; src = fetchurl { - url = "http://iwar.free.fr/IMG/gz/${name}.tar.gz"; + url = "http://iwar.free.fr/IMG/gz/${pname}-${version}.tar.gz"; sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp"; }; diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix index 1ea7f067787..be865d20f2f 100644 --- a/pkgs/games/steam/steamcmd.nix +++ b/pkgs/games/steam/steamcmd.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "steamcmd-${version}"; + pname = "steamcmd"; version = "20180104"; # According to steamcmd_linux.tar.gz mtime src = fetchurl { diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 86488874166..b29d22dfe73 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "stepmania-${version}"; + pname = "stepmania"; version = "5.1.0-b2"; src = fetchFromGitHub { diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 3865d8fbef9..6b3da08b70c 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -2,7 +2,7 @@ , makeWrapper, enet, libXcursor, bullet, openal }: stdenv.mkDerivation rec { - name = "stunt-rally-${version}"; + pname = "stunt-rally"; version = "2.6.1"; src = fetchurl { diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index cee65bfa563..6cfabc4ee6a 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "supertux-${version}"; + pname = "supertux"; version = "0.6.0"; src = fetchurl { diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 13d296e5961..5432824ce6c 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, file, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "terraria-server-${version}"; + pname = "terraria-server"; version = "1.3.5.3"; urlVersion = lib.replaceChars ["."] [""] version; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 68114bb7565..9cc3bf7149f 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, qt5, box2d, which, cmake, gettext }: stdenv.mkDerivation rec { - name = "tbe-${version}"; + pname = "tbe"; version = "0.9.3.1"; src = fetchgit { diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 929641cfab5..b0901fcb9a0 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "the-powder-toy-${version}"; + pname = "the-powder-toy"; version = "94.1"; src = fetchFromGitHub { diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index f230a70c088..fb3ebf36db3 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; assert sslSupport -> openssl != null; stdenv.mkDerivation rec { - name = "tinyfugue-${version}"; + pname = "tinyfugue"; version = "50b8"; verUrl = "5.0%20beta%208"; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 8549a860d8e..b5ff38b93a1 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "trackballs-${version}"; + pname = "trackballs"; version = "1.3.1"; src = fetchFromGitHub { diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 470856af90e..802bdb08a87 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { - name = "tremulous-${version}"; + pname = "tremulous"; version = "1.1.0"; src1 = fetchurl { - url = "mirror://sourceforge/tremulous/${name}.zip"; + url = "mirror://sourceforge/tremulous/${pname}-${version}.zip"; sha256 = "11w96y7ggm2sn5ncyaffsbg0vy9pblz2av71vqp9725wbbsndfy7"; }; # http://tremulous.net/wiki/Client_versions diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index ddf0782b210..603fb3ef491 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "0.9.22"; - name = "tuxpaint-${version}"; + pname = "tuxpaint"; src = fetchurl { - url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; }; diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index fa28dcefa5e..a32da556cc9 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -18,7 +18,7 @@ let ]; in stdenv.mkDerivation rec { - name = "ue4-${version}"; + pname = "ue4"; version = "4.10.2"; sourceRoot = "UnrealEngine-${version}-release"; src = requireFile { diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index f3eec52098d..8dd8222e55e 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -11,7 +11,7 @@ let ]; in stdenv.mkDerivation rec { - name = "ultrastardx-${version}"; + pname = "ultrastardx"; version = "2017.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index be1b5bd1195..ee3890aeea5 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, utillinux, ncurses, flex, bison }: stdenv.mkDerivation rec { - name = "unnethack-${version}"; + pname = "unnethack"; version = "5.2.0"; src = fetchgit { diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 00592f7c39b..638900c9e89 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -27,7 +27,7 @@ let ]; in stdenv.mkDerivation rec { - name = "uqm-${version}"; + pname = "uqm"; version = "0.7.0"; src = fetchurl { diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 1cd87541b8c..999799de58d 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { - name = "urbanterror-${version}"; + pname = "urbanterror"; version = "4.3.4"; srcs = diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix index 7039ff44a09..1790f083063 100644 --- a/pkgs/games/ut2004/demo.nix +++ b/pkgs/games/ut2004/demo.nix @@ -7,7 +7,7 @@ let else throw "Unsupported architecture"; in stdenv.mkDerivation rec { - name = "ut2004-demo-${version}"; + pname = "ut2004-demo"; version = "3334"; src = fetchurl { diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix index d57559a4d80..7f552bdd5d6 100644 --- a/pkgs/games/vitetris/default.nix +++ b/pkgs/games/vitetris/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lib }: stdenv.mkDerivation rec { - name = "vitetris-${version}"; + pname = "vitetris"; version = "0.58.0"; src = fetchFromGitHub { diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index 91f77277d9e..1d4545f17b1 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "vms-empire-${version}"; + pname = "vms-empire"; version = "1.14"; src = fetchurl{ - url = "http://www.catb.org/~esr/vms-empire/${name}.tar.gz"; + url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz"; sha256 = "0cymzhivvaahgqz0p11w25a710ls4w0jhyqj789jas5s07nvd890"; }; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index c1a9a2a7def..9ea9ec7bd12 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -2,11 +2,11 @@ , libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { - name = "voxelands-${version}"; + pname = "voxelands"; version = "1512.00"; src = fetchurl { - url = "http://voxelands.com/downloads/${name}-src.tar.bz2"; + url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2"; sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw"; }; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 04712b3ebff..a861e3725a2 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "warmux-${version}"; + pname = "warmux"; version = "unstable-2017-10-20"; src = fetchFromGitHub { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 1b51130768e..3d6a0399223 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, warsow-engine, makeWrapper }: stdenv.mkDerivation rec { - name = "warsow-${version}"; + pname = "warsow"; version = "2.1.2"; src = fetchurl { - url = "http://sebastian.network/warsow/${name}.tar.gz"; + url = "http://sebastian.network/warsow/${pname}-${version}.tar.gz"; sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index bf9e1cdd635..64231b9c39c 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { pname = "wesnoth"; version = "1.14.7"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7"; }; diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index daf56b27e5d..6f3bc2c1195 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "widelands-${version}"; + pname = "widelands"; version = "19"; meta = with stdenv.lib; { diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index 028b5f49b66..dd59ebbedd9 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }: stdenv.mkDerivation rec { - name = "xjump-${version}"; + pname = "xjump"; version = "2.9.3"; src = fetchFromGitHub { owner = "hugomg"; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index a0fc6d5ca71..d9bba3fdbdc 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -3,7 +3,7 @@ , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: stdenv.mkDerivation rec { - name = "xmoto-${version}"; + pname = "xmoto"; version = "0.5.11"; src = fetchurl { diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index cd927a820aa..aefc8ad9876 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.5.0"; - name = "bloodspilot-client-${version}"; + pname = "bloodspilot-client"; src = fetchurl { url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz"; diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix index 42bcb326316..2f37680bbaa 100644 --- a/pkgs/games/xpilot/bloodspilot-server.nix +++ b/pkgs/games/xpilot/bloodspilot-server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, expat }: stdenv.mkDerivation rec { - name = "bloodspilot-xpilot-fxi-server-${version}"; + pname = "bloodspilot-xpilot-fxi-server"; version = "1.4.6"; src = fetchurl { diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 2ae25e957bb..d0fe9f61896 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf , SDL_image, zlib, libXxf86misc }: stdenv.mkDerivation rec { - name = "xpilot-ng-${version}"; + pname = "xpilot-ng"; version = "4.7.3"; src = fetchurl { - url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/xpilot/xpilot_ng/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj"; }; buildInputs = [ diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 07ed50d4e7b..b3011fbce77 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.42"; - name = "xsnow-${version}"; + pname = "xsnow"; src = fetchurl { - url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; + url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index 0aa0c97f07d..62cdaccc297 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -2,7 +2,6 @@ , withNethackLevels ? true }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xsok"; version = "1.02"; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index cf08db68cf0..3f6062c4f68 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }: stdenv.mkDerivation rec { - name = "xsokoban-${version}"; + pname = "xsokoban"; version = "3.3c"; src = fetchurl { - url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz"; + url = "https://www.cs.cornell.edu/andru/release/${pname}-${version}.tar.gz"; sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9"; }; diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix index 9203389355c..8f5f832058c 100644 --- a/pkgs/games/xtris/default.nix +++ b/pkgs/games/xtris/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, xorg }: stdenv.mkDerivation rec { - name = "xtris-${version}"; + pname = "xtris"; version = "1.15"; src = fetchzip { diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index a5d9098242b..3d5160bb591 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -6,7 +6,7 @@ let in stdenv.mkDerivation rec { - name = "fmod-${version}"; + pname = "fmod"; version = "4.44.64"; shortVersion = builtins.replaceStrings [ "." ] [ "" ] version; diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index 3d5da239115..0722e4bbbf9 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "zangband"; version = "2.7.4b"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${pname}-${version}.tar.gz"; sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j"; }; diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index d2b94a14fe4..f6fde241129 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -3,7 +3,7 @@ , libsndfile, mpg123 }: stdenv.mkDerivation rec { - name = "zdoom-${version}"; + pname = "zdoom"; majorVersion = "2.8"; version = "${majorVersion}.1"; diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index fa2cafa298a..430d5269a68 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, unzip, zlib }: stdenv.mkDerivation rec { - name = "zdbsp-${version}"; + pname = "zdbsp"; version = "1.19"; src = fetchurl { diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 6292b8183b2..83bf552b8b7 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, coreutils }: stdenv.mkDerivation rec { - name = "brightnessctl-${version}"; + pname = "brightnessctl"; version = "0.4"; src = fetchFromGitHub { diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index f0be3cad723..5e7596032b3 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.6"; - name = "cups-pk-helper-${version}"; + pname = "cups-pk-helper"; src = fetchurl { url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 11873e6f2a0..011a7622060 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cups-${version}"; + pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ version = if stdenv.isDarwin then "2.2.6" else "2.2.11"; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 08cc222e4a5..948e5ed72ab 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib, cups }: stdenv.mkDerivation rec { - name = "brlaser-${version}"; + pname = "brlaser"; version = "4"; src = fetchFromGitHub { diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 2634b712871..abd50850b18 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -2,7 +2,7 @@ , withDebug ? false }: stdenv.mkDerivation rec { - name = "cnijfilter2-${version}"; + pname = "cnijfilter2"; version = "5.30"; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index 27b86ab8919..15e3a1d97a9 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -7,7 +7,7 @@ file included in the tarball */ stdenv.mkDerivation rec { - name = "cnijfilter-${version}"; + pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use versions in a non-standard way. the version indicates which diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index c8e5ddd09b1..ba8cffc0e65 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -12,7 +12,7 @@ let arch = else throw "Unsupported system ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { - name = "cnijfilter-${version}"; + pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use versions in a non-standard way. the version indicates which diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index 8abda27a5cf..c2b912007d8 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, cups, ... }: stdenv.mkDerivation rec { - name = "cups-dymo-${version}"; + pname = "cups-dymo"; version = "1.4.0.5"; # exposed version and 'real' version may differ diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index 83093da9c0a..a2fdd1abc19 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "cups-toshiba-estudio-${version}"; + pname = "cups-toshiba-estudio"; version = "7.89"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index ffcc46d66e3..23651a57df8 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -6,7 +6,7 @@ let else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { - name = "fxlinuxprint-${version}"; + pname = "fxlinuxprint"; version = "1.1.2-1"; src = fetchzip { diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix index b3fc87fbf1d..0dcd518de84 100644 --- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix @@ -14,7 +14,7 @@ let pythonEnv = python2.buildEnv.override { }; in stdenv.mkDerivation rec { - name = "cups-googlecloudprint-${version}"; + pname = "cups-googlecloudprint"; version = "20160502"; src = fetchFromGitHub { diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 55b0deea971..90f9a8e943a 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "hll2390dw-cups-${version}"; + pname = "hll2390dw-cups"; version = "4.0.0-1"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index 9b40e4ff50e..21a276f9d14 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - name = "cups-kyocera-${version}"; + pname = "cups-kyocera"; version = "1.1203"; dontPatchELF = true; diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix index bcd2914da0c..fa16a136f97 100644 --- a/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -15,7 +15,7 @@ let debRegion = if region == "EU" then "EU." else ""; in stdenv.mkDerivation rec { - name = "cups-kyodialog3-${version}"; + pname = "cups-kyodialog3"; version = "8.1601"; dontStrip = true; diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 72a40f41f88..c7484e6d30b 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: stdenv.mkDerivation rec { - name = "mfcj470dw-cupswrapper-${version}"; + pname = "mfcj470dw-cupswrapper"; version = "3.0.0-1"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index f31dd9061ec..befafd855bc 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: stdenv.mkDerivation rec { - name = "mfcj470dw-cupswrapper-${version}"; + pname = "mfcj470dw-cupswrapper"; version = "3.0.0-1"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4b31ccf3877..4ec9e3fc6c8 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}: stdenv.mkDerivation rec { - name = "mfcj6510dw-cupswrapper-${version}"; + pname = "mfcj6510dw-cupswrapper"; version = "3.0.0-1"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 9d9535ce37b..b12ef18e46c 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -20,7 +20,7 @@ # The user can run brprintconf_mfcj6510dw in the shell. stdenv.mkDerivation rec { - name = "mfcj6510dwlpr-${version}"; + pname = "mfcj6510dwlpr"; version = "3.0.0-1"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 8e31cd2956a..91110104bc9 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -1,11 +1,11 @@ { coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }: stdenv.mkDerivation rec { - name = "mfcl2700dnlpr-${version}"; + pname = "mfcl2700dnlpr"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102085/${pname}-${version}.i386.deb"; sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index 2099291d434..b58e7b4faa4 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }: stdenv.mkDerivation rec { - name = "mfcl2720dwcupswrapper-${version}"; + pname = "mfcl2720dwcupswrapper"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101802/${pname}-${version}.i386.deb"; sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 8dbc56fe846..b4b16563610 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -1,11 +1,11 @@ { pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { - name = "mfcl2720dwlpr-${version}"; + pname = "mfcl2720dwlpr"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101801/${pname}-${version}.i386.deb"; sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index 0da85498723..f2303a45a2f 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }: stdenv.mkDerivation rec { - name = "mfcl2740dwcupswrapper-${version}"; + pname = "mfcl2740dwcupswrapper"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101726/${pname}-${version}.i386.deb"; sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index 6d3cf18e529..c2209806724 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -1,11 +1,11 @@ { pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { - name = "mfcl2740dwlpr-${version}"; + pname = "mfcl2740dwlpr"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101727/${pname}-${version}.i386.deb"; sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf"; }; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 17040498acc..50f3b583e42 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -2,11 +2,11 @@ mfcl8690cdwlpr, perl, stdenv}: stdenv.mkDerivation rec { - name = "mfcl8690cdwcupswrapper-${version}"; + pname = "mfcl8690cdwcupswrapper"; version = "1.4.0-0"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb"; + url = "http://download.brother.com/welcome/dlf103250/${pname}-${version}.i386.deb"; sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2"; }; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index a521b3ea021..0e088401c0a 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -2,11 +2,11 @@ makeWrapper, perl, pkgs, stdenv, which }: stdenv.mkDerivation rec { - name = "mfcl8690cdwlpr-${version}"; + pname = "mfcl8690cdwlpr"; version = "1.3.0-0"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb"; + url = "http://download.brother.com/welcome/dlf103241/${pname}-${version}.i386.deb"; sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v"; }; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index b395d73a266..8c906db642e 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -7,7 +7,7 @@ let else "i386"; in stdenv.mkDerivation rec { - name = "samsung-unified-linux-driver-${version}"; + pname = "samsung-unified-linux-driver"; version = "1.00.36"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index b2c4bbb0f20..9135441a6e7 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -7,7 +7,7 @@ let else "i386"; in stdenv.mkDerivation rec { - name = "samsung-unified-linux-driver-${version}"; + pname = "samsung-unified-linux-driver"; version = "1.00.37"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index df0a270a5b2..5dc39793070 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -18,7 +18,7 @@ let cups' = stdenv.lib.getLib cups; in stdenv.mkDerivation rec { - name = "samsung-UnifiedLinuxDriver-${version}"; + pname = "samsung-UnifiedLinuxDriver"; version = "4.00.39"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 547e25b6514..f81fa27503f 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -20,7 +20,7 @@ let appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { - name = "samsung-UnifiedLinuxDriver-${version}"; + pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; src = fetchurl { diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix index 9321cf526be..b70b5daa766 100644 --- a/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "cups-zj-58"; version = "2018-02-22"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "klirichek"; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 2a0a4369860..927755fdb74 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -8,11 +8,11 @@ let binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; in stdenv.mkDerivation rec { - name = "cups-filters-${version}"; + pname = "cups-filters"; version = "1.25.0"; src = fetchurl { - url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; + url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1"; }; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index d865a8906cf..a232552712d 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -200,7 +200,7 @@ let fwdir = symlinkJoin { }; in let iscan-data = stdenv.mkDerivation rec { - name = "iscan-data-${version}"; + pname = "iscan-data"; version = "1.39.0-1"; src = fetchurl { @@ -216,7 +216,7 @@ let iscan-data = stdenv.mkDerivation rec { }; in stdenv.mkDerivation rec { - name = "iscan-${version}"; + pname = "iscan"; version = "2.30.3-1"; src = fetchurl { diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index ce95ca00e11..c65c13e886f 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cups }: stdenv.mkDerivation rec { - name = "epson-escpr-${version}"; + pname = "epson-escpr"; version = "1.6.16"; src = fetchurl { diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 9ce6f5d7b01..2110de6e4c1 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cups, busybox }: stdenv.mkDerivation rec { - name = "epson-inkjet-printer-escpr2-${version}"; + pname = "epson-inkjet-printer-escpr2"; version = "1.0.29"; src = fetchurl { - url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${name}-1lsb3.2.src.rpm"; + url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm"; sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5"; }; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { unpackPhase = '' rpm2cpio $src | cpio -idmv - tar xvf ${name}-1lsb3.2.tar.gz - cd ${name} + tar xvf ${pname}-${version}-1lsb3.2.tar.gz + cd ${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 31b13baf796..fb6b4956ef1 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { - name = "moltengamepad-git-${version}"; + pname = "moltengamepad-git"; version = "2016-05-04"; src = fetchFromGitHub { diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index d44c90d198a..366535b51c6 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - name = "steamcontroller-${version}"; + pname = "steamcontroller"; version = "2017-08-11"; src = fetchFromGitHub { diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix index 36f6ca5b8c0..829367aa329 100644 --- a/pkgs/misc/dumb/default.nix +++ b/pkgs/misc/dumb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, allegro, SDL2 }: stdenv.mkDerivation rec { - name = "dumb-${version}"; + pname = "dumb"; version = "2.0.3"; enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 5a37b1b32c5..2e6ccd0a491 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "atari++-${version}"; + pname = "atari++"; version = "1.81"; src = fetchurl { diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 4806c7f9e0f..228da687094 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "atari800-${version}"; + pname = "atari800"; version = "4.0.0"; src = fetchurl { - url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz"; sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88"; }; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 601503dc07e..a725d9c9b08 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "attract-mode-${version}"; + pname = "attract-mode"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index 666f953f6b5..88e8556ec6c 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -3,7 +3,7 @@ let vasm = stdenv.mkDerivation rec { - name = "vasm-${version}"; + pname = "vasm"; version = "1.8c"; src = fetchFromGitHub { owner = "mbitsnbites"; @@ -19,7 +19,7 @@ let }; in stdenv.mkDerivation rec { - name = "blastem-${version}"; + pname = "blastem"; version = "0.5.1"; src = fetchurl { url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz"; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 33c5d3cebf1..71beaf12548 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - name = "vhba-${version}"; + pname = "vhba"; version = "20190410"; src = fetchurl { diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 3e8f78c4411..efa1a881f4a 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: stdenv.mkDerivation rec { - name = "citra-${version}"; + pname = "citra"; version = "2019-05-25"; # Submodules diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 70e7351e295..bdec34e396f 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXt, libXext, libXaw }: stdenv.mkDerivation rec { - name = "darcnes-${version}"; + pname = "darcnes"; version = "9b0401"; src = fetchurl { diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index d177012546e..6bb5be3c713 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "desmume-${version}"; + pname = "desmume"; version = "0.9.11"; src = fetchurl { - url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/desmume/desmume/${version}/${pname}-${version}.tar.gz"; sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"; }; diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 392f5618b6e..fe8e82d98be 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -5,7 +5,7 @@ , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-${version}"; + pname = "dolphin-emu"; version = "5.0"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 4f48f1248f4..fe16598fa9c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -19,7 +19,7 @@ let startupNotify = "false"; }; in stdenv.mkDerivation rec { - name = "dolphin-emu-${version}"; + pname = "dolphin-emu"; version = "5.0-10751"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 9dec1ecacae..7312ad41ada 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -2,7 +2,7 @@ , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: stdenv.mkDerivation rec { - name = "emulationstation-${version}"; + pname = "emulationstation"; version = "2.0.1a"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index edf4fe017a2..6950e12e889 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "epsxe-${version}"; + pname = "epsxe"; version = "2.0.5"; src = let diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 882bf13f4ea..079af05e794 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: stdenv.mkDerivation rec { - name = "firebird-emu-${version}"; + pname = "firebird-emu"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 9856c93eda2..7e1272faf11 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fs-uae-${version}"; + pname = "fs-uae"; version = "2.8.4"; src = fetchurl { - url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; + url = "https://fs-uae.net/fs-uae/stable/${version}/${pname}-${version}.tar.gz"; sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj"; }; diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index ea2d6bbfecc..04c5b441f01 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gxemul-${version}"; + pname = "gxemul"; version = "0.6.0.1"; src = fetchurl { - url = "http://gxemul.sourceforge.net/src/${name}.tar.gz"; + url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz"; sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407"; }; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin; - mkdir -p $out/share/${name}; + mkdir -p $out/share/${pname}-${version}; cp gxemul $out/bin; - cp -r doc $out/share/${name}; - cp -r demos $out/share/${name}; + cp -r doc $out/share/${pname}-${version}; + cp -r demos $out/share/${pname}-${version}; cp -r ./man $out/; ''; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 1349fa0f0b6..ad96ca36bc1 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "higan-${version}"; + pname = "higan"; version = "106"; sourceName = "higan_v${version}-source"; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index 32d3013d842..c2494d70270 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -4,7 +4,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation rec { - name = "kega-fusion-${version}"; + pname = "kega-fusion"; version = "3.63x"; src = fetchurl { diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index 32201c48ee9..edb70ba7264 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdsk-${version}"; + pname = "libdsk"; version = "1.5.10"; src = fetchurl { - url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; + url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; }; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 9101c1587c2..74c456cfb10 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -2,11 +2,11 @@ , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { - name = "mednafen-${version}"; + pname = "mednafen"; version = "0.9.48"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; + url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; }; diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 75eeeea4c00..146d5320261 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mednafen-server-${version}"; + pname = "mednafen-server"; version = "0.5.2"; src = fetchurl { diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index c62d9c90ca7..40390068e7b 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "mednaffe-${version}"; + pname = "mednaffe"; version = "0.8.6"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 039bc57e603..6dc7bc30f32 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -14,7 +14,7 @@ let startupNotify = "false"; }; in stdenv.mkDerivation rec { - name = "mgba-${version}"; + pname = "mgba"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 9ff99110ecc..460dd7ad5fb 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: stdenv.mkDerivation rec { - name = "mupen64plus-${version}"; + pname = "mupen64plus"; version = "2.5"; src = fetchurl { diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 5bc7bcec9d4..6bef474d7ea 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.47"; - name = "nestopia-${version}"; + pname = "nestopia"; src = fetchFromGitHub { owner = "rdanbrook"; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index d2539cbc817..8a95d6f2883 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { - name = "openmsx-${version}"; + pname = "openmsx"; version = "git-2017-11-02"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 851c05c0578..1924452e2ab 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -3,7 +3,7 @@ , wxGTK30, zlib }: stdenv.mkDerivation rec { - name = "pcsx2-${version}"; + pname = "pcsx2"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 5af3042bde4..8f1e5e02c18 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -3,7 +3,7 @@ , fetchpatch }: stdenv.mkDerivation rec { - name = "pcsxr-${version}"; + pname = "pcsxr"; version = "1.9.94"; # codeplex does not support direct downloading @@ -67,14 +67,14 @@ stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" + mkdir -p "$out/share/doc/${pname}-${version}" cp README \ AUTHORS \ doc/keys.txt \ doc/tweaks.txt \ ChangeLog.df \ ChangeLog \ - "$out/share/doc/${name}" + "$out/share/doc/${pname}-${version}" ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 159eefad666..619938ba5c6 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "ppsspp-${version}"; + pname = "ppsspp"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 65cc0bd9c05..ca8d87b3800 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { - name = "qmc2-${version}"; + pname = "qmc2"; version = "0.195"; src = fetchurl { - url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz"; sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns"; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index ee7ff114ec8..f26769cd28d 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -26,7 +26,7 @@ let }; in stdenv.mkDerivation rec { - name = "retroarch-bare-${version}"; + pname = "retroarch-bare"; version = "1.7.5"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 1072a66e0ea..8bdc79f2d8e 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { - name = "kodi-retroarch-advanced-launchers-${version}"; + pname = "kodi-retroarch-advanced-launchers"; version = "0.2"; dontBuild = true; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 2537669bbc4..25af4f8d50a 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "retrofe-${version}"; + pname = "retrofe"; version = "0.6.169"; src = fetchhg { diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 4c44377c11e..ae1b1bf6bda 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -10,7 +10,7 @@ let gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in stdenv.mkDerivation rec { - name = "rpcs3-${version}"; + pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; src = fetchgit { diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index a58f95875cc..0ae92121cab 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -2,7 +2,7 @@ , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: stdenv.mkDerivation rec { - name = "snes9x-gtk-${version}"; + pname = "snes9x-gtk"; version = "1.57"; src = fetchFromGitHub { diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 41ba5a3b2e6..c2d98cda060 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "stella-${version}"; + pname = "stella"; version = "4.6.1"; src = fetchurl { - url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz"; + url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz"; sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; }; diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index c8712d20859..4df9086a317 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "visualboyadvance-m-${version}"; + pname = "visualboyadvance-m"; version = "2.1.3"; src = fetchFromGitHub { owner = "visualboyadvance-m"; diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index a2d462fd990..ed8652d08f1 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -2,11 +2,11 @@ , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { - name = "yabause-${version}"; + pname = "yabause"; version = "0.9.15"; src = fetchurl { - url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; + url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23"; }; diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 991be274ecc..0f2abedd3b5 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -65,7 +65,7 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled"; stdenv.mkDerivation rec { - name = "gnash-${version}"; + pname = "gnash"; version = "0.8.11-2019-30-01"; src = fetchgit { diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 8c9838ccec5..cb487677881 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -14,7 +14,7 @@ let optCelt = shouldUsePkg celt; in stdenv.mkDerivation rec { - name = "jack1-${version}"; + pname = "jack1"; version = "0.125.0"; src = fetchurl { diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 7f355bc8156..0c3370814bc 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libcardiacarrest-${version}"; + pname = "libcardiacarrest"; version = "12.2.8"; # . src = fetchFromGitHub { diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix index d977d822351..06a6a7e6550 100644 --- a/pkgs/misc/mnemonicode/default.nix +++ b/pkgs/misc/mnemonicode/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mnemonicode-${version}"; + pname = "mnemonicode"; version = "2015-11-30"; src = fetchFromGitHub { owner = "singpolyma"; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index fe9e8d3f4b0..d701bd654d2 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ version="1.28"; - name = "mxt-app-${version}"; + pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 25441a30d86..eefd83c7260 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { version = "0.2.0"; - name = "sailsd-${version}"; + pname = "sailsd"; src = fetchFromGitHub { owner = "sails-simulator"; repo = "sailsd"; diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index cd5db3067f4..d25f253bd00 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "betterlockscreen-${version}"; + pname = "betterlockscreen"; version = "3.0.1"; src = fetchFromGitHub { diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 6b28c39f767..b1c2ec5c3bd 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -3,7 +3,6 @@ , glee }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "electricsheep"; version = "2.7b33-2017-10-20"; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index b3c48cb4024..ae61291b087 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -1,7 +1,7 @@ { stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }: stdenv.mkDerivation rec { - name = "i3lock-pixeled-${version}"; + pname = "i3lock-pixeled"; version = "1.2.1"; src = fetchFromGitLab { diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index 9855e868886..5cfddaaea57 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "11-dev"; - name = "physlock-${version}"; + pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; repo = "physlock"; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 404346bba63..fb80f9922ce 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgs }: stdenv.mkDerivation rec { - name = "pipes-${version}"; + pname = "pipes"; version = "1.3.0"; src = fetchurl { diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index e8b9346a872..7f6d99297ab 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.1"; - name = "rss-glx-${version}"; + pname = "rss-glx"; src = fetchurl { url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index b6f82cd45d7..4d4e1c1fc41 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xautolock-${version}"; + pname = "xautolock"; version = "2.2-7-ga23dd5c"; # This repository contains xautolock-2.2 plus various useful patches that diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index d68ac0f9fc1..1dcf16585f0 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "7.0.2"; - name = "seafile-shared-${version}"; + pname = "seafile-shared"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 2556e7d9d83..1993b4bcce4 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib }: stdenv.mkDerivation rec { - name = "sndio-${version}"; + pname = "sndio"; version = "1.6.0"; enableParallelBuilding = true; buildInputs = [ alsaLib ]; diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 6db3b44b686..f61c9f5e1b9 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "sound-of-sorting-${version}"; + pname = "sound-of-sorting"; version = "unstable-2015-07-21"; src = fetchgit { diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index ec8ef076c2f..b5dc7a13f18 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "stabber-unstable-${version}"; + pname = "stabber-unstable"; version = "2016-11-09"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/misc/themes/adapta-kde/default.nix index 875973c9d3f..a7624d2889b 100644 --- a/pkgs/misc/themes/adapta-kde/default.nix +++ b/pkgs/misc/themes/adapta-kde/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "adapta-kde-theme-${version}"; + pname = "adapta-kde-theme"; version = "20180512"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 6d2a16cbfd2..5fd8f1a594e 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { - name = "adapta-gtk-theme-${version}"; + pname = "adapta-gtk-theme"; version = "3.95.0.11"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix index 14fe0f21d80..870b348cc32 100644 --- a/pkgs/misc/themes/albatross/default.nix +++ b/pkgs/misc/themes/albatross/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "Albatross-${version}"; + pname = "Albatross"; version = "1.7.4"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix index 42ff954a46b..054cd1aeffc 100644 --- a/pkgs/misc/themes/arc-kde/default.nix +++ b/pkgs/misc/themes/arc-kde/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "arc-kde-theme-${version}"; + pname = "arc-kde-theme"; version = "2017-11-09"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 4b7702ed635..3a0636a658a 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "Blackbird"; version = "2017-12-13"; - name = "${pname}-${version}"; src = fetchFromGitHub { repo = "${pname}"; diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix index daeb7d7ad36..04929a4cb4d 100644 --- a/pkgs/misc/themes/clearlooks-phenix/default.nix +++ b/pkgs/misc/themes/clearlooks-phenix/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "7.0.1"; - name = "clearlooks-phenix-${version}"; + pname = "clearlooks-phenix"; src = fetchurl { url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz"; diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix index f0bb2bf729d..9cdefb9bb54 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "e17gtk-${version}"; + pname = "e17gtk"; version = "3.22.2"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix index bc4b57e8b58..1a4241be865 100644 --- a/pkgs/misc/themes/equilux-theme/default.nix +++ b/pkgs/misc/themes/equilux-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { - name = "equilux-theme-${version}"; + pname = "equilux-theme"; version = "20181029"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix index e6096ef829d..ebeb7f2d866 100644 --- a/pkgs/misc/themes/jade1/default.nix +++ b/pkgs/misc/themes/jade1/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "theme-jade1-${version}"; + pname = "theme-jade1"; version = "3.3"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix index 97a018f929e..4fd06fae61b 100644 --- a/pkgs/misc/themes/numix-solarized/default.nix +++ b/pkgs/misc/themes/numix-solarized/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20170810"; - name = "numix-solarized-gtk-theme-${version}"; + pname = "numix-solarized-gtk-theme"; src = fetchFromGitHub { owner = "Ferdi265"; diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix index 9001ad9e5a3..dfa788f6ea7 100644 --- a/pkgs/misc/themes/numix-sx/default.nix +++ b/pkgs/misc/themes/numix-sx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017-04-24"; - name = "numix-sx-gtk-theme-${version}"; + pname = "numix-sx-gtk-theme"; src = fetchurl { url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz"; diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index eb4b8c76301..e01f8174e9e 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.6.7"; - name = "numix-gtk-theme-${version}"; + pname = "numix-gtk-theme"; src = fetchFromGitHub { repo = "numix-gtk-theme"; diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix index 8a8e88ff6f9..a7f640f9c56 100644 --- a/pkgs/misc/themes/obsidian2/default.nix +++ b/pkgs/misc/themes/obsidian2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "theme-obsidian2-${version}"; + pname = "theme-obsidian2"; version = "2.8"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix index 5e4f8ffa3d4..64ead2f75f4 100644 --- a/pkgs/misc/themes/onestepback/default.nix +++ b/pkgs/misc/themes/onestepback/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "onestepback-${version}"; + pname = "onestepback"; version = "0.991"; srcs = [ diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix index 8bcb48812a3..2f7a53dc2d4 100644 --- a/pkgs/misc/themes/paper/default.nix +++ b/pkgs/misc/themes/paper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2016-08-16"; - name = "paper-gtk-theme-${version}"; + pname = "paper-gtk-theme"; src = fetchFromGitHub { owner = "snwh"; diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix index 55cd6e1dac0..3d9403b84f4 100644 --- a/pkgs/misc/themes/solarc/default.nix +++ b/pkgs/misc/themes/solarc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "solarc-gtk-theme-${version}"; + pname = "solarc-gtk-theme"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 06d42da7936..81c681f5371 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "theme-vertex"; version = "20170128"; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e10fa1b06b7..a0b6be3a418 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "urbit-${version}"; + pname = "urbit"; version = "0.7.3"; src = fetchFromGitHub { diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index c8cda8482bf..a841acdca94 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXext, libXt, xorgproto }: stdenv.mkDerivation rec { - name = "xosd-${version}"; + pname = "xosd"; version = "2.2.14"; src = fetchurl { - url = "mirror://sourceforge/libxosd/${name}.tar.gz"; + url = "mirror://sourceforge/libxosd/${pname}-${version}.tar.gz"; sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg"; }; diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 4d33fc0f3f8..ba5002c8c48 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -4,7 +4,7 @@ let # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { version = "10.12"; - name = "MacOS_SDK-${version}"; + pname = "MacOS_SDK"; # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by: # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix index 28dcbdcb4a2..6a0c819a0a3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "551.1"; - name = "objc4-${version}"; + pname = "objc4"; src = fetchapplesource { inherit version; diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix index 9dd1205c114..12b35812651 100644 --- a/pkgs/os-specific/darwin/chunkwm/default.nix +++ b/pkgs/os-specific/darwin/chunkwm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { - name = "chunkwm-${version}"; + pname = "chunkwm"; version = "0.4.9"; src = fetchzip { url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz"; diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index a9051fd1279..5c63b8e0dfb 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "duti"; - name = "${pname}-${version}"; version = "1.5.4pre"; src = fetchFromGitHub { owner = "moretension"; diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 190c0ae2213..e374bd2f11c 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "goku-${version}"; + pname = "goku"; version = "0.1.11"; src = fetchurl { diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index 3ff03aace4e..be855498307 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "iproute2mac-${version}"; + pname = "iproute2mac"; src = fetchFromGitHub { owner = "brona"; diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index fb7bb12a493..90f92b0b644 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }: stdenv.mkDerivation rec { - name = "khd-${version}"; + pname = "khd"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index 3076392ecb2..c3fa76f5096 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "kwm-${version}"; + pname = "kwm"; version = "4.0.5"; src = fetchzip { diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index 0b59ecb2299..cb81c2e8149 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "lsusb-${version}"; + pname = "lsusb"; src = fetchFromGitHub { owner = "jlhonora"; diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index 75f1113e9f0..12bf02bf89f 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "m-cli-${version}"; + pname = "m-cli"; version = "0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 960e0677da1..23b5ded1fe6 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, icu, libuuid, tzdata }: stdenv.mkDerivation rec { - name = "opencflite-${version}"; + pname = "opencflite"; version = "476.19.0"; src = fetchurl { - url = "mirror://sourceforge/opencflite/${name}.tar.gz"; + url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz"; sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; }; diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix index 404e752c279..77e63c779b9 100644 --- a/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/pkgs/os-specific/darwin/osxfuse/default.nix @@ -17,7 +17,6 @@ let in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "osxfuse"; inherit version; diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index aa7bfb5c3be..19ab34145e8 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation rec { - name = "qes-${version}"; + pname = "qes"; version = "0.0.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 631c59523e2..9f5f8aa4422 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "reattach-to-user-namespace-${version}"; + pname = "reattach-to-user-namespace"; version = "2.7"; src = fetchurl { diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index 713847313c2..ba5d3e9255b 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation rec { - name = "skhd-${version}"; + pname = "skhd"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index b18c603a911..9efa230d3b7 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "smimesign-${version}"; + pname = "smimesign"; version = "v0.0.13"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index fcbcfe00a3e..50c6d4fd2f4 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "trash-${version}"; + pname = "trash"; src = fetchFromGitHub { owner = "ali-rantakari"; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 37de98780b6..cc7317f5520 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "acpi-${version}"; + pname = "acpi"; version = "1.7"; src = fetchurl { - url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz"; sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; }; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 14b10e6752b..743e8f3576b 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -3,11 +3,11 @@ # some use gtk2, some gtk3 (and some even fltk13). stdenv.mkDerivation rec { - name = "alsa-tools-${version}"; + pname = "alsa-tools"; version = "1.1.7"; src = fetchurl { - url = "mirror://alsa/tools/${name}.tar.bz2"; + url = "mirror://alsa/tools/${pname}-${version}.tar.bz2"; sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; }; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 09c430bcd53..6f23d190318 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}: stdenv.mkDerivation rec { - name = "alsa-utils-${version}"; + pname = "alsa-utils"; version = "1.1.9"; src = fetchurl { - url = "mirror://alsa/utils/${name}.tar.bz2"; + url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"; }; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b03636d6f7f..aed0ed374a7 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -5,7 +5,7 @@ # services.udev.packages = [ pkgs.android-udev-rules ]; stdenv.mkDerivation rec { - name = "android-udev-rules-${version}"; + pname = "android-udev-rules"; version = "20190315"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 5d002bf72ea..5144add3a37 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; - name = "atop-${version}"; + pname = "atop"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index a2ebc0cdc53..7f5cd206f32 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "bpftrace-${version}"; + pname = "bpftrace"; version = "0.9.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index d77539fb89e..44c2cfff5a2 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cachefilesd-${version}"; + pname = "cachefilesd"; version = "0.10.10"; src = fetchurl { - url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/fscache/${pname}-${version}.tar.bz2"; sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd"; }; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 0c32c3f5e62..0149398bfa3 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -1,7 +1,7 @@ { stdenv, kernel, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "can-isotp-${version}"; + pname = "can-isotp"; version = "20180629"; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 616c99c8f46..7913c703b5b 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "can-utils-${version}"; + pname = "can-utils"; # There are no releases (source archives or git tags), so use the date of the # latest commit in git master as version number. version = "20170830"; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 674b695b1ee..b724112af88 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, flex, libsepol }: stdenv.mkDerivation rec { - name = "checkpolicy-${version}"; + pname = "checkpolicy"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index ba66bd309bc..ea6a6e77572 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -2,11 +2,11 @@ , kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { - name = "cifs-utils-${version}"; + pname = "cifs-utils"; version = "6.9"; src = fetchurl { - url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; + url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; }; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 1af37c2168d..ad30f52d145 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,7 +67,7 @@ assert journalSupport -> systemd != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "conky-${version}"; + pname = "conky"; version = "1.11.3"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 755e88b46cb..20c441ffae2 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -3,11 +3,11 @@ , libnetfilter_cthelper, systemd }: stdenv.mkDerivation rec { - name = "conntrack-tools-${version}"; + pname = "conntrack-tools"; version = "1.4.5"; src = fetchurl { - url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; }; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index d813376da8e..8ea3e3445cc 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "linuxconsoletools-${version}"; + pname = "linuxconsoletools"; version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2"; + url = "mirror://sourceforge/linuxconsole/${pname}-${version}.tar.bz2"; sha256 = "0d2r3j916fl2y7pk1y82b9fvbr10dgs1gw7rqwzfpispdidb1mp9"; }; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 940913d6a6c..84c113c648c 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }: stdenv.mkDerivation rec { - name = "crda-${version}"; + pname = "crda"; version = "3.18"; src = fetchurl { diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 0821fbdc15c..354eea40b24 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -3,11 +3,11 @@ , which, python, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "criu-${version}"; + pname = "criu"; version = "3.12"; src = fetchurl { - url = "https://download.openvz.org/criu/${name}.tar.bz2"; + url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf"; }; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 82b0bb2f356..5f5005d8b97 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -2,7 +2,7 @@ , dbus, linuxHeaders, systemd }: stdenv.mkDerivation rec { - name = "dbus-broker-${version}"; + pname = "dbus-broker"; version = "21"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index e8c1e9bfe5e..5896262ac21 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation rec { - name = "directvnc-${version}"; + pname = "directvnc"; version = "0.7.7.2015-04-16"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 2ea939ccdb0..7ce5535313c 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -10,7 +10,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ]; in stdenv.mkDerivation rec { - name = "displaylink-${version}"; + pname = "displaylink"; version = "4.4.24"; src = requireFile rec { diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 534e5735447..1d67b16a492 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bash, perl, python }: stdenv.mkDerivation rec { - name = "dmtcp-${version}"; + pname = "dmtcp"; version = "2.5.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 936dbf719a8..f5b7e44a3fb 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "dropwatch"; version = "1.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "nhorman"; diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index 9d92575b668..23bd39ff388 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ebtables-${version}"; + pname = "ebtables"; version = "2.0.10-4"; src = fetchurl { diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 0e8377141ed..55f42f3e3ff 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, ncurses }: stdenv.mkDerivation rec { - name = "eventstat-${version}"; + pname = "eventstat"; version = "0.04.06"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 28a92d31eaa..6aaaaec1b13 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "extrace-${version}"; + pname = "extrace"; version = "0.7"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 94ea85f433d..b99f719f836 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3, which }: stdenv.mkDerivation rec { - name = "fatrace-${version}"; + pname = "fatrace"; version = "0.13"; src = fetchurl { - url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx"; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 2637beb517a..959c0c74618 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, b43FirmwareCutter }: stdenv.mkDerivation rec { - name = "b43-firmware-${version}"; + pname = "b43-firmware"; version = "6.30.163.46"; src = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index a57a6f1d70f..4d5271a9ddf 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -4,7 +4,7 @@ # this packages as they expect the firmware to be named "BCM.hcd" # see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865 stdenv.mkDerivation rec { - name = "broadcom-bt-firmware-${version}"; + pname = "broadcom-bt-firmware"; version = "12.0.1.1012"; src = fetchurl { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cabextract bt-fw-converter ]; unpackCmd = '' - mkdir -p ${name} - cabextract $src --directory ${name} + mkdir -p ${pname}-${version} + cabextract $src --directory ${pname}-${version} ''; installPhase = '' diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index 8927e1a28e7..9a99881be46 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: stdenv.mkDerivation rec { - name = "bt-fw-converter-${version}"; + pname = "bt-fw-converter"; version = "2017-02-19"; rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl perlPackages.RegexpGrammars bluez ]; unpackCmd = '' - mkdir -p ${name} - cp $src ${name}/bt-fw-converter.pl + mkdir -p ${pname}-${version} + cp $src ${pname}-${version}/bt-fw-converter.pl ''; installPhase = '' diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index c251e3963e7..380444f0269 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "firmware-linux-nonfree-${version}"; + pname = "firmware-linux-nonfree"; version = "2019-07-17"; src = fetchgit { diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index b60ce6f1b4a..421a3300f7b 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openelec-dvb-firmware-${version}"; + pname = "openelec-dvb-firmware"; version = "0.0.51"; src = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index e64c4c09ebd..26ed2020635 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "raspberrypi-wireless-firmware-${version}"; + pname = "raspberrypi-wireless-firmware"; version = "2018-08-20"; srcs = [ diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 4685f675717..321ce8ffc06 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "raspberrypi-tools-${version}"; + pname = "raspberrypi-tools"; version = "2018-10-03"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 0a6364f07df..0abd458aa8f 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "flashbench-${version}"; + pname = "flashbench"; version = "2012-06-06"; src = fetchgit { diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 5b398bcec9a..4ebb9d6e950 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "fnotifystat-${version}"; + pname = "fnotifystat"; version = "0.02.02"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 8432f72e0c9..adcab03ac13 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "forkstat-${version}"; + pname = "forkstat"; version = "0.02.10"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index a091b2f17c5..09774016ef2 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (kernel) version src; - name = "freefall-${version}"; + pname = "freefall"; postPatch = '' cd tools/laptop/freefall diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index da787d84d79..35e1972b574 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -3,7 +3,7 @@ # Don't use this for anything important yet! buildGoPackage rec { - name = "fscrypt-${version}"; + pname = "fscrypt"; version = "0.2.4"; goPackagePath = "github.com/google/fscrypt"; diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix index 8622dc001a8..ecab0350d78 100644 --- a/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/pkgs/os-specific/linux/fscryptctl/default.nix @@ -3,7 +3,7 @@ # Don't use this for anything important yet! stdenv.mkDerivation rec { - name = "fscryptctl-unstable-${version}"; + pname = "fscryptctl-unstable"; version = "2017-10-23"; goPackagePath = "github.com/google/fscrypt"; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 915431c0cb1..4d283d5dc0c 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ftop-${version}"; + pname = "ftop"; version = "1.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${pname}-${version}.tar.bz2"; sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82"; }; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 4531de86b1b..07252b8bc31 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -2,7 +2,7 @@ , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { - name = "fwts-${version}"; + pname = "fwts"; version = "19.07.00"; src = fetchzip { diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix index 9fc052c5ac1..56fa4f1d7d6 100644 --- a/pkgs/os-specific/linux/gfxtablet/default.nix +++ b/pkgs/os-specific/linux/gfxtablet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4"; - name = "gfxtablet-uinput-driver-${version}"; + pname = "gfxtablet-uinput-driver"; buildInputs = [ linuxHeaders diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index fc308285dd6..03018c98818 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }: stdenv.mkDerivation rec { - name = "google-authenticator-libpam-${version}"; + pname = "google-authenticator-libpam"; version = "1.06"; src = fetchurl { diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix index d56253c6ced..0325461763a 100644 --- a/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gpu-switch-unstable-${version}"; + pname = "gpu-switch-unstable"; version = "2017-04-28"; src = fetchFromGitHub { owner = "0xbb"; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 7f64ed22771..bea70da995b 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gradm-${version}"; + pname = "gradm"; version = "3.1-201608131257"; src = fetchurl { - url = "http://grsecurity.net/stable/${name}.tar.gz"; + url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz"; sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb"; }; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index acafa0376f5..8e6db2a5774 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -6,7 +6,7 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "2.0.6"; - name = "guvcview-${version}"; + pname = "guvcview"; src = fetchurl { url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 7629a20473b..e90470cd589 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { - name = "hostapd-${version}"; + pname = "hostapd"; version = "2.8"; src = fetchurl { - url = "https://w1.fi/releases/${name}.tar.gz"; + url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj"; }; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index dfca87e2716..38335682ddb 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hwdata-${version}"; + pname = "hwdata"; version = "0.316"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index f89747dc200..36ca1eb16b4 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -2,7 +2,7 @@ let daemons = stdenv.mkDerivation rec { - name = "hyperv-daemons-bin-${version}"; + pname = "hyperv-daemons-bin"; inherit (kernel) src version; nativeBuildInputs = [ makeWrapper ]; @@ -55,7 +55,7 @@ let ''; in stdenv.mkDerivation rec { - name = "hyperv-daemons-${version}"; + pname = "hyperv-daemons"; inherit (kernel) version; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 5b061183356..1b87619faa3 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, read-edid }: stdenv.mkDerivation rec { - name = "i2c-tools-${version}"; + pname = "i2c-tools"; version = "4.1"; src = fetchurl { - url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz"; + url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz"; sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp"; }; diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index ac5f9fc5ba3..2f792cb7ea7 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -2,7 +2,7 @@ , withGui ? false, qtbase }: stdenv.mkDerivation rec { - name = "i7z-${version}"; + pname = "i7z"; version = "0.27.3"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix index b9390d1d589..1b22c1eafd3 100644 --- a/pkgs/os-specific/linux/ifenslave/default.nix +++ b/pkgs/os-specific/linux/ifenslave/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ifenslave-${version}"; + pname = "ifenslave"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 6de3b19afd7..69ec6560d83 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "ima-evm-utils-${version}"; + pname = "ima-evm-utils"; version = "1.1"; src = fetchgit { diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index cd0fc01384b..c6248ee9083 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, linuxHeaders }: stdenv.mkDerivation rec { - name = "input-utils-${version}"; + pname = "input-utils"; version = "1.3"; src = fetchurl { diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 38069981723..1f67208db8b 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: stdenv.mkDerivation rec { - name = "intel-ocl-${version}"; + pname = "intel-ocl"; version = "5.0-63503"; src = fetchzip { diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index a9be26a2026..5a0555f6680 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libnetfilter_conntrack, ncurses }: stdenv.mkDerivation rec { - name = "iptstate-${version}"; + pname = "iptstate"; version = "2.2.6"; src = fetchurl { - url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068"; }; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index 67a123a3764..f5d80dc5258 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: stdenv.mkDerivation rec { - name = "ipvsadm-${version}"; + pname = "ipvsadm"; version = "1.30"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/kernel/ipvsadm/${pname}-${version}.tar.xz"; sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm"; }; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index e606e3db6ee..8dc9e2694d4 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { - name = "irqbalance-${version}"; + pname = "irqbalance"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index a37e65f8cb5..3386a7f9206 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "kbd-${version}"; + pname = "kbd"; version = "2.0.4"; src = fetchurl { - url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz"; }; diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix index 32c9f690680..e6e89811894 100644 --- a/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/pkgs/os-specific/linux/kbd/keymaps.nix @@ -2,7 +2,7 @@ { dvp = stdenv.mkDerivation rec { - name = "dvp-${version}"; + pname = "dvp"; version = "1.2.1"; src = fetchurl { @@ -19,7 +19,7 @@ }; neo = stdenv.mkDerivation rec { - name = "neo-${version}"; + pname = "neo"; version = "2476"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 44a63c9f1ec..6df3e4fffe7 100644 --- a/pkgs/os-specific/linux/kbdlight/default.nix +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "kbdlight-${version}"; + pname = "kbdlight"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 8adb862a265..326afdfff46 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "kexec-tools-${version}"; + pname = "kexec-tools"; version = "2.0.19"; src = fetchurl { urls = [ - "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" - "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" + "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz" + "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz" ]; sha256 = "03jyi4c47ywclycf3a253xpqs7p6ys8inz9q66b8m3xc6nrh307d"; }; diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 1d9497a7edd..7d6ee61030c 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "keyutils-${version}"; + pname = "keyutils"; version = "1.6"; src = fetchurl { - url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/keyutils/${pname}-${version}.tar.bz2"; sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk"; }; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 8cae61d56a9..8e224c8f33b 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "klibc-${version}"; + pname = "klibc"; version = "2.0.4"; src = fetchurl { diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 949c8135df7..fef7a3236b3 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.110"; - name = "libaio-${version}"; + pname = "libaio"; src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz"; + url = "https://fedorahosted.org/releases/l/i/libaio/${pname}-${version}.tar.gz"; sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0"; }; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index a23c0cb0926..1294bd3d268 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -5,7 +5,7 @@ with builtins; stdenv.mkDerivation rec { - name = "libbpf-${version}"; + pname = "libbpf"; version = "0.0.3pre114_${substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 981e928ba65..d0fc97d0dd3 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -3,13 +3,13 @@ assert python2 != null || python3 != null -> swig != null; stdenv.mkDerivation rec { - name = "libcap-ng-${version}"; + pname = "libcap-ng"; # When updating make sure to test that the version with # all of the python bindings still works version = "0.7.9"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.gz"; + url = "${meta.homepage}/${pname}-${version}.tar.gz"; sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa"; }; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 87f354aa75d..9c730bb9659 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, attr, perl, pam }: stdenv.mkDerivation rec { - name = "libcap-${version}"; + pname = "libcap"; version = "2.27"; src = fetchurl { - url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz"; + url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; }; @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { postInstall = '' rm "$lib"/lib/*.a - mkdir -p "$doc/share/doc/${name}" - cp License "$doc/share/doc/${name}/" + mkdir -p "$doc/share/doc/${pname}-${version}" + cp License "$doc/share/doc/${pname}-${version}/" '' + stdenv.lib.optionalString (pam != null) '' mkdir -p "$pam/lib/security" mv "$lib"/lib/security "$pam/lib" diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 1e920247a75..026b43fc615 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { - name = "libcgroup-${version}"; + pname = "libcgroup"; version = "0.41"; src = fetchurl { - url = "mirror://sourceforge/libcg/${name}.tar.bz2"; + url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2"; sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4"; }; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 34d10d3aa5f..0789d53b434 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -2,7 +2,7 @@ , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}: stdenv.mkDerivation rec { - name = "libnl-${version}"; + pname = "libnl"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 5dab4b34f46..a09bb2a6ceb 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -2,7 +2,7 @@ , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }: stdenv.mkDerivation rec { - name = "libratbag-${version}"; + pname = "libratbag"; version = "0.9.905"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 51e1a322094..028c008eccf 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -8,7 +8,7 @@ assert enablePython -> swig != null && python != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "libselinux-${version}"; + pname = "libselinux"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 59f5f11d076..4fe323ee23d 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libsemanage-${version}"; + pname = "libsemanage"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f16c241a0a1..e96ea01cce4 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex }: stdenv.mkDerivation rec { - name = "libsepol-${version}"; + pname = "libsepol"; version = "2.7"; se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 874faf7799b..d0ae1852853 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "libsmbios-${version}"; + pname = "libsmbios"; version = "2.4.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix index c0c6ad54579..ecdc658f2f1 100644 --- a/pkgs/os-specific/linux/libudev0-shim/default.nix +++ b/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { - name = "libudev0-shim-${version}"; + pname = "libudev0-shim"; version = "1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix index 879e85a0c94..5cccc82b843 100644 --- a/pkgs/os-specific/linux/libwebcam/default.nix +++ b/pkgs/os-specific/linux/libwebcam/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { pname = "libwebcam"; version = "0.2.5"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index 1856c8861cc..6a0dd34d021 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2"; - name = "light-${version}"; + pname = "light"; src = fetchFromGitHub { owner = "haikarainen"; repo = "light"; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 0536ba064a3..b9e58cb5a4c 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -5,7 +5,7 @@ assert sensord -> rrdtool != null; stdenv.mkDerivation rec { - name = "lm-sensors-${version}"; + pname = "lm-sensors"; version = "3.5.0"; src = fetchzip { diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 3c7ceb1270c..74abd12868d 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lockdep-${version}"; + pname = "lockdep"; version = "4.1.2"; fullver = "4.1.2"; diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix index c215d940194..9aa1698b766 100644 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -4,7 +4,7 @@ # up-to-date so we simply use that instead of having to maintain our own rules stdenv.mkDerivation rec { - name = "logitech-udev-rules-${version}"; + pname = "logitech-udev-rules"; inherit (solaar) version; buildCommand = '' diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index a61d8574cc0..5928b77a988 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-${version}"; + pname = "lxc"; version = "3.2.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index c335031f2e5..ec76cda9769 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, texinfo }: stdenv.mkDerivation rec { - name = "macchanger-${version}"; + pname = "macchanger"; version = "1.7.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 9528b9be7f7..8b62ce76409 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mbpfan-${version}"; + pname = "mbpfan"; version = "2.1.1"; src = fetchFromGitHub { owner = "dgraziotin"; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 394dbf63f17..659f875bc2b 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, utillinux }: stdenv.mkDerivation rec { - name = "mcelog-${version}"; + pname = "mcelog"; version = "162"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix index 485272b1401..c81a0c9097a 100644 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, autoreconfHook }: stdenv.mkDerivation rec { - name = "iucode-tool-${version}"; + pname = "iucode-tool"; version = "2.3.1"; src = fetchFromGitLab { diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index b65486cb2fe..0edf322cce5 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -2,7 +2,7 @@ , glib, readline, pcre, systemd, udev }: stdenv.mkDerivation rec { - name = "miraclecast-${version}"; + pname = "miraclecast"; version = "1.0-20190403"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 533cd90a2d3..a7f0a332beb 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "mmc-utils-${version}"; + pname = "mmc-utils"; version = "2018-03-27"; src = fetchgit { diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index ac083e545fe..766c01eed3f 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, busybox, systemd }: stdenv.mkDerivation rec { - name = "molly-guard-${version}"; + pname = "molly-guard"; version = "0.6.3"; src = fetchurl { diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix index 128f3eac263..f7b81bd3915 100644 --- a/pkgs/os-specific/linux/msr-tools/default.nix +++ b/pkgs/os-specific/linux/msr-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "msr-tools-${version}"; + pname = "msr-tools"; version = "1.3"; src = fetchurl { - url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip"; + url = "https://01.org/sites/default/files/downloads/msr-tools/${pname}-${version}.zip"; sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr"; }; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 078f894f73e..afe07a5c4db 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { - name = "multipath-tools-${version}"; + pname = "multipath-tools"; version = "0.8.2"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz"; sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s"; }; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 42f745b02e3..3cd8f224ce4 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "net-tools-${version}"; + pname = "net-tools"; version = "1.60_p20170221182432"; src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.xz"; + url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a"; }; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 7984e357c82..fd8c42c9be7 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "nfs-utils-${version}"; + pname = "nfs-utils"; version = "2.3.4"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; + url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq"; }; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index b4878ff4eac..87ae0cc1e26 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "nftables-${version}"; + pname = "nftables"; src = fetchurl { - url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"; }; diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 5f425c9685c..cb6dd4ab946 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, ncurses }: stdenv.mkDerivation rec { - name = "nmon-${version}"; + pname = "nmon"; version = "16k"; src = fetchurl { diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 2db2e12bb96..4417ffb569b 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "numactl-${version}"; + pname = "numactl"; version = "2.0.12"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 4bf1e41bd57..4194a679698 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nvme-cli-${version}"; + pname = "nvme-cli"; version = "1.8.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index bead5f84eac..4040d70260c 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "odp-dpdk-${version}"; + pname = "odp-dpdk"; version = "1.19.0.0_DPDK_17.11"; src = fetchurl { - url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz"; + url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px"; }; diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 93cf33979f4..70f46519375 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ofp-${version}"; + pname = "ofp"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index a2644fcbc3f..274e960a89b 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "open-iscsi-${version}"; + pname = "open-iscsi"; version = "2.0.877"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 21d32af3ba8..7b34c1029ba 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -1,7 +1,7 @@ { stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "open-isns-${version}"; + pname = "open-isns"; version = "0.99"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index a2a272f1b3a..bf26b9e2b28 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,10 +8,10 @@ let _kernel = kernel; in stdenv.mkDerivation rec { version = "2.5.4"; - name = "openvswitch-${version}"; + pname = "openvswitch"; src = fetchurl { - url = "http://openvswitch.org/releases/${name}.tar.gz"; + url = "http://openvswitch.org/releases/${pname}-${version}.tar.gz"; sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv"; }; diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index e1525a951a9..5d7357cb838 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "pagemon-${version}"; + pname = "pagemon"; version = "0.01.16"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 1f2a7d3edf2..d1a035d7448 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 }: stdenv.mkDerivation rec { - name = "linux-pam-${version}"; + pname = "linux-pam"; version = "1.3.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 10856bb52c9..a1c91516ce0 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { - name = "pam_pgsql-${version}"; + pname = "pam_pgsql"; version = "0.7.3.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 72846e185eb..6e9ab379dbc 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }: stdenv.mkDerivation rec { - name = "pam_u2f-${version}"; + pname = "pam_u2f"; version = "1.0.8"; src = fetchurl { - url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj"; }; diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 8fdd2356c30..754f6bcac33 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, elf-header }: stdenv.mkDerivation rec { - name = "paxctl-${version}"; + pname = "paxctl"; version = "0.9"; src = fetchurl { - url = "https://pax.grsecurity.net/${name}.tar.gz"; + url = "https://pax.grsecurity.net/${pname}-${version}.tar.gz"; sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index c1500e51ac3..e01f84576ce 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, paxctl }: stdenv.mkDerivation rec { - name = "paxtest-${version}"; + pname = "paxtest"; version = "0.9.15"; src = fetchurl { - url = "https://www.grsecurity.net/~spender/${name}.tar.gz"; + url = "https://www.grsecurity.net/~spender/${pname}-${version}.tar.gz"; sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym"; }; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 6365175290a..9b9e563f803 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "201902"; - name = "pcm-${version}"; + pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index 1155a793b01..f3e63133d1e 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python, wafHook }: stdenv.mkDerivation rec { - name = "pflask-${version}"; + pname = "pflask"; version = "git-2015-12-17"; rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 523f7382a2c..62aa18fa643 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pipework-${version}"; + pname = "pipework"; version = "2017-08-22"; src = fetchFromGitHub { owner = "jpetazzo"; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index a7bb4a81510..0d92c7c6909 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "pktgen-${version}"; + pname = "pktgen"; version = "3.5.0"; src = fetchurl { diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 2092a50041f..b074c6d7244 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "plymouth-${version}"; + pname = "plymouth"; version = "0.9.4"; src = fetchurl { - url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/plymouth/releases/${pname}-${version}.tar.xz"; sha256 = "0l8kg7b2vfxgz9gnrn0v2w4jvysj2cirp0nxads5sy05397pl6aa"; }; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index cd0e277b2c6..0981a0b5a4b 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -8,7 +8,7 @@ assert stdenv.lib.hasSuffix "/" mediaDir; stdenv.mkDerivation rec { - name = "pmount-${version}"; + pname = "pmount"; version = "0.9.23"; src = fetchurl { diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index a7cac46ae6a..fb507d4da48 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }: stdenv.mkDerivation rec { - name = "policycoreutils-${version}"; + pname = "policycoreutils"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 1a4919a5d9d..3daab3917e8 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { version = "${prl_major}.2.1-41615"; prl_major = "12"; - name = "prl-tools-${version}"; + pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix index aa7d0ec4604..0185d3022bc 100644 --- a/pkgs/os-specific/linux/procdump/default.nix +++ b/pkgs/os-specific/linux/procdump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }: stdenv.mkDerivation rec { - name = "procdump-${version}"; + pname = "procdump"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 1ed85bc94cb..1f39a99ea0b 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "procps-${version}"; + pname = "procps"; version = "3.3.15"; # The project's releases are on SF, but git repo on gitlab. diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index b6c16948339..844ce769aea 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: stdenv.mkDerivation rec { - name = "pscircle-${version}"; + pname = "pscircle"; version = "1.3.0"; src = fetchFromGitLab { diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 68e51afdf1b..413b7d5dcbd 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "psmisc"; version = "23.2"; - name = "${pname}-${version}"; src = fetchFromGitLab { owner = pname; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 36ad73c48d6..c013a0107ea 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -2,7 +2,7 @@ , ncurses, libdrm, libpciaccess, libxcb }: stdenv.mkDerivation rec { - name = "radeontop-${version}"; + pname = "radeontop"; version = "2019-06-03"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 3e57bbc11bd..815005ae290 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, cmake, libx86 }: stdenv.mkDerivation rec { - name = "read-edid-${version}"; + pname = "read-edid"; version = "3.0.2"; src = fetchurl { - url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz"; + url = "http://www.polypux.org/projects/read-edid/${pname}-${version}.tar.gz"; sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; }; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index bd25dc65ec8..c078fb18c4e 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; - name = "reptyr-${version}"; + pname = "reptyr"; src = fetchFromGitHub { owner = "nelhage"; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 8c7b75a881f..b1afbfea0de 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: stdenv.mkDerivation rec { - name = "rewritefs-${version}"; + pname = "rewritefs"; version = "2017-08-14"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index ecaa4e89d49..1f5b31d0deb 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "roccat-tools-${version}"; + pname = "roccat-tools"; version = "5.9.0"; src = fetchurl { - url = "mirror://sourceforge/roccat/${name}.tar.bz2"; + url = "mirror://sourceforge/roccat/${pname}-${version}.tar.bz2"; sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg"; }; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index b29b1f639cf..447f9127d60 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -5,7 +5,7 @@ with lib; let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi"; in stdenv.mkDerivation rec { - name = "rtlwifi_new-${version}"; + pname = "rtlwifi_new"; version = "2018-02-17"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index 2c02ef924c3..316c9800079 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "schedtool-${version}"; + pname = "schedtool"; version = "1.3.0"; src = fetchFromGitHub { owner = "freequaos"; repo = "schedtool"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp"; }; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index a8d5112c63b..5517f163b3e 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "sdparm-${version}"; + pname = "sdparm"; version = "1.10"; src = fetchurl { - url = "http://sg.danny.cz/sg/p/${name}.tar.xz"; + url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz"; sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx"; }; diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 527c94de46b..b8f80a0124c 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; with python3.pkgs; stdenv.mkDerivation rec { - name = "selinux-python-${version}"; + pname = "selinux-python"; version = "2.7"; se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 71d2ee6e80a..99bbfbe7287 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; with python3.pkgs; stdenv.mkDerivation rec { - name = "selinux-sandbox-${version}"; + pname = "selinux-sandbox"; version = "2.7"; se_release = "20170804"; diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index 10ba1a3c7d0..178d102381e 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libsepol }: stdenv.mkDerivation rec { - name = "semodule-utils-${version}"; + pname = "semodule-utils"; version = "2.7"; inherit (libsepol) se_release se_url; src = fetchurl { - url = "${se_url}/${se_release}/${name}.tar.gz"; + url = "${se_url}/${se_release}/${pname}-${version}.tar.gz"; sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch"; }; diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix index 4067e5f70e2..53250b345e8 100644 --- a/pkgs/os-specific/linux/sepolgen/default.nix +++ b/pkgs/os-specific/linux/sepolgen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libsepol, python }: stdenv.mkDerivation rec { - name = "sepolgen-${version}"; + pname = "sepolgen"; version = "1.2.2"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 6b808f0d6a6..ccc0df59d10 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { - name = "shadow-${version}"; + pname = "shadow"; version = "4.6"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index de12b3719af..f40652922d8 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "smem-${version}"; + pname = "smem"; version = "1.5"; src = fetchurl { diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 55336e3b2a0..15520b236be 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "smemstat-${version}"; + pname = "smemstat"; version = "0.02.04"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index 449edf481a9..6f2e6306003 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "speedometer-${version}"; + pname = "speedometer"; version = "2.8"; src = fetchurl { diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 80c5c1f650b..3dbdb99549a 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -11,11 +11,11 @@ let docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in stdenv.mkDerivation rec { - name = "sssd-${version}"; + pname = "sssd"; version = "1.16.4"; src = fetchurl { - url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; + url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz"; sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; }; diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index c7543aee933..db362613d37 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "syscall_limiter-${version}"; + pname = "syscall_limiter"; version = "2017-01-23"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index cf1f2f242f4..ce2bd1fa99f 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sysdig-${version}"; + pname = "sysdig"; version = "0.26.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index b7f1af618fe..45f4d60e4e3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "242"; - name = "systemd-${version}"; + pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 5df7bb827aa..309d69ebad5 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -4,7 +4,7 @@ let vanillaVersion = "7.6.q"; patchLevel = "26"; in stdenv.mkDerivation rec { - name = "tcp-wrappers-${version}"; + pname = "tcp-wrappers"; version = "${vanillaVersion}-${patchLevel}"; src = fetchurl { diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index faf47c96a5e..299ac8ad220 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "thunderbolt-${version}"; + pname = "thunderbolt"; version = "0.9.3"; src = fetchFromGitHub { owner = "01org"; diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index 3c833de8b0c..47b89f138c5 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }: stdenv.mkDerivation rec { - name = "tiptop-${version}"; + pname = "tiptop"; version = "2.3.1"; src = fetchurl { - url = "${meta.homepage}/releases/${name}.tar.gz"; + url = "${meta.homepage}/releases/${pname}-${version}.tar.gz"; sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index 53b6cbc3401..dfcf4c9937b 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { pname = "tiscamera"; version = "0.9.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "TheImagingSource"; repo = pname; - rev = "v-${name}"; + rev = "v-${pname}-${version}"; sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87"; }; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 880fd61ec2c..9fde8406024 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "tomb-${version}"; + pname = "tomb"; version = "2.6"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix index b4e584f2979..bb6d51669e6 100644 --- a/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -2,7 +2,7 @@ # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { - name = "tpacpi-bat-${version}"; + pname = "tpacpi-bat"; version = "3.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 3133602b44e..e6571b46ee0 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: stdenv.mkDerivation rec { - name = "trace-cmd-${version}"; + pname = "trace-cmd"; version = "2.8.3"; src = fetchgit (import ./src.nix); diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 739bd447192..d4f83eb8caf 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "untie-${version}"; + pname = "untie"; version = "0.3"; src = fetchurl { - url = "http://guichaz.free.fr/untie/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/untie/files/${pname}-${version}.tar.bz2"; sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m"; }; diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 3df0023bd67..64d18fe075a 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -13,12 +13,12 @@ assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { version = "0.7.4"; - name = "usbguard-${version}"; + pname = "usbguard"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { - url = "${repo}/releases/download/${name}/${name}.tar.gz"; + url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k"; }; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index 1a40ec50c99..19f59d00680 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.3.0"; - name = "uvcdynctrl-${version}"; + pname = "uvcdynctrl"; src = fetchFromGitHub { owner = "cshorler"; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index ede9fa68280..9bb6fcdd0a0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -7,11 +7,11 @@ # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) mkDerivation rec { - name = "v4l-utils-${version}"; + pname = "v4l-utils"; version = "1.16.6"; src = fetchurl { - url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/v4l-utils/${pname}-${version}.tar.bz2"; sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr"; }; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 02e08bec7ad..570eb4ca4ef 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast kernel.version "3.10"; stdenv.mkDerivation rec { - name = "wireguard-${version}"; + pname = "wireguard"; inherit (wireguard-tools) src version; preConfigure = '' diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 61f48758676..935b1635e29 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -6,10 +6,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.8"; - name = "wpa_supplicant-${version}"; + pname = "wpa_supplicant"; src = fetchurl { - url = "https://w1.fi/releases/${name}.tar.gz"; + url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; sha256 = "15ixzm347n8w6gdvi3j3yks3i15qmp6by9ayvswm34d929m372d6"; }; diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 7911a2172ba..1c2aaa8ee01 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.30"; - name = "x86info-${version}"; + pname = "x86info"; src = fetchurl { - url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz"; + url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz"; sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; }; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index 5f7bca097bf..440a797a723 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }: stdenv.mkDerivation rec { - name = "xsensors-${version}"; + pname = "xsensors"; version = "0.70"; src = fetchurl { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 3738760bb29..a6c74d029c5 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cygwin-setup-${version}"; + pname = "cygwin-setup"; version = "20131101"; src = fetchcvs { diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 9538747da6d..14a0df25747 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "rabbitmq-server-${version}"; + pname = "rabbitmq-server"; version = "3.7.17"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { - url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr"; }; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index dca2c072185..0c1c69982fa 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -50,7 +50,7 @@ with versionMap.${majorVersion}; stdenv.mkDerivation rec { version = "${scalaVersion}-${kafkaVersion}"; - name = "apache-kafka-${version}"; + pname = "apache-kafka"; src = fetchurl { url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 47ef9934a5e..6e47fce3e48 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -8,7 +8,7 @@ let common = {version, sha256, externals}: stdenv.mkDerivation rec { inherit version; - name = "asterisk-${version}"; + pname = "asterisk"; buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite dmidecode libuuid newt diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 2f7a7c80cb6..f6b24f6de35 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "atlassian-confluence-${version}"; + pname = "atlassian-confluence"; version = "6.15.6"; src = fetchurl { - url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; + url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; sha256 = "0bb404d5i8jdry1jw8qdrcpgp9lvdkyxry58331pwpw16mlh0r2m"; }; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 1d0e28ac9f2..81b90091e66 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -2,11 +2,11 @@ , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: stdenv.mkDerivation rec { - name = "atlassian-crowd-${version}"; + pname = "atlassian-crowd"; version = "3.4.5"; src = fetchurl { - url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; + url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3"; }; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 5bd91b14f32..a863ae6a0e5 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "atlassian-jira-${version}"; + pname = "atlassian-jira"; version = "8.3.0"; src = fetchurl { diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 528dc8a48a0..58ebbf88f78 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.11"; - name = "beanstalkd-${version}"; + pname = "beanstalkd"; installPhase=''make install "PREFIX=$out"''; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 61316d0a60a..675f1beb891 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "caddy-${version}"; + pname = "caddy"; version = "1.0.0"; goPackagePath = "github.com/mholt/caddy"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index befa36edd9e..f9532d48a11 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cayley-${version}"; + pname = "cayley"; version = "0.6.1"; goPackagePath = "github.com/cayleygraph/cayley"; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 8530d8cb068..e48dec7d20c 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "clickhouse-${version}"; + pname = "clickhouse"; version = "19.13.1.11"; src = fetchFromGitHub { diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 21a5bad72fc..bf8623f0a89 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -8,7 +8,7 @@ # - https://github.com/Mic92/dotfiles/blob/ba2a01144cfdc71c829d872a3fc816c64663ad7f/nixos/vms/matchbox/modules/cloud-print-connector.nix buildGoPackage rec { - name = "cloud-print-connector-unstable-${version}"; + pname = "cloud-print-connector-unstable"; version = "1.16"; rev = "481ad139cc023a3ba65e769f08f277368fa8a5de"; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c18e71977d8..bba33d99aa2 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "slurm-${version}"; + pname = "slurm"; version = "19.05.1.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "SchedMD"; repo = "slurm"; # The release tags use - instead of . - rev = "${builtins.replaceStrings ["."] ["-"] name}"; + rev = "${builtins.replaceStrings ["."] ["-"] "${pname}-${version}"}"; sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k"; }; diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 84985b8f0eb..93794ce7052 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -2,7 +2,7 @@ , jre, makeWrapper, bash, gnused }: stdenv.mkDerivation rec { - name = "confluent-platform-${version}"; + pname = "confluent-platform"; version = "5.3.0"; scalaVersion = "2.12"; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d364c2a5bcd..4c8877e92de 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-${version}"; + pname = "consul"; version = "1.5.2"; rev = "v${version}"; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index ad15db070f4..e1d02d2f9d7 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, libevent }: stdenv.mkDerivation rec { - name = "coturn-${version}"; + pname = "coturn"; version = "4.5.1.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix index 8b2895392be..a528cd2ca26 100644 --- a/pkgs/servers/couchpotato/default.nix +++ b/pkgs/servers/couchpotato/default.nix @@ -3,7 +3,7 @@ with pythonPackages; buildPythonApplication rec { - name = "couchpotato-${version}"; + pname = "couchpotato"; version = "3.0.1"; disabled = isPy3k; diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 1c093facde5..24e607f4b00 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }: stdenv.mkDerivation rec { - name = "dante-${version}"; + pname = "dante"; version = "1.4.2"; src = fetchurl { - url = "https://www.inet.no/dante/files/${name}.tar.gz"; + url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz"; sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms"; }; diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 5056df06e59..8e89b6f980f 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dgraph-${version}"; + pname = "dgraph"; version = "0.8.2"; goPackagePath = "github.com/dgraph-io/dgraph"; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index c45098b2ae0..b4ad70f8277 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }: stdenv.mkDerivation rec { - name = "dictd-${version}"; + pname = "dictd"; version = "1.12.1"; src = fetchurl { diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index 13e4757fe89..b7dbf04026d 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "20161001"; - name = "dict-db-wiktionary-${version}"; + pname = "dict-db-wiktionary"; data = fetchurl { url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m"; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 8a1bb6313ad..2c97101d9cb 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "542"; - name = "dict-db-wordnet-${version}"; + pname = "dict-db-wordnet"; buildInputs = [python wordnet]; convert = ./wordnet_structures.py; diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index f5c0cf230af..d9f831c862f 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.2"; - name = "libmaa-${version}"; + pname = "libmaa"; src = fetchurl { url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz"; diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index 2199d62b4dd..cfa6e34fa4c 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "diod-${version}"; + pname = "diod"; version = "1.0.24"; src = fetchurl { - url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/chaos/diod/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl"; }; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 214c3e91f0e..def78223f12 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "coredns-${version}"; + pname = "coredns"; version = "1.3.1"; goPackagePath = "github.com/coredns/coredns"; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 6757542050a..cb004a596d2 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, systemd , boost, libsodium, libedit, re2 , net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec { - name = "dnsdist-${version}"; + pname = "dnsdist"; version = "1.3.2"; src = fetchurl { diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 718028b2bc0..8191bf5acbf 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -6,7 +6,7 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { - name = "knot-dns-${version}"; + pname = "knot-dns"; version = "2.8.3"; src = fetchurl { diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1d8896bfc10..22b1f2a67e2 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -22,11 +22,11 @@ exportLuaPathsFor = luaPkgs: '' ''; unwrapped = stdenv.mkDerivation rec { - name = "knot-resolver-${version}"; + pname = "knot-resolver"; version = "4.2.0"; src = fetchurl { - url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; + url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4"; }; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index fcddd569b36..0a584ce1aca 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -7,7 +7,7 @@ assert enableProtoBuf -> protobuf != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "pdns-recursor-${version}"; + pname = "pdns-recursor"; version = "4.2.0"; src = fetchurl { diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 105e9f232c1..d363eb715d6 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "powerdns-${version}"; + pname = "powerdns"; version = "4.1.10"; src = fetchurl { diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index e71abb8bc00..0a0b6c0e1d1 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "echoip-${version}"; + pname = "echoip"; version = "unstable-2018-11-20"; goPackagePath = "github.com/mpolden/echoip"; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index d52fdd14301..5293b18368e 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "elasticmq-server"; version = "0.14.6"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar"; + url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar"; sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz"; }; diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index d3c5555fa6a..5a693fd7529 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "etcd-${version}"; + pname = "etcd"; version = "3.3.13"; # After updating check that nixos tests pass rev = "v${version}"; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 5e2381ada1d..1e05c856ab5 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }: stdenv.mkDerivation rec { - name = "exhibitor-${version}"; + pname = "exhibitor"; version = "1.5.6"; src = fetchFromGitHub { diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 8bab12116b0..c8ddcf438f7 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name = "fcgiwrap-${version}"; + pname = "fcgiwrap"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 5ce680e3646..7be7416d04d 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "apache-felix-${version}"; + pname = "apache-felix"; version = "5.6.1"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix index 3ac3c98718f..2fe628db046 100644 --- a/pkgs/servers/felix/remoteshell.nix +++ b/pkgs/servers/felix/remoteshell.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.2"; - name = "apache-felix-remoteshell-bundle-${version}"; + pname = "apache-felix-remoteshell-bundle"; src = fetchurl { url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar"; sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq"; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index caf7d8360f0..31de5925916 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { version = "2.5.7.27050-0"; - name = "firebird-${version}"; + pname = "firebird"; # enableParallelBuilding = false; build fails diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 87e4a22b051..e8a1a633e4d 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -22,7 +22,7 @@ let , officialRelease ? true , patches ? [] }: stdenv.mkDerivation rec { - name = "foundationdb-${version}"; + pname = "foundationdb"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 0eb71492be3..34b9f6ecaf0 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -46,7 +46,7 @@ let , patches ? [] }: stdenv.mkDerivation rec { - name = "foundationdb-${version}"; + pname = "foundationdb"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index ed36b33bdeb..6c6eb2b0c09 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -42,7 +42,7 @@ assert withRest -> curl != null && withJson; with stdenv.lib; stdenv.mkDerivation rec { - name = "freeradius-${version}"; + pname = "freeradius"; version = "3.0.19"; src = fetchurl { diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix index e8e08271b3b..1bb2ebc4f86 100644 --- a/pkgs/servers/gnatsd/default.nix +++ b/pkgs/servers/gnatsd/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "gnatsd-${version}"; + pname = "gnatsd"; version = "1.4.0"; rev = "v${version}"; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index 754cba58825..1bec32e5125 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "gofish-${version}"; + pname = "gofish"; version = "1.2"; src = fetchurl { - url = "mirror://sourceforge/project/gofish/gofish/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz"; sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s"; }; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index ebade244bdf..da24b0a0e26 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gotty-${version}"; + pname = "gotty"; version = "0.0.13"; rev = "v${version}"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index c4be1f3c3b3..ff127e705e5 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "h2-${version}"; + pname = "h2"; version = "1.4.193"; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 6a33ac638d2..3d05933f513 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "hbase-${version}"; + pname = "hbase"; version = "0.98.24"; src = fetchurl { diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 58033edb07d..7bc2da8b023 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, docutils, libev, openssl, pkgconfig }: stdenv.mkDerivation rec { version = "1.5.0"; - name = "hitch-${version}"; + pname = "hitch"; src = fetchurl { - url = "https://hitch-tls.org/source/${name}.tar.gz"; + url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz"; sha256 = "02sd2p3jsbnqmldsjwzk5qcjc45k9n1x4ygjkx0kxxwjj9lm9hhf"; }; diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix index 664953ca34d..6e4be4a36fe 100644 --- a/pkgs/servers/http/4store/default.nix +++ b/pkgs/servers/http/4store/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { - name = "4store-${version}"; + pname = "4store"; version = "1.1.6"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 3c3d4c20df1..4ffbb010016 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -17,7 +17,7 @@ assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { version = "2.4.39"; - name = "apache-httpd-${version}"; + pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 8a773631ee6..6bad43a62f0 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "mod_auth_mellon-${version}"; + pname = "mod_auth_mellon"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index ff71e460b2a..568b6ecd174 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, apacheHttpd, python2 }: stdenv.mkDerivation rec { - name = "mod_wsgi-${version}"; + pname = "mod_wsgi"; version = "4.6.7"; src = fetchurl { diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index aa826a9c528..65ec2510d34 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "apt-cacher-ng-${version}"; + pname = "apt-cacher-ng"; version = "3.2"; src = fetchurl { diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index cb630c26688..538584e147a 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -2,13 +2,13 @@ , coreutils, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "couchdb-${version}"; + pname = "couchdb"; version = "2.3.0"; # when updating this, please consider bumping the OTP version # in all-packages.nix src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; + url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b"; }; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 2299f732a76..f2e5e67dd7a 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -2,11 +2,11 @@ , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { - name = "couchdb-${version}"; + pname = "couchdb"; version = "1.7.1"; src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; + url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; }; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 3efc97f6296..42de9904f90 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "darkhttpd-${version}"; + pname = "darkhttpd"; version = "1.12"; src = fetchurl { - url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2"; + url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2"; sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155"; }; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index ceffd3e0260..2a26af53709 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -6,7 +6,7 @@ with builtins; stdenv.mkDerivation rec { - name = "h2o-${version}"; + pname = "h2o"; version = "2.2.5"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 742db556707..a3bcb64e6c0 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation rec { - name = "hiawatha-${version}"; + pname = "hiawatha"; version = "10.9"; src = fetchFromGitLab { diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 80a3d6b105c..5ce44322e92 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jetty-${version}"; + pname = "jetty"; version = "9.4.16.v20190411"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 878211ebf02..f692832e882 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "lwan"; version = "0.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "lpereira"; diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 479c9e41aa9..bef7f43ea71 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -3,7 +3,7 @@ , lighttpd, iproute }: stdenv.mkDerivation rec { version = "2014-06-29-1"; - name = "nix-binary-cache-${version}"; + pname = "nix-binary-cache"; phases = ["installPhase"]; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 6bb4ce46a43..3990c5de818 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -4,7 +4,7 @@ gd, geoip, perl }: with stdenv.lib; stdenv.mkDerivation rec { - name = "openresty-${version}"; + pname = "openresty"; version = "1.15.8.1"; src = fetchurl { diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index c38ca046a35..19d0b9a2641 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }: stdenv.mkDerivation rec { - name = "pshs-${version}"; + pname = "pshs"; version = "0.3.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index b5d5d5f7992..d118e8af66d 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn, autoconf, automake }: stdenv.mkDerivation rec { - name = "spawn-fcgi-${version}"; + pname = "spawn-fcgi"; version = "1.6.4"; src = fetchsvn { diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index cac31ed9d59..a7ea61de042 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.3.1"; - name = "tengine-${version}"; + pname = "tengine"; src = fetchurl { url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz"; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 6e012c98737..b72439bc37a 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "thttpd-${version}"; + pname = "thttpd"; version = "2.29"; src = fetchurl { - url = "https://acme.com/software/thttpd/${name}.tar.gz"; + url = "https://acme.com/software/thttpd/${pname}-${version}.tar.gz"; sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r"; }; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 5da89200816..59a4ab6e5b4 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, apacheAnt, jdk, unzip }: stdenv.mkDerivation rec { - name = "axis2-${version}"; + pname = "axis2"; version = "1.7.9"; src = fetchurl { - url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; + url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index fded6bdfafb..38b4974e155 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -3,11 +3,11 @@ let common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { - name = "apache-tomcat-${version}"; + pname = "apache-tomcat"; version = "${versionMajor}.${versionMinor}"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 39b9b31f7f0..eaa15d4f46b 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.9.0"; - name = "unit-${version}"; + pname = "unit"; src = fetchFromGitHub { owner = "nginx"; diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index 3fb3890f9c4..79c7d9e9eca 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -7,11 +7,11 @@ let }; in stdenv.mkDerivation rec { - name = "webfs-${version}"; + pname = "webfs"; version = "1.21"; src = fetchurl { - url = "https://www.kraxel.org/releases/webfs/${name}.tar.gz"; + url = "https://www.kraxel.org/releases/webfs/${pname}-${version}.tar.gz"; sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a"; }; diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index 5d6b47d28b5..707b4878648 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "webhook-${version}"; + pname = "webhook"; version = "2.6.8"; goPackagePath = "github.com/adnanh/webhook"; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 827f6122b57..109f7bc06dc 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, erlang, pam, perl }: stdenv.mkDerivation rec { - name = "yaws-${version}"; + pname = "yaws"; version = "2.0.6"; src = fetchurl { - url = "http://yaws.hyber.org/download/${name}.tar.gz"; + url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz"; sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9"; }; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 912e520180e..075226f3607 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -2,7 +2,7 @@ , quicktemplate, go-bindata, easyjson }: buildGoPackage rec { - name = "hydron-unstable-${version}"; + pname = "hydron-unstable"; version = "2019-02-17"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 9216464f1e4..bdfc6d7096b 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { - name = "icingaweb2-${version}"; + pname = "icingaweb2"; version = "2.7.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index fdad63d67af..8171f61c112 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "nullidentdmod-${version}"; + pname = "nullidentdmod"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 81eeae804d2..8e0395529bc 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "oidentd-${version}"; + pname = "oidentd"; version = "2.3.2"; nativeBuildInputs = [ bison flex ]; src = fetchurl { - url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; + url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "10c5jkhirkvm1s4v3zdj4micfi6rkfjj32q4k7wjwh1fnzrwyb5n"; }; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index f57c94cd108..9823a36d754 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -3,7 +3,7 @@ , buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "interlock-${version}"; + pname = "interlock"; version = "2016.04.13"; rev = "v${version}"; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 002760ff0fd..e7d6d9ac52a 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -2,7 +2,7 @@ , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: stdenv.mkDerivation rec { - name = "irker-${version}"; + pname = "irker"; version = "2017-02-12"; src = fetchFromGitLab { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index d2ead585e7d..c70f3d4de61 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, curl, makeWrapper }: stdenv.mkDerivation rec { - name = "jackett-${version}"; + pname = "jackett"; version = "0.11.559"; src = fetchurl { @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/${name}} - cp -r * $out/share/${name} + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ - --add-flags "$out/share/${name}/JackettConsole.exe" \ + --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib" ''; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index bbf39e5be46..2f8241e7b09 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { - name = "youtrack-${version}"; + pname = "youtrack"; version = "2018.2.44329"; jar = fetchurl { - url = "https://download.jetbrains.com/charisma/${name}.jar"; + url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 3ebcaf7286b..bec8ccbbf18 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -60,10 +60,10 @@ let }; in stdenv.mkDerivation rec { - name = "kippo-${version}"; + pname = "kippo"; version = "0.8"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz"; sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d"; }; buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ]; diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix index 7c7755dee48..4eb0b26c306 100644 --- a/pkgs/servers/kwakd/default.nix +++ b/pkgs/servers/kwakd/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "kwakd-${version}"; + pname = "kwakd"; version = "0.5"; src = fetchFromGitHub { diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index fc88d645f27..43ddc5f7b0f 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: stdenv.mkDerivation rec { - name = "lidarr-${version}"; + pname = "lidarr"; version = "0.6.2.883"; src = fetchurl { diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 2e17001abc5..798bda8e306 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -3,7 +3,7 @@ }: buildGoPackage rec { - name = "livepeer-${version}"; + pname = "livepeer"; version = "0.2.4"; goPackagePath = "github.com/livepeer/go-livepeer"; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 080cbc89775..5a318c311af 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, openssl, perl, zlib, jam }: stdenv.mkDerivation rec { version = "3.2.0"; - name = "archiveopteryx-${version}"; + pname = "archiveopteryx"; src = fetchurl { - url = "http://archiveopteryx.org/download/${name}.tar.bz2"; + url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2"; sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx"; }; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 30c6f2f44dd..ede01bff074 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dovecot, openssl }: stdenv.mkDerivation rec { - name = "dovecot-pigeonhole-${version}"; + pname = "dovecot-pigeonhole"; version = "0.5.7.1"; src = fetchurl { diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 019c84d2898..429d735ffcd 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "MailHog-${version}"; + pname = "MailHog"; version = "1.0.0"; rev = "v${version}"; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 91445afa97d..e9f66b92be2 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "mailman-${version}"; + pname = "mailman"; version = "2.1.29"; src = fetchurl { - url = "mirror://gnu/mailman/${name}.tgz"; + url = "mirror://gnu/mailman/${pname}-${version}.tgz"; sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243"; }; diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 98b270ad7d4..2c1c07e502a 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "mlmmj-${version}"; + pname = "mlmmj"; version = "1.3.0"; src = fetchurl { - url = "http://mlmmj.org/releases/${name}.tar.gz"; + url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz"; sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; }; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 4b753bdf0cd..7738c4eb3d4 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -5,7 +5,7 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { version = "2.2"; - name = "nullmailer-${version}"; + pname = "nullmailer"; src = fetchurl { url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index cd48ab12e24..7dc3968139f 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "opensmtpd-${version}"; + pname = "opensmtpd"; version = "6.4.1p2"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn"; }; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 1d4ad63c37d..71b27facbab 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "opensmtpd-extras-${version}"; + pname = "opensmtpd-extras"; version = "6.4.0"; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb"; }; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 10d3b397b26..c5377247046 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { - name = "postfix-${version}"; + pname = "postfix"; version = "3.4.6"; src = fetchurl { - url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; + url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n"; }; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index f13c57e3b35..49854927e57 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, help2man }: stdenv.mkDerivation rec { - name = "postsrsd-${version}"; + pname = "postsrsd"; version = "1.6"; src = fetchFromGitHub { diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix index d5e410a86c1..5da94ca8026 100644 --- a/pkgs/servers/mail/pypolicyd-spf/default.nix +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonApplication, fetchurl, pyspf }: buildPythonApplication rec { - name = "pypolicyd-spf-${version}"; + pname = "pypolicyd-spf"; majorVersion = "2.0"; version = "${majorVersion}.2"; src = fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; }; diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix index 739270326e5..9d7730e399f 100644 --- a/pkgs/servers/mail/rmilter/default.nix +++ b/pkgs/servers/mail/rmilter/default.nix @@ -7,7 +7,7 @@ let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { in stdenv.mkDerivation rec { - name = "rmilter-${version}"; + pname = "rmilter"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 25e7807659d..f4f2e616dc7 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -13,7 +13,7 @@ let libmagic = file; # libmagic provided by file package ATM in stdenv.mkDerivation rec { - name = "rspamd-${version}"; + pname = "rspamd"; version = "1.9.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 9e5a9ffe780..673d3f1f21b 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchurl }: buildGoPackage rec { - name = "matterbridge-${version}"; + pname = "matterbridge"; version = "1.11.0"; goPackagePath = "github.com/42wim/matterbridge"; diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 6707055eaa6..bb6d1584a67 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "matterircd-${version}"; + pname = "matterircd"; version = "0.18.2"; src = fetchFromGitHub { diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 824f8ea2025..3d79d8421dd 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mautrix-unstable-${version}"; + pname = "mautrix-unstable"; version = "2019-07-04"; goPackagePath = "maunium.net/go/mautrix-whatsapp"; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 33b7674cf9e..33151c4063b 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -3,7 +3,7 @@ , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "mediatomb-${version}"; + pname = "mediatomb"; version = "0.12.1"; src = fetchgit { diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index d983c067719..3318b6fa5ef 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -3,7 +3,7 @@ , nodePackages, emscripten, opencv, statik }: buildGoPackage rec { - name = "meguca-unstable-${version}"; + pname = "meguca-unstable"; version = "2019-03-12"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index f30b5af6cad..a9873261d78 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5.16"; - name = "memcached-${version}"; + pname = "memcached"; src = fetchurl { - url = "https://memcached.org/files/${name}.tar.gz"; + url = "https://memcached.org/files/${pname}-${version}.tar.gz"; sha256 = "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5"; }; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index fe1f1c6760d..8430f2d61e8 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mesos-dns-${version}"; + pname = "mesos-dns"; version = "0.1.2"; rev = "v${version}"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index a20793a849c..b6a70864cc5 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "minio-${version}"; + pname = "minio"; version = "2019-02-26T19-51-46Z"; src = fetchFromGitHub { diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 10c8811c548..48817f76bda 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -2,7 +2,7 @@ , pkgconfig, zlib, geoip }: buildGoPackage rec { - name = "mirrorbits-${version}"; + pname = "mirrorbits"; version = "0.4"; rev = "v${version}"; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index d0ce73f5410..34601ed708b 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "airsonic-${version}"; + pname = "airsonic"; version = "10.3.1"; src = fetchurl { diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index 50e754791e6..be5188f177a 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "subsonic-${version}"; + pname = "subsonic"; version = "6.1.5"; src = fetchurl { @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { # for a directory to be created in the unpack phase. unpackPhase = '' runHook preUnpack - mkdir ${name} - tar -C ${name} -xzf $src + mkdir ${pname}-${version} + tar -C ${pname}-${version} -xzf $src runHook postUnpack ''; installPhase = '' runHook preInstall mkdir $out - cp -r ${name}/* $out + cp -r ${pname}-${version}/* $out runHook postInstall ''; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index f15b7ca2e82..0ab921a6f6f 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }: stdenv.mkDerivation rec { - name = "taskserver-${version}"; + pname = "taskserver"; version = "1.1.0"; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index c8eb0731924..957bb59b121 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "bosun-${version}"; + pname = "bosun"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 502a3026b2a..66b848a1975 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,7 +1,7 @@ { stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cadvisor-${version}"; + pname = "cadvisor"; version = "0.33.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index a888549bb6a..707d0129f70 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-alerts-${version}"; + pname = "consul-alerts"; version = "0.5.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index efa62e261b7..e5f30f4e614 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -2,7 +2,7 @@ , go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }: stdenv.mkDerivation rec { - name = "facette-${version}"; + pname = "facette"; version = "0.4.1"; src = fetchFromGitHub { owner = "facette"; diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 1004947d5b1..502ff10b092 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "reporter-${version}"; + pname = "reporter"; version = "2.1.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c9e6da89d93..570dd0ff20e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "6.3.2"; - name = "grafana-${version}"; + pname = "grafana"; goPackagePath = "github.com/grafana/grafana"; excludedPackages = [ "release_publisher" ]; diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 969a58aff85..f33a418fe5c 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "kapacitor-${version}"; + pname = "kapacitor"; version = "1.5.1"; goPackagePath = "github.com/influxdata/kapacitor"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index af5f2880a0f..cc67bdfa56d 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -2,7 +2,7 @@ , doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: stdenv.mkDerivation rec { - name = "lcdproc-${version}"; + pname = "lcdproc"; version = "0.5.9"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 223026c3b41..ed37c7f3987 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "0.2.0"; - name = "grafana-loki-${version}"; + pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; doCheck = true; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 45e380379d2..5459d58ceb9 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.5"; - name = "longview-${version}"; + pname = "longview"; src = fetchFromGitHub { owner = "linode"; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 5044aef2bb5..31a6501ea3a 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, gotools, buildGoPackage }: buildGoPackage rec { - name = "mtail-${version}"; + pname = "mtail"; version = "3.0.0-rc4"; goPackagePath = "github.com/google/mtail"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 34beada87e8..183cc3a2b95 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.0.49"; - name = "munin-${version}"; + pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 92713a43ea2..475d79a090a 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }: stdenv.mkDerivation rec { - name = "nagios-${version}"; + pname = "nagios"; version = "4.4.4"; src = fetchurl { - url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57"; }; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index cdfd8ab9bee..35d02a5f9e2 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }: stdenv.mkDerivation rec { - name = "check_ssl_cert-${version}"; + pname = "check_ssl_cert"; version = "1.80.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 401f9ffc406..2dc1bdf9681 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "newrelic-sysmond-${version}"; + pname = "newrelic-sysmond"; version = "2.3.0.132"; src = fetchurl { diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 9f03c9ea96f..79303849156 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "check-uptime-${version}"; + pname = "check-uptime"; version = "20161112"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index e104f31a74d..95e2822d65b 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "alertmanager-${version}"; + pname = "alertmanager"; version = "0.16.2"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index db58c7e14e5..07c8a14ce0b 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "bind_exporter-${version}"; + pname = "bind_exporter"; version = "20161221-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 9803ba09e16..970f49713a3 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "blackbox_exporter-${version}"; + pname = "blackbox_exporter"; version = "0.14.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 0d6fbac60e5..ce4bacfc9b7 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "collectd-exporter-${version}"; + pname = "collectd-exporter"; version = "0.3.1"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 47abcb33ee7..aaee2e8d770 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul_exporter-${version}"; + pname = "consul_exporter"; version = "0.3.0"; goPackagePath = "github.com/prometheus/consul_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e43488bbaae..b01fa0024de 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dnsmasq_exporter-${version}"; + pname = "dnsmasq_exporter"; version = "0.1.0"; goPackagePath = "github.com/google/dnsmasq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 5a3fd23ec22..6f6370ce14d 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dovecot_exporter-${version}"; + pname = "dovecot_exporter"; version = "0.1.3"; goPackagePath = "github.com/kumina/dovecot_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 071035b2a4a..95b0db7dbc6 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "fritzbox-exporter-${version}"; + pname = "fritzbox-exporter"; version = "v1.0-32-g90fc0c5"; rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index b2a0e387589..4a84db38f78 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "haproxy_exporter-${version}"; + pname = "haproxy_exporter"; version = "0.8.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index aeb7b7445a5..f126b8a7da1 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -2,7 +2,7 @@ { buildGoPackage, fetchFromGitHub, fetchpatch, lib }: buildGoPackage rec { - name = "prometheus-json-exporter-${version}"; + pname = "prometheus-json-exporter"; version = "unstable-2017-10-06"; goPackagePath = "github.com/kawamuray/prometheus-json-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 129c2b33372..21c6c8da643 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mailexporter-${version}"; + pname = "mailexporter"; version = "2019-07-14"; goPackagePath = "github.com/cherti/mailexporter"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ade9bb87d99..04fbc7fbed9 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mesos_exporter-${version}"; + pname = "mesos_exporter"; version = "0.1.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 8b6c54d41f9..7d460773802 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "minio-exporter-${version}"; + pname = "minio-exporter"; version = "0.2.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 9180a511349..a7934227ffa 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mysqld_exporter-${version}"; + pname = "mysqld_exporter"; version = "0.10.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 963315f00c1..c51574610e8 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "nginx_exporter-${version}"; + pname = "nginx_exporter"; version = "0.4.2"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 80ad4a32be7..d0f55226d2f 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "node_exporter-${version}"; + pname = "node_exporter"; version = "0.17.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index eac962f7560..5dfada4f55d 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "openvpn_exporter-unstable-${version}"; + pname = "openvpn_exporter-unstable"; version = "2017-05-15"; rev = "a2a179a222144fa9a10030367045f075375a2803"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 97df26aea4e..01d9ec02833 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { - name = "postfix_exporter-${version}"; + pname = "postfix_exporter"; version = "0.1.2"; goPackagePath = "github.com/kumina/postfix_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index ffa71f3ad0c..57574481cf6 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "postgres_exporter-${version}"; + pname = "postgres_exporter"; version = "0.5.1"; goPackagePath = "github.com/wrouesnel/postgres_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 5e4ebb58140..efe146c843f 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "prom2json-${version}"; + pname = "prom2json"; version = "0.1.0"; rev = "${version}"; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1c00f734c19..48afc610c61 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "pushgateway-${version}"; + pname = "pushgateway"; version = "0.8.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 34120ad3fda..331503dfe7d 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "rabbitmq_exporter-${version}"; + pname = "rabbitmq_exporter"; version = "0.25.2"; goPackagePath = "github.com/kbudde/rabbitmq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index be8fbd3d85c..cbafabb18b5 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { - name = "snmp_exporter-${version}"; + pname = "snmp_exporter"; version = "0.13.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 792e0b33aee..f4aa8344f77 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "statsd_exporter-${version}"; + pname = "statsd_exporter"; version = "0.9.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 0c5cc626765..07b5055831e 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "surfboard_exporter-${version}"; + pname = "surfboard_exporter"; version = "2.0.0"; goPackagePath = "github.com/ipstatic/surfboard_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 18fa3f98db2..cd72f98ecfb 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "unifi-exporter-${version}"; + pname = "unifi-exporter"; version = "0.4.0+git1"; rev = "9a4e69fdea91dd0033bda4842998d751b40a6130"; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 50325144fca..9de6e6923e3 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "riemann-${version}"; + pname = "riemann"; version = "0.3.3"; src = fetchurl { - url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq"; }; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index ab8365c23f8..eb98e45c36c 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "seyren-${version}"; + pname = "seyren"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index ee3b9d818ce..dfe2bdb71b2 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "telegraf-${version}"; + pname = "telegraf"; version = "1.10.2"; goPackagePath = "github.com/influxdata/telegraf"; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index 4c3479d8662..fe90d4d6408 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, jre}: stdenv.mkDerivation rec { version = "1.28.1"; - name = "zipkin-server-${version}"; + pname = "zipkin-server"; src = fetchurl { url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index d8aed78e28a..76b00b4cb29 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.16"; - name = "libmpdclient-${version}"; + pname = "libmpdclient"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 740fd4739ab..7fcb5f94579 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -39,7 +39,7 @@ let minor = "23"; in stdenv.mkDerivation rec { - name = "mpd-${version}"; + pname = "mpd"; version = "${major}${if minor == "" then "" else "." + minor}"; src = fetchFromGitHub { diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 04daa2f4a85..bfcc7aeacff 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -3,7 +3,7 @@ , systemd ? null, withSystemd ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "mosquitto-${version}"; + pname = "mosquitto"; version = "1.6.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index cc73b2e1f6f..079c877ab7a 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "nats-streaming-server-${version}"; + pname = "nats-streaming-server"; version = "0.11.2"; rev = "v${version}"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a78d2e26bf7..b3adb4007f4 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nextcloud-${version}"; + pname = "nextcloud"; version = "16.0.3"; src = fetchurl { - url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; + url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; sha256 = "1ww1517i05gaf71szx0qpdc87aczllcb39cvc8c26dm18z76hgx1"; }; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index d7c36b0cb41..a89604c4e7c 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, stdenv }: buildGoPackage rec { - name = "nginx-sso-${version}"; + pname = "nginx-sso"; version = "0.16.1"; rev = "v${version}"; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index c5290709b62..ccd8a9b0237 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }: stdenv.mkDerivation rec { - name = "aerospike-server-${version}"; + pname = "aerospike-server"; version = "4.2.0.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 05f572c8caa..fd0a97d029d 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { - name = "cassandra-${version}"; + pname = "cassandra"; inherit version; src = fetchurl { inherit sha256; - url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${pname}-${version}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper coreutils ]; @@ -30,16 +30,16 @@ stdenv.mkDerivation rec { mv * $out # Clean up documentation. - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} mv $out/CHANGES.txt \ $out/LICENSE.txt \ $out/NEWS.txt \ $out/NOTICE.txt \ $out/javadoc \ - $out/share/doc/${name} + $out/share/doc/${pname}-${version} if [[ -d $out/doc ]]; then - mv "$out/doc/"* $out/share/doc/${name} + mv "$out/doc/"* $out/share/doc/${pname}-${version} rmdir $out/doc fi diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f3035e13140..ff4a7f07ec0 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { - name = "EventStore-${version}"; + pname = "EventStore"; version = "5.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 9b173e538d3..f471017a336 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "neo4j-${version}"; + pname = "neo4j"; version = "3.5.8"; src = fetchurl { diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 0ce948c715e..94c58096f16 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "5.0.5"; - name = "redis-${version}"; + pname = "redis"; src = fetchurl { - url = "http://download.redis.io/releases/${name}.tar.gz"; + url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91"; }; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index d6ee407e341..e000eb8ba4d 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "rethinkdb-${version}"; + pname = "rethinkdb"; version = "2.3.6"; src = fetchurl { - url = "https://download.rethinkdb.com/dist/${name}.tgz"; + url = "https://download.rethinkdb.com/dist/${pname}-${version}.tgz"; sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4"; }; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index d48587c924e..19352984712 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "nsq-${version}"; + pname = "nsq"; version = "0.3.5"; rev = "v${version}"; diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 22f09994ebf..6fbabc3d003 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -7,7 +7,7 @@ with (import ./srcs.nix { inherit fetchurl; }); stdenv.mkDerivation rec { - name = "openafs-${version}"; + pname = "openafs"; inherit version srcs; nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ]; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index c77bef6ad24..23e1cfae47c 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -8,7 +8,7 @@ with (import ./srcs.nix { inherit fetchurl; }); stdenv.mkDerivation rec { - name = "openafs-${version}"; + pname = "openafs"; inherit version srcs; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 8eca1fb7790..c0018529ea8 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { - name = "osrm-backend-${version}"; + pname = "osrm-backend"; version = "5.22.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index 1f58c309aa5..67e125d7a8c 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "p910nd-${version}"; + pname = "p910nd"; version = "0.97"; src = fetchurl { sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa"; - url = "mirror://sourceforge/p910nd/${name}.tar.bz2"; + url = "mirror://sourceforge/p910nd/${pname}-${version}.tar.bz2"; }; postPatch = '' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 84d4d04cac7..588483b8343 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { version = "1.16.3.1402-22929c8a2"; pname = "plexmediaserver"; - name = "${pname}-${version}"; # Fetch the source src = fetchurl { diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index a7a0791b852..a6b65cde89f 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "polipo-${version}"; + pname = "polipo"; version = "1.1.1"; src = fetchurl { - url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${name}.tar.gz"; + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz"; sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2"; }; diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 6aaaf95fae1..86a96dde540 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "ps3netsrv-${version}"; + pname = "ps3netsrv"; version = "1.1.0"; enableParallelBuilding = true; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 1d8f0c36cae..fc130965cf1 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -2,11 +2,11 @@ pkgconfig, c-ares }: stdenv.mkDerivation rec { - name = "quagga-${version}"; + pname = "quagga"; version = "1.2.4"; src = fetchurl { - url = "mirror://savannah/quagga/${name}.tar.gz"; + url = "mirror://savannah/quagga/${pname}-${version}.tar.gz"; sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73"; }; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index a293643a6f6..854f73be187 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: stdenv.mkDerivation rec { - name = "radarr-${version}"; + pname = "radarr"; version = "0.2.0.1358"; src = fetchurl { @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/${name}} - cp -r * $out/share/${name}/. + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/. makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ - --add-flags "$out/share/${name}/Radarr.exe" \ + --add-flags "$out/share/${pname}-${version}/Radarr.exe" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 13db868845a..bfc681c921b 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "radicale-${version}"; + pname = "radicale"; version = "1.1.6"; src = fetchurl { diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 3dcb6605a61..4000c25acea 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -100,7 +100,7 @@ let fetchSubmodules = false; }; in stdenv.mkDerivation rec { - name = "rippled-${version}"; + pname = "rippled"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index fc28f621959..c8fd5c059a8 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -2,7 +2,7 @@ , useSystemd ? true, systemd }: stdenv.mkDerivation rec { - name = "rpcbind-${version}"; + pname = "rpcbind"; version = "1.2.5"; src = fetchgit { diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index b2e40a8ede0..4d8ead30add 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -31,12 +31,12 @@ # # Good luck. stdenv.mkDerivation rec { - name = "rt-${version}"; + pname = "rt"; version = "4.4.4"; src = fetchurl { - url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; + url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz"; sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl"; }; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 364fcb118ce..57c774ebcb0 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -6,7 +6,6 @@ let in stdenv.mkDerivation rec { version = "2.3.9"; pname = "sabnzbd"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2a4093d412f..4ec00506b33 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -19,11 +19,11 @@ with lib; stdenv.mkDerivation rec { - name = "samba-${version}"; + pname = "samba"; version = "4.10.6"; src = fetchurl { - url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; + url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy"; }; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 6142d751dab..c64687054ab 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -5,10 +5,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = elk5Version; - name = "elasticsearch-${version}"; + pname = "elasticsearch"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz"; sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb"; }; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index f86596150ea..cf7caed3984 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { - name = "groonga-${version}"; + pname = "groonga"; version = "9.0.5"; src = fetchurl { - url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; + url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; sha256 = "15y5dddvziw9lbl24z4j5yf1ibv79bn052lmx08rbxh78777csw3"; }; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 4c5f71cb37d..585fc2b73ef 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "serf-${version}"; + pname = "serf"; version = "0.8.1"; rev = "v${version}"; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 2ab3bf66685..03d86c209f0 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "serviio-${version}"; + pname = "serviio"; version = "2.0"; src = fetchurl { - url = "http://download.serviio.org/releases/${name}-linux.tar.gz"; + url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz"; sha256 = "1zq1ax0pdxfn0nw0vm7s23ik47w8nwh1n83a7yka8dnknxjf5nng"; }; diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index e5312b92902..1c726c47764 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -2,7 +2,7 @@ , avahi, libao }: stdenv.mkDerivation rec { - name = "shairplay-unstable-${version}"; + pname = "shairplay-unstable"; version = "2018-08-24"; src = fetchFromGitHub { diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 639fa322525..40b88c34e8d 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.3.2"; - name = "shairport-sync-${version}"; + pname = "shairport-sync"; src = fetchFromGitHub { sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w"; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 70bf5c32b3d..af1992fc869 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.20"; - name = "shellinabox-${version}"; + pname = "shellinabox"; src = fetchFromGitHub { owner = "shellinabox"; diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index 083a224d155..3ac32509ba3 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "simplehttp2server-${version}"; + pname = "simplehttp2server"; version = "3.1.3"; goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server"; diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index deeeabda745..b6a24e94ee0 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: stdenv.mkDerivation rec { - name = "sks-${version}"; + pname = "sks"; version = "1.1.6"; src = fetchFromBitbucket { diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 82d79785b11..340ef36ac59 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "skydns-${version}"; + pname = "skydns"; version = "2.5.3a"; rev = "${version}"; diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 3409fc00066..730d1bbdddc 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: stdenv.mkDerivation rec { - name = "smcroute-${version}"; + pname = "smcroute"; version = "2.4.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index 7eaa5b3e8a0..2b21bef7d6f 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "softether-${version}"; + pname = "softether"; version = "4.25"; build = "9656"; compiledDate = "2018.01.15"; diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix index e26e8f057b6..1d80752a41a 100644 --- a/pkgs/servers/softether/4.29.nix +++ b/pkgs/servers/softether/4.29.nix @@ -3,7 +3,7 @@ , dataDir ? "/var/lib/softether" }: stdenv.mkDerivation rec { - name = "softether-${version}"; + pname = "softether"; version = "4.29"; build = "9680"; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 12cd3bfaad9..afaa8edcc14 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: stdenv.mkDerivation rec { - name = "sonarr-${version}"; + pname = "sonarr"; version = "2.0.0.5322"; src = fetchurl { diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 22ec301bced..a34b7f03be8 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -12,7 +12,7 @@ let in buildGoPackage rec { - name = "cockroach-${version}"; + pname = "cockroach"; version = "19.1.1"; goPackagePath = "github.com/cockroachdb/cockroach"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7d34dd8d63b..ac14015c4cf 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -218,7 +218,7 @@ server = stdenv.mkDerivation (common // { }); connector-c = stdenv.mkDerivation rec { - name = "mariadb-connector-c-${version}"; + pname = "mariadb-connector-c"; version = "2.3.7"; src = fetchurl { @@ -259,7 +259,7 @@ connector-c = stdenv.mkDerivation rec { }; galera = stdenv.mkDerivation rec { - name = "mariadb-galera-${version}"; + pname = "mariadb-galera"; version = "25.3.26"; src = fetchFromGitHub { @@ -286,7 +286,7 @@ galera = stdenv.mkDerivation rec { installPhase = '' # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${name}" + GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} install -m 555 "garb/garbd" "$out/bin/garbd" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index a50d623acbc..062de0c2368 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "oracle-xe-${version}"; + pname = "oracle-xe"; version = "11.2.0"; src = requireFile { - name = "${name}-1.0.x86_64.rpm"; + name = "${pname}-${version}-1.0.x86_64.rpm"; sha256 = "0s2jj2xn56v5ys6hxb7l7045hw9c1mm1lhj4p2fvqbs02kqchab6"; url = "http://www.oracle.com/technetwork/" @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; unpackCmd = '' - (mkdir -p "${name}" && cd "${name}" && + (mkdir -p "${pname}-${version}" && cd "${pname}-${version}" && ${rpmextract}/bin/rpmextract "$curSrc") ''; diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index c77330bd2ac..7f8f0786e03 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }: stdenv.mkDerivation rec { - name = "percona-server-${version}"; + pname = "percona-server"; version = "5.6.43-84.3"; src = fetchurl { diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 3b4a0543e18..ccf8ac264e9 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, libevent }: stdenv.mkDerivation rec { - name = "pgbouncer-${version}"; + pname = "pgbouncer"; version = "1.10.0"; src = fetchurl { - url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; + url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q"; }; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 3db62aa491c..6a9423bc4e4 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -3,11 +3,10 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; version = "4.0.5"; - name = "${pname}-${version}"; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz"; sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 711ad35bcc1..ca3c3af74f2 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -20,11 +20,11 @@ let icuEnabled = atLeast "10"; in stdenv.mkDerivation rec { - name = "postgresql-${version}"; + pname = "postgresql"; inherit version; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index f2e814543db..71fe9a72b56 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, protobufc }: stdenv.mkDerivation rec { - name = "cstore_fdw-${version}"; + pname = "cstore_fdw"; version = "1.6.2"; nativeBuildInputs = [ protobufc ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index bccec1107b9..c7978aa6860 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { - name = "pg_hll-${version}"; + pname = "pg_hll"; version = "2.12"; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 381a174838e..7b64de381f3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { - name = "pg_repack-${version}"; + pname = "pg_repack"; version = "1.4.4"; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 1a5aa91ae6e..e25a6d0d54f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { - name = "pg_topn-${version}"; + pname = "pg_topn"; version = "2.2.2"; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index c68ba9b1728..ac79c1b3b38 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pgjwt-${version}"; + pname = "pgjwt"; version = "unstable-2017-04-24"; src = fetchFromGitHub { diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 7dd6a5882b2..804356e9f6b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: stdenv.mkDerivation rec { - name = "pgtap-${version}"; + pname = "pgtap"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 63b8a39b0e2..33d050497da 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -13,7 +13,7 @@ , libiconv }: stdenv.mkDerivation rec { - name = "postgis-${version}"; + pname = "postgis"; version = "2.5.2"; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 77da47b00e0..5f995995820 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -7,7 +7,7 @@ # } stdenv.mkDerivation rec { - name = "timescaledb-${version}"; + pname = "timescaledb"; version = "1.4.1"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 7be23003b58..9e3fe74aa6c 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, postgresql }: stdenv.mkDerivation rec { - name = "tsearch-extras-${version}"; + pname = "tsearch-extras"; version = "0.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index 4e40d876152..f5444bb0683 100644 --- a/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/pkgs/servers/sql/sqlite/jdbc/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "sqlite-jdbc"; - name = "${pname}-${version}"; version = "3.25.2"; src = fetchMavenArtifact { @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar" + install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 45540955759..f7b4dd84d32 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }: stdenv.mkDerivation rec { - name = "sslh-${version}"; + pname = "sslh"; version = "1.20"; src = fetchurl { diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index d074ddf4d72..67d441e76c7 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "2.1.33"; pname = "Tautulli"; - name = "${pname}-${version}"; pythonPath = [ python.pkgs.setuptools ]; buildInputs = [ python.pkgs.setuptools ]; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index 967eea25d3f..ac3dccdab73 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "tegola-${version}"; + pname = "tegola"; version = "0.8.1"; rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index e645ef2dc35..121983e7031 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, zip, fetchFromGitHub }: buildGoPackage rec { - name = "teleport-${version}"; + pname = "teleport"; version = "4.0.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index a65bf5bd916..c740e003694 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}: buildGoPackage rec { - name = "traefik-${version}"; + pname = "traefik"; version = "1.7.12"; goPackagePath = "github.com/containous/traefik"; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index fcea0f398e4..fc7d104a480 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "trezord-go-${version}"; + pname = "trezord-go"; version = "2.0.27"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index ce8947bcdda..c1694316f3e 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tt-rss-${version}"; + pname = "tt-rss"; version = "2019-01-29"; rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac"; diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 6fad061ce99..0600640155b 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { - name = "tt-rss-plugin-auth-ldap-${version}"; + pname = "tt-rss-plugin-auth-ldap"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 27416537e33..7ddc3abb0b4 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "tt-rss-plugin-ff-instagram-${version}"; + pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 src = fetchFromGitHub { diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 702b95b3f0e..7c3d6a5b57e 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "tt-rss-plugin-tumblr-gdpr-${version}"; + pname = "tt-rss-plugin-tumblr-gdpr"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index d0b279eb859..c35667546c6 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "tt-rss-theme-feedly-${version}"; + pname = "tt-rss-theme-feedly"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index bae43412e78..720d277d0d2 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - name = "ttyd-${version}"; + pname = "ttyd"; version = "1.4.2_pre${toString revCount}_${substring 0 8 src.rev}"; inherit src; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index 9e9816c941d..12f2a08c7f4 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }: stdenv.mkDerivation rec { - name = "udpt-${version}"; + pname = "udpt"; version = "2017-09-27"; enableParallelBuilding = true; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index ba628360aaa..0dfec772a18 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "uftp-${version}"; + pname = "uftp"; version = "4.10"; src = fetchurl { diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 52866784faa..6483973546c 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -4,7 +4,7 @@ assert tlsSupport -> openssl != null; stdenv.mkDerivation rec { - name = "uhub-${version}"; + pname = "uhub"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 9bccd5b99fb..3fb2817277a 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "ums-${version}"; + pname = "ums"; version = "6.2.2"; src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz"; + url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz"; sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15"; - name = "${name}.tgz"; + name = "${pname}-${version}.tgz"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 1e846487472..76efdc31705 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -48,11 +48,11 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else " in stdenv.mkDerivation rec { - name = "uwsgi-${version}"; + pname = "uwsgi"; version = "2.0.18"; src = fetchurl { - url = "https://projects.unbit.it/downloads/${name}.tar.gz"; + url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz"; sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9"; }; diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index e4dd9b0f2dc..3d43862cbe0 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "morty-${version}"; + pname = "morty"; version = "0.2.0"; goPackagePath = "github.com/asciimoo/morty"; diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index c4f49b36bf8..ef2b3b653bf 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lib } : stdenv.mkDerivation rec { - name = "pgpkeyserver-lite-${version}"; + pname = "pgpkeyserver-lite"; version = "2017-07-18"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 946606e3701..5c105e85a87 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "rstya-board-${version}"; + pname = "rstya-board"; version = "0.6"; src = fetchurl { diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 615efa3b367..f6000fc4211 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "selfoss-${version}"; + pname = "selfoss"; version = "2.18"; src = fetchurl { - url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip"; + url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip"; sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b"; }; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 64ae1dbbe1d..33db6fb6e65 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "shaarli-${version}"; + pname = "shaarli"; version = "0.11.0"; src = fetchurl { diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 5fd941e9467..ef0a4331d41 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "shaarli-material-${version}"; + pname = "shaarli-material"; version = "0.10.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 0c51b6b13cd..4be14b37bd2 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -2,7 +2,7 @@ , qtbase, libvirt, cutelyst, grantlee }: stdenv.mkDerivation rec { - name = "virtlyst-${version}"; + pname = "virtlyst"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index eafe916d02c..a105531ff4e 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wallabag-${version}"; + pname = "wallabag"; version = "2.3.8"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 0a008227b9f..af526730ca9 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "xcb-util-xrm-${version}"; + pname = "xcb-util-xrm"; src = fetchurl { - url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"; }; diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index b0d3dccf30f..c25c4baf13b 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -2,7 +2,7 @@ libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : stdenv.mkDerivation rec { - name = "biboumi-${version}"; + pname = "biboumi"; version = "8.3"; src = fetchurl { diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5db000e7a4a..2fa31fff299 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -25,10 +25,10 @@ let in stdenv.mkDerivation rec { version = "19.05"; - name = "ejabberd-${version}"; + pname = "ejabberd"; src = fetchurl { - url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; + url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz"; sha256 = "1lczck2760bcsl7vqc5xv4rizps0scdmss2zc4b1l59wzlmnfg7h"; }; diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index 0e6fcd5e989..ab377e3d53b 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "openfire-${version}"; + pname = "openfire"; version = "3_6_3"; src = fetchurl { diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 928c4832965..7bf21cbf22f 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -15,10 +15,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.11.2"; # also update communityModules - name = "prosody-${version}"; + pname = "prosody"; src = fetchurl { - url = "https://prosody.im/downloads/source/${name}.tar.gz"; + url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9"; }; diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 8df8499d11e..f5bdfd9fe85 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : stdenv.mkDerivation rec { - name = "pyIRCt-${version}"; + pname = "pyIRCt"; version = "0.4"; src = fetchurl { @@ -19,18 +19,18 @@ stdenv.mkDerivation rec { # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; installPhase = '' - mkdir -p $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${pname}-${version} sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/${name} + cp * $out/share/${pname}-${version} cat > $out/bin/pyIRCt < $out/bin/pyMAILt < libXinerama != null; stdenv.mkDerivation rec { version = "2.0.2"; - name = "setroot-${version}"; + pname = "setroot"; src = fetchFromGitHub { owner = "ttzhou"; diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 16462f5243b..4fd9678733d 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { version = "git-2015-03-01"; - name = "skippy-xd-${version}"; + pname = "skippy-xd"; inherit buildInputs; src = fetchgit { url = "https://github.com/richardgv/skippy-xd/"; diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 2b58dd6c911..30f99cd40f2 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.2"; - name = "sselp-${version}"; + pname = "sselp"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; }; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 47b54bec312..92afa30e616 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: stdenv.mkDerivation rec { - name = "virtualgl-lib-${version}"; + pname = "virtualgl-lib"; version = "2.6.2"; src = fetchurl { diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index a5a75c9df4f..f906a6d403e 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub, libX11}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "wayv"; version = "0.3"; diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index cd9d6aecdef..e8b2be4b783 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -3,12 +3,12 @@ let base = pythonPackages.buildPythonApplication rec { - name = "winswitch-${version}"; + pname = "winswitch"; namePrefix = ""; version = "0.12.23"; src = fetchurl { - url = "http://winswitch.org/src/${name}.src.tar.bz2"; + url = "http://winswitch.org/src/${pname}-${version}.src.tar.bz2"; sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9"; }; diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index 4200293ed08..fe5c70f6ce2 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libxcb }: stdenv.mkDerivation rec { - name = "wmutils-core-${version}"; + pname = "wmutils-core"; version = "1.1"; src = fetchurl { diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix index c01aa8dc75f..c1230303862 100644 --- a/pkgs/tools/X11/wmutils-opt/default.nix +++ b/pkgs/tools/X11/wmutils-opt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libxcb }: stdenv.mkDerivation rec { - name = "wmutils-opt-${version}"; + pname = "wmutils-opt"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 169f420357e..acf0fc9aabf 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -3,7 +3,7 @@ autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name = "x11vnc-${version}"; + pname = "x11vnc"; version = "0.9.16"; src = fetchFromGitHub { diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index 5a08cf5c817..d52698b0ed7 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromBitbucket, libX11}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xannotate"; version = "20150301"; diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix index 142d7d17fe7..8e838bfe906 100644 --- a/pkgs/tools/X11/xbanish/default.nix +++ b/pkgs/tools/X11/xbanish/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "1.6"; pname = "xbanish"; - name = "${pname}-${version}"; buildInputs = [ libX11 libXi libXt libXfixes libXext diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index 987293878d8..bb83effe601 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: stdenv.mkDerivation rec { - name = "xbindkeys-config-${version}"; + pname = "xbindkeys-config"; version = "0.1.3"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index 1d42f791fb5..c36334d478d 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2016-09-30"; - name = "xcwd-${version}"; + pname = "xcwd"; src = fetchFromGitHub { owner = "schischi"; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 44016b801e5..f1e6e28627c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { - name = "xdg-utils-${version}"; + pname = "xdg-utils"; version = "1.1.3"; src = fetchurl { - url = "https://portland.freedesktop.org/download/${name}.tar.gz"; + url = "https://portland.freedesktop.org/download/${pname}-${version}.tar.gz"; sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"; }; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index bb6abfa9b58..d20714befba 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: stdenv.mkDerivation rec { - name = "xdotool-${version}"; + pname = "xdotool"; version = "3.20160805.1"; src = fetchurl { diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 43b46fcb8d7..9aee0d778c4 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "xinput_calibrator"; version = "0.7.5"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz"; sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9"; diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index e3bbd599075..c22715d6181 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }: stdenv.mkDerivation rec { - name = "xkb-switch-${version}"; + pname = "xkb-switch"; version = "1.5.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix index a58d16ab82e..3bd9f525683 100644 --- a/pkgs/tools/X11/xloadimage/default.nix +++ b/pkgs/tools/X11/xloadimage/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "4.1"; - name = "xloadimage-${version}"; + pname = "xloadimage"; src = fetchurl { url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}.orig.tar.gz"; diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index fd944f40044..13a18efccba 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { - name = "xmacro-${version}"; + pname = "xmacro"; version = "0.4.6"; src = fetchurl { - url = "http://download.sarine.nl/xmacro/${name}.tar.gz"; + url = "http://download.sarine.nl/xmacro/${pname}-${version}.tar.gz"; sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61"; }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index a84f101cdf7..58569dcd59c 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "3.19"; - name = "xnee-${version}"; + pname = "xnee"; src = fetchurl { - url = "mirror://gnu/xnee/${name}.tar.gz"; + url = "mirror://gnu/xnee/${pname}-${version}.tar.gz"; sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; }; diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix index 8acabeef218..5dfe74fd373 100644 --- a/pkgs/tools/X11/xosview2/default.nix +++ b/pkgs/tools/X11/xosview2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { - name = "xosview2-${version}"; + pname = "xosview2"; version = "2.3.1"; src = fetchurl { - url = "mirror://sourceforge/xosview/${name}.tar.gz"; + url = "mirror://sourceforge/xosview/${pname}-${version}.tar.gz"; sha256 = "1drp0n6qjbxyc0104a3aw2g94rh5p218wmrqwxh3kwwm7pmr9xip"; }; diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 435f2b2e980..dfac2cf88a5 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -1,6 +1,6 @@ { stdenv, xorg, fetchgit }: stdenv.mkDerivation rec { - name = "xpointerbarrier-${version}"; + pname = "xpointerbarrier"; version = "18.06"; src = fetchgit { url = "https://www.uninformativ.de/git/xpointerbarrier.git"; diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index d6fab2b1910..770024aa4ba 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXinerama }: stdenv.mkDerivation rec { - name = "libfakeXinerama-${version}"; + pname = "libfakeXinerama"; version = "0.1.0"; src = fetchurl { - url = "https://www.xpra.org/src/${name}.tar.bz2"; + url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2"; sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx"; }; diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index e54ced714e7..b528078870a 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libX11 }: stdenv.mkDerivation rec { - name = "xrectsel-${version}"; + pname = "xrectsel"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 4f9b7bcb42e..70b471c795e 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xorg, pkgconfig, ncurses }: stdenv.mkDerivation rec { - name = "xrestop-${version}"; + pname = "xrestop"; version = "0.4"; src = fetchurl { diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index a7a7c2b6c0d..8766e3c0d54 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -3,7 +3,7 @@ , pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }: stdenv.mkDerivation rec { - name = "xsecurelock-${version}"; + pname = "xsecurelock"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 2f84711e61c..bee6cdb748f 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: stdenv.mkDerivation rec { - name = "xsettingsd-${version}"; + pname = "xsettingsd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 368012b468f..5f789a0151f 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -2,7 +2,7 @@ , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: stdenv.mkDerivation rec { - name = "xvkbd-${version}"; + pname = "xvkbd"; version = "3.9"; src = fetchurl { url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz"; diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index b6b87fffb47..7b30e5c5815 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.2"; - name = "xwinmosaic-${version}"; + pname = "xwinmosaic"; src = fetchgit { url = "https://github.com/soulthreads/xwinmosaic/"; diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 3314089d746..df0e47d71a0 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }: stdenv.mkDerivation rec { - name = "acme.sh-${version}"; + pname = "acme.sh"; version = "2.8.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix index 7ece3acbd67..5522fd7a68b 100644 --- a/pkgs/tools/admin/adtool/default.nix +++ b/pkgs/tools/admin/adtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openldap }: stdenv.mkDerivation rec { - name = "adtool-${version}"; + pname = "adtool"; version = "1.3.3"; src = fetchurl { - url = "https://gp2x.org/adtool/${name}.tar.gz"; + url = "https://gp2x.org/adtool/${pname}-${version}.tar.gz"; sha256 = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n"; }; diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 02386a135f1..b3e688c681d 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, lib, ... }: buildGoPackage rec { - name = "amazon-ecr-credential-helper-${version}"; + pname = "amazon-ecr-credential-helper"; version = "0.3.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix index 37bf0e6c45d..dff37520797 100644 --- a/pkgs/tools/admin/aws-env/default.nix +++ b/pkgs/tools/admin/aws-env/default.nix @@ -3,7 +3,6 @@ buildGoPackage rec { pname = "aws-env"; version = "0.4"; - name = "${pname}-${version}"; rev = "v${version}"; goPackagePath = "github.com/Droplr/aws-env"; diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index e03e7f34535..70f1c64c7f2 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "aws-rotate-key-${version}"; + pname = "aws-rotate-key"; version = "1.0.4"; goPackagePath = "github.com/Fullscreen/aws-rotate-key"; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 03b0ff5c001..ddecd15b6ad 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,6 +1,5 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "aws-vault"; version = "4.5.1"; diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix index 8b6395d85d0..f97a6e5df89 100644 --- a/pkgs/tools/admin/bluemix-cli/default.nix +++ b/pkgs/tools/admin/bluemix-cli/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bluemix-cli-${version}"; + pname = "bluemix-cli"; version = "0.8.0"; src = diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 3ac9e3c0e94..e4b27d98dff 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxslt, docbook_xsl, libcap }: stdenv.mkDerivation rec { - name = "bubblewrap-${version}"; + pname = "bubblewrap"; version = "0.3.3"; src = fetchurl { - url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"; }; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index e6ce5d07798..61f284cf85f 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -2,7 +2,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cli53-${version}"; + pname = "cli53"; version = "0.8.12"; goPackagePath = "github.com/barnybug/cli53"; diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 71bef380544..a71958f8a09 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "docker-credential-gcr-${version}"; + pname = "docker-credential-gcr"; version = "1.4.3"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index 3dbc8eea87b..afb044ad583 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -1,14 +1,13 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fastlane"; version = (import ./gemset.nix).fastlane.version; nativeBuildInputs = [ makeWrapper ]; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; inherit pname ruby; gemdir = ./.; }; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 91f233df81d..b35fe709f95 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -29,10 +29,10 @@ let }.${system}; in stdenv.mkDerivation rec { - name = "google-cloud-sdk-${version}"; + pname = "google-cloud-sdk"; version = "255.0.0"; - src = fetchurl (sources name stdenv.hostPlatform.system); + src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); buildInputs = [ python makeWrapper ]; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index ec31d3ebbe9..9269b2c7cda 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -5,13 +5,13 @@ , python3 }: stdenv.mkDerivation rec { - name = "gtk-vnc-${version}"; + pname = "gtk-vnc"; version = "0.9.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is"; }; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index d4ee4d61293..e09cd2f5285 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "iamy-${version}"; + pname = "iamy"; version = "2.3.2"; goPackagePath = "github.com/99designs/iamy"; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index ebdf6b17ed6..2df63ea1e15 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -20,7 +20,7 @@ let in stdenv.mkDerivation rec { inherit version; - name = "pulumi-${version}"; + pname = "pulumi"; src = fetchurl pulumiArchPackage.${stdenv.hostPlatform.system}; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index b246c7712ec..3365d87bba4 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec{ - name = "scaleway-cli-${version}"; + pname = "scaleway-cli"; version = "1.17"; goPackagePath = "github.com/scaleway/scaleway-cli"; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index f8e89307815..e6a83c397c5 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { pname = "ssl-cert-check"; - name = "${pname}-${version}"; version = "3.31"; src = fetchFromGitHub { diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 37a0f47c7af..5a964a7fe70 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.9.0"; - name = "tigervnc-${version}"; + pname = "tigervnc"; src = fetchFromGitHub { owner = "TigerVNC"; diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix index 0d983ad98ea..538464499fa 100644 --- a/pkgs/tools/admin/vncdo/default.nix +++ b/pkgs/tools/admin/vncdo/default.nix @@ -4,7 +4,6 @@ pythonPackages.buildPythonPackage rec { pname = "vncdo"; version = "0.11.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sibson"; diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 0014febf40e..13da95a28b5 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/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index c2e7f75fc7f..caf507670f4 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 3b212b186aa..465bc474a9e 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 f99ee963dbe..b9eaf3dba65 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 d5349900756..48e5cc6c436 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 217a8ab35a9..61e60996e75 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 89bb816aa57..9d072c9bb19 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 b9c549d670b..e1cac4fc61f 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 2a51e4d7bc9..07f62fa02ad 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 3febb557bf8..cfab2443032 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 3c52e1944d8..9d58bf5c2f8 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 07e76ea7f62..ff98e96655f 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 9860c2b34bd..07684155a7e 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 c99221b36ba..09c4e914bd8 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 { diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 6c587f5cc5c..39ad4626f3e 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }: stdenv.mkDerivation rec { - name = "abcm2ps-${version}"; + pname = "abcm2ps"; version = "8.14.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 572c66a01d6..4ee9ef352bb 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "abcMIDI-${version}"; + pname = "abcMIDI"; version = "2019.08.02"; src = fetchzip { - url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; + url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; sha256 = "1iz4m86lc4nyf312qk749kgvq60g6x1zn2y70859g16ki16mk8m3"; }; diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix index 502859cd52d..4590a0dfbc3 100644 --- a/pkgs/tools/audio/accuraterip-checksum/default.nix +++ b/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libsndfile }: stdenv.mkDerivation rec { - name = "accuraterip-checksum-${version}"; + pname = "accuraterip-checksum"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 4c28c4f3458..acd205a30de 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: stdenv.mkDerivation rec { - name = "acoustid-fingerprinter-${version}"; + pname = "acoustid-fingerprinter"; version = "0.6"; src = fetchurl { url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" - + "${name}.tar.gz"; + + "${pname}-${version}.tar.gz"; sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix index 825e1a0cc07..21adf3b972a 100644 --- a/pkgs/tools/audio/aucdtect/default.nix +++ b/pkgs/tools/audio/aucdtect/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "aucdtext-${version}"; + pname = "aucdtext"; version = "0.8-2"; src = fetchurl { diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 38902f234a2..75d8975ab32 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "beets-alternatives-${version}"; + pname = "beets-alternatives"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 3cfb9a05b2d..c5f7bcd5a71 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "darkice-${version}"; + pname = "darkice"; version = "1.3"; src = fetchurl { diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix index 6524bedf939..fbf90d2211c 100644 --- a/pkgs/tools/audio/ezstream/default.nix +++ b/pkgs/tools/audio/ezstream/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }: stdenv.mkDerivation rec { - name = "ezstream-${version}"; + pname = "ezstream"; version = "0.6.0"; src = fetchurl { - url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz"; + url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${pname}-${version}.tar.gz"; sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9"; }; diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 23a33122c9f..665e2da3329 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.0.10"; - name = "glyr-${version}"; + pname = "glyr"; src = fetchFromGitHub { owner = "sahib"; diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix index 08bd864792b..bfb4f81c816 100644 --- a/pkgs/tools/audio/mpdas/default.nix +++ b/pkgs/tools/audio/mpdas/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }: stdenv.mkDerivation rec { - name = "mpdas-${version}"; + pname = "mpdas"; version = "0.4.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 5b5a0d9c0e0..3b59d5aceb0 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -8,7 +8,7 @@ let }; in stdenv.mkDerivation rec { version = "20161228"; - name = "mpdcron-${version}"; + pname = "mpdcron"; src = fetchFromGitHub { owner = "alip"; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 4b72ed3bfd3..d13dfbe8f43 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "mpDris2"; - name = "${pname}-${version}"; version = "0.8"; src = fetchurl { diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index c0f0aa1bf93..782ea314359 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pasystray-${version}"; + pname = "pasystray"; version = "0.7.1"; src = fetchFromGitHub { owner = "christophgysin"; repo = "pasystray"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"; }; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index cda89302abd..8a8cd258145 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,7 +1,7 @@ { stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }: stdenv.mkDerivation rec { - name = "playerctl-${version}"; + pname = "playerctl"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 9906fa449dd..5b27a00a955 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { - name = "pnmixer-${version}"; + pname = "pnmixer"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index a4dd7197be0..d72cb856437 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }: stdenv.mkDerivation rec { - name = "trx-unstable-${version}"; + pname = "trx-unstable"; version = "2018-01-23"; src = fetchgit { diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index ed955876250..36afd11aa2c 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -1,7 +1,7 @@ { pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }: stdenv.mkDerivation rec { - name = "volumeicon-${version}"; + pname = "volumeicon"; version = "0.5.1"; src = fetchurl { diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index ad0001f22e1..ce77ebe8c1a 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -11,14 +11,14 @@ let withGlusterfs = "\${with_glusterfs_directory}"; in stdenv.mkDerivation rec { - name = "bareos-${version}"; + pname = "bareos"; version = "17.2.7"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; - name = "${name}-src"; + name = "${pname}-${version}-src"; sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz"; }; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dfa28203dbf..9fd3e854065 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -2,11 +2,11 @@ , utillinux, asciidoc, makeWrapper }: stdenv.mkDerivation rec { - name = "btrbk-${version}"; + pname = "btrbk"; version = "0.28.0"; src = fetchurl { - url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; + url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf"; }; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 8aa2d015205..5c0be4a2de7 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -2,7 +2,7 @@ , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { - name = "burp-${version}"; + pname = "burp"; version = "2.2.18"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 3ab1eba5b6f..736a3122a6f 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "chunksync-${version}"; + pname = "chunksync"; src = fetchurl { url = "https://chunksync.florz.de/chunksync_${version}.tar.gz"; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index ac01dc6022b..352f320dadf 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.6.5"; - name = "dar-${version}"; + pname = "dar"; src = fetchurl { - url = "mirror://sourceforge/dar/${name}.tar.gz"; + url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd"; }; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 3a5ffc30f8f..97d876da127 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -1,8 +1,6 @@ { buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }: buildGoPackage rec { - - name = "${pname}-${version}"; pname = "diskrsync"; version = "unstable-2018-02-03"; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index c774711b874..be039fa47c0 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, mono, sqlite, makeWrapper }: stdenv.mkDerivation rec { - name = "duplicati-${version}"; + pname = "duplicati"; version = "2.0.4.5"; channel = "beta"; build_date = "2018-11-28"; @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/${name}} - cp -r * $out/share/${name} + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ - --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \ + --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ sqlite ]} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ - --add-flags "$out/share/${name}/Duplicati.Server.exe" \ + --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ sqlite ]} ''; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index d476b797f38..3e4375cb76c 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "duply-${version}"; + pname = "duply"; version = "2.2"; src = fetchurl { diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix index ceb6feae396..412c9696d02 100644 --- a/pkgs/tools/backup/easysnap/default.nix +++ b/pkgs/tools/backup/easysnap/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, zfs }: stdenv.mkDerivation rec { - name = "easysnap-${version}"; + pname = "easysnap"; version = "unstable-2019-02-17"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index 224b8b12906..739f14ca1a6 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { - name = "flockit-${version}"; + pname = "flockit"; version = "2012-08-11"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 6d761354b6a..6fe614195a4 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.49.2"; - name = "httrack-${version}"; + pname = "httrack"; src = fetchurl { url = "https://mirror.httrack.com/httrack-${version}.tar.gz"; diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index e29acc6f3c8..8cf3eb29462 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -2,11 +2,11 @@ , httrack, qtbase, qtmultimedia }: stdenv.mkDerivation rec { - name = "httraqt-${version}"; + pname = "httraqt"; version = "1.4.9"; src = fetchurl { - url = "mirror://sourceforge/httraqt/${name}.tar.gz"; + url = "mirror://sourceforge/httraqt/${pname}-${version}.tar.gz"; sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b"; }; diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index e8787855125..5538b45c5f1 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.5"; - name = "mydumper-${version}"; + pname = "mydumper"; src = fetchFromGitHub { owner = "maxbube"; diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 279652b0cd0..e07eb33abb5 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.1"; - name = "ori-${version}"; + pname = "ori"; src = fetchurl { url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz"; diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 021f783e0fd..fa4346c8ccc 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "partclone-${version}"; + pname = "partclone"; version = "0.3.11"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 712d0af29a9..98eae9cc670 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "percona-xtrabackup-${version}"; + pname = "percona-xtrabackup"; version = "2.4.12"; src = fetchFromGitHub { owner = "percona"; repo = "percona-xtrabackup"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan"; }; diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix index 33e3c77db88..56f9c4f9daf 100644 --- a/pkgs/tools/backup/rdup/default.nix +++ b/pkgs/tools/backup/rdup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }: stdenv.mkDerivation rec { - name = "rdup-${version}"; + pname = "rdup"; version = "1.1.15"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index da44e389bdd..b78fc9b61f7 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "restic-${version}"; + pname = "restic"; version = "0.9.5"; goPackagePath = "github.com/restic/restic"; diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index d9f889897aa..c7f12cb751b 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "restic-rest-server-${version}"; + pname = "restic-rest-server"; version = "0.9.7"; goPackagePath = "github.com/restic/rest-server"; diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix index 96bbea4791e..4c13c831ba9 100644 --- a/pkgs/tools/backup/rsbep/default.nix +++ b/pkgs/tools/backup/rsbep/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, coreutils, gnused, gawk, fetchurl }: stdenv.mkDerivation rec { - name = "rsbep-${version}"; + pname = "rsbep"; version = "0.1.0"; src = fetchurl { diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 7324f75d95f..a0f568b16b3 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "3.5"; - name = "store-backup-${version}"; + pname = "store-backup"; enableParallelBuilding = true; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 3767a377cfc..d24da778dcd 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "tarsnap-${version}"; + pname = "tarsnap"; version = "1.0.39"; src = fetchurl { diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 3b66ac1b491..c5a9ad4b3f9 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }: pythonPackages.buildPythonApplication rec { - name = "wal-e-${version}"; + pname = "wal-e"; version = "0.6.10"; namePrefix = ""; diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index ce9237a7c6b..70cc8a425c1 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, brotli }: buildGoPackage rec { - name = "wal-g-${version}"; + pname = "wal-g"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index c9fb1c54726..928ba9842b2 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : stdenv.mkDerivation rec { - name = "zbackup-${version}"; + pname = "zbackup"; version = "1.4.4"; src = fetchurl { url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz"; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 84a2375302f..b28e50d54b0 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -8,11 +8,11 @@ let binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; in stdenv.mkDerivation rec { - name = "blueman-${version}"; + pname = "blueman"; version = "2.0.8"; src = fetchurl { - url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4"; }; diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index f13db4572e0..097b7ae00d7 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bluez-alsa-${version}"; + pname = "bluez-alsa"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 0cdcd4c58df..4ddc7554294 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { - name = "refind-${version}"; + pname = "refind"; version = "0.11.4"; srcName = "refind-src-${version}"; diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index 63a429e50de..ccf632dfe5a 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -3,13 +3,13 @@ , vorbis-tools, xorriso }: stdenv.mkDerivation rec { - name = "bashburn-${version}"; + pname = "bashburn"; version = "3.1.0"; src = fetchurl { sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp"; url = "http://bashburn.dose.se/index.php?s=file_download&id=25"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ utillinux ]; diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index aa47edcb96c..b4f0d1039ed 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bchunk-${version}"; + pname = "bchunk"; version = "1.2.2"; src = fetchurl { - url = "http://he.fi/bchunk/${name}.tar.gz"; + url = "http://he.fi/bchunk/${pname}-${version}.tar.gz"; sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7"; }; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 402073ff524..a9f5b321d3d 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { version = "${major}.${minor}"; - name = "brasero-${version}"; + pname = "brasero"; src = fetchurl { - url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; + url = "http://download.gnome.org/sources/brasero/${major}/${pname}-${version}.tar.xz"; sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"; }; diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix index a65f2d47d8f..00a1864b035 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cdi2iso-${version}"; + pname = "cdi2iso"; version = "0.1"; src = fetchurl { - url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz"; + url = "mirror://sourceforge/cdi2iso.berlios/${pname}-${version}-src.tar.gz"; sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh"; }; diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix index 888711a8501..d617a9a6c54 100644 --- a/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "cdimgtools-${version}"; + pname = "cdimgtools"; version = "0.3"; src = fetchFromRepoOrCz { diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 6523c8a0cf3..970b32eb08f 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cue2pops-${version}"; + pname = "cue2pops"; version = "git-2018-01-04"; src = fetchFromGitHub { diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 99908f06b10..2cb90129ed9 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dvd-vr-${version}"; + pname = "dvd-vr"; version = "0.9.7"; src = fetchurl { url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz"; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 82f1842e963..6a4161ba1fa 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dvdisaster-${version}"; + pname = "dvdisaster"; version = "0.79.5"; src = fetchurl { - url = "http://dvdisaster.net/downloads/${name}.tar.bz2"; + url = "http://dvdisaster.net/downloads/${pname}-${version}.tar.bz2"; sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"; }; diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix index ec814d97bde..922ab39063a 100644 --- a/pkgs/tools/cd-dvd/ecm-tools/default.nix +++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ecm-tools-${version}"; + pname = "ecm-tools"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix index f33ba31beee..dbad9d36247 100644 --- a/pkgs/tools/cd-dvd/mdf2iso/default.nix +++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit}: stdenv.mkDerivation rec { - name = "mdf2iso-${version}"; + pname = "mdf2iso"; version = "0.3.1"; src = fetchgit { diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix index 0a9d61e9da8..357992d7291 100644 --- a/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/pkgs/tools/cd-dvd/mkcue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mkcue-${version}"; + pname = "mkcue"; version = "1"; src = fetchurl { diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index 98853d1ba61..43ed7ea7d38 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "nrg2iso-${version}"; + pname = "nrg2iso"; version = "0.4"; src = fetchurl { - url = "http://gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz"; + url = "http://gregory.kokanosky.free.fr/v4/linux/${pname}-${version}.tar.gz"; sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115"; }; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 502937dd565..9495f8dac99 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -2,7 +2,7 @@ , p7zip, mtools, syslinux }: stdenv.mkDerivation rec { - name = "unetbootin-${version}"; + pname = "unetbootin"; version = "661"; src = fetchFromGitHub { diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 4f288b9e56f..8bee8059fe2 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, zlib }: stdenv.mkDerivation rec { - name = "advancecomp-${version}"; + pname = "advancecomp"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index a3987085c8e..33b6f12cd46 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -3,7 +3,7 @@ # ?TODO: there's also python lib in there stdenv.mkDerivation rec { - name = "brotli-${version}"; + pname = "brotli"; version = "1.0.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index 4c88e58e6c1..c1ddb242dad 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openmp ? null }: stdenv.mkDerivation rec { - name = "bsc-${version}"; + pname = "bsc"; version = "3.1.0"; src = fetchurl { diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 617d86e7f1e..a5b527d70b7 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bzip2 }: stdenv.mkDerivation rec { - name = "bsdiff-${version}"; + pname = "bsdiff"; version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${name}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index a0ec6c07055..a440c08bd1b 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "bzip2-${version}"; + pname = "bzip2"; version = "1.0.6.0.1"; /* We use versions patched to use autotools style properly, saving lots of trouble. */ src = fetchurl { urls = map - (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz") + (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.tar.gz") [ "http://ftp.uni-kl.de/pub/linux/suse" "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse" diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index c9ec557ab1f..19bc2fdc176 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -12,7 +12,7 @@ let ++ [ bzip2 xz lzip ]); in pythonPackages.buildPythonApplication rec { - name = "dtrx-${version}"; + pname = "dtrx"; version = "7.1"; src = fetchurl { diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index bd4d85e90e3..e6409f05122 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "gzip-${version}"; + pname = "gzip"; version = "1.10"; src = fetchurl { - url = "mirror://gnu/gzip/${name}.tar.xz"; + url = "mirror://gnu/gzip/${pname}-${version}.tar.xz"; sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4"; }; diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 083a71f6a75..2c6765b2e83 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.631"; - name = "lrzip-${version}"; + pname = "lrzip"; src = fetchurl { - url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2"; + url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2"; sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d"; }; diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 0bf15580798..ef185f706dc 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "lzfse-${version}"; + pname = "lzfse"; version = "2017-03-08"; src = fetchFromGitHub { diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index dfd91bf37d3..4ec40deab6c 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "lzip-${version}"; + pname = "lzip"; version = "1.21"; nativeBuildInputs = [ texinfo ]; src = fetchurl { - url = "mirror://savannah/lzip/${name}.tar.gz"; + url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4"; }; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 9b9de8d8302..28c7c1d69f7 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "mozlz4a"; version = "2018-08-23"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix index bbba21f2b34..13e5882788d 100644 --- a/pkgs/tools/compression/pbzx/default.nix +++ b/pkgs/tools/compression/pbzx/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "pbzx"; version = "1.0.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "NiklasRosenstein"; repo = "pbzx"; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 60023d028a9..7f9c7cb7773 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ucl, zlib, perl }: stdenv.mkDerivation rec { - name = "upx-${version}"; + pname = "upx"; version = "3.95"; src = fetchurl { - url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz"; + url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz"; sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv"; }; diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 3421045fe4c..61dd5e30f0d 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.6.1"; - name = "xar-${version}"; + pname = "xar"; src = fetchurl { - url = "https://github.com/downloads/mackyle/xar/${name}.tar.gz"; + url = "https://github.com/downloads/mackyle/xar/${pname}-${version}.tar.gz"; sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 32de493ec77..034cdb7d94e 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -9,7 +9,7 @@ let then "--with-${name}" else "--without-${name}"; in stdenv.mkDerivation rec { - name = "xdelta-${version}"; + pname = "xdelta"; version = "3.0.11"; src = fetchFromGitHub { diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index c870e501209..bf2601dd373 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -9,7 +9,7 @@ let then "--with-${name}" else "--without-${name}"; in stdenv.mkDerivation rec { - name = "xdelta-${version}"; + pname = "xdelta"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 06c7e6439a9..accead9db0b 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { - name = "zopfli-${version}"; + pname = "zopfli"; version = "1.0.2"; src = fetchFromGitHub { owner = "google"; repo = "zopfli"; - rev = name; - name = "${name}-src"; + rev = "${pname}-${version}"; + name = "${pname}-${version}-src"; sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y"; }; diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index 74ba47ceee1..137b00802df 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }: stdenv.mkDerivation rec { - name = "afpfs-ng-${version}"; + pname = "afpfs-ng"; version = "0.8.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 5fc614de4a7..356d7ada6d0 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, fuse, xz }: stdenv.mkDerivation rec { - name = "avfs-${version}"; + pname = "avfs"; version = "1.1.0"; src = fetchurl { - url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7"; }; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index cd0f3ea2322..d449bf1266a 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "bashmount-${version}"; + pname = "bashmount"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index efd48fb87fe..d3e790a3cf1 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, utillinux, bash }: stdenv.mkDerivation rec { - name = "bcache-tools-${version}"; + pname = "bcache-tools"; version = "1.0.7"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index f12e8af84b8..842ef6712ac 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -6,7 +6,7 @@ let sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh"; bees = stdenv.mkDerivation rec { - name = "bees-${version}"; + pname = "bees"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 6a9d17772c8..a8849e6af22 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.14.1"; - name = "bindfs-${version}"; + pname = "bindfs"; src = fetchurl { - url = "https://bindfs.org/downloads/${name}.tar.gz"; + url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl"; }; diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index b5694535e94..067f200e201 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: stdenv.mkDerivation rec { - name = "blobfuse-${version}"; + pname = "blobfuse"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 9c9dbede83f..a0983004fcc 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -22,7 +22,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "boxfs-${version}"; + pname = "boxfs"; version = "2-20150109"; src = srcs.boxfs2; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 168542f57df..75649845edc 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; + pname = "btrfs-progs"; version = "5.1.1"; src = fetchurl { diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index 47428e7f52e..6c0a6c28703 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7"; - name = "chunkfs-${version}"; + pname = "chunkfs"; src = fetchurl { url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz"; diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 8af745ed436..00ef368ad3d 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { - name = "convoy-${version}"; + pname = "convoy"; version = "0.5.0"; goPackagePath = "github.com/rancher/convoy"; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 71e27c94dbd..67016af8c0d 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "cryfs-${version}"; + pname = "cryfs"; version = "0.9.10"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 4952036a860..4d40d61b570 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : stdenv.mkDerivation rec { - name = "darling-dmg-${version}"; + pname = "darling-dmg"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index b8028741d57..5137719790a 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }: stdenv.mkDerivation rec { - name = "disorderfs-${version}"; + pname = "disorderfs"; version = "0.5.6"; src = fetchurl { diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index e8deeaf4b47..e3c8c2944fb 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, fuse }: stdenv.mkDerivation rec { - name = "djmount-${version}"; + pname = "djmount"; version = "0.71"; src = fetchurl { - url = "mirror://sourceforge/djmount/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/djmount/${version}/${pname}-${version}.tar.gz"; sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 82f64362fad..369d2e74f30 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }: stdenv.mkDerivation rec { - name = "dosfstools-${version}"; + pname = "dosfstools"; version = "4.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index e1b11a37055..a61c3c80e6d 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: stdenv.mkDerivation rec { - name = "duff-${version}"; + pname = "duff"; # The last release (0.5.2) is more than 2 years old and lacks features like -D, # limiting its usefulness. Upstream appears comatose if not dead. version = "2014-07-03"; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 208cbb83209..0950445bd3e 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -2,7 +2,7 @@ , pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: stdenv.mkDerivation rec { - name = "duperemove-${version}"; + pname = "duperemove"; version = "0.11.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index dcaad81a5a3..14f6afa99f0 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "e2tools"; version = "0.0.16"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${name}.tar.gz"; + url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz"; sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f"; }; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 1a9951a33fd..19767b7013a 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "encfs-${version}"; + pname = "encfs"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 97a96651a68..24db663aee0 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: stdenv.mkDerivation rec { - name = "exfat-${version}"; + pname = "exfat"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index 0211ab63b3e..40159b5fb6e 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.2"; - name = "ext4magic-${version}"; + pname = "ext4magic"; src = fetchurl { - url = "mirror://sourceforge/ext4magic/${name}.tar.gz"; + url = "mirror://sourceforge/ext4magic/${pname}-${version}.tar.gz"; sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115"; }; diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index e0c5ea3def4..274126e1a71 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.4"; - name = "extundelete-${version}"; + pname = "extundelete"; src = fetchurl { url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2"; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 90bb443dfdd..d7fa971c987 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "f2fs-tools-${version}"; + pname = "f2fs-tools"; version = "1.11.0"; src = fetchgit { diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 598263c8895..d2887582938 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "f3"; version = "7.2"; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 7bb5dd415a6..a00104510bf 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; - name = "fatresize-${version}"; + pname = "fatresize"; src = fetchurl { url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 18d9097dacb..aee053ad135 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5.0.456"; - name = "fatsort-${version}"; + pname = "fatsort"; src = fetchurl { - url = "mirror://sourceforge/fatsort/${name}.tar.xz"; + url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; }; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 82e2b404b82..a8eb1118f4d 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fuse-7z-ng"; version = "git-2014-06-08"; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index ccc5f1f2d4a..fe46fccf271 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,7 +2,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gcsfuse-${version}"; + pname = "gcsfuse"; version = "0.23.0"; rev = "v${version}"; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index 581970e34fa..e905222ad45 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libconfuse, gettext }: stdenv.mkDerivation rec { - name = "genimage-${version}"; + pname = "genimage"; version = "9"; src = fetchurl { diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index 6a3e280aae3..1e6c73f725a 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.5.2"; - name = "genromfs-${version}"; + pname = "genromfs"; src = fetchurl { - url = "mirror://sourceforge/romfs/genromfs/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/romfs/genromfs/${version}/${pname}-${version}.tar.gz"; sha256 = "0q6rpq7cmclmb4ayfyknvzbqysxs4fy8aiahlax1sb2p6k3pzwrh"; }; diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 72e43725ef5..605e341c4d7 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,7 +1,7 @@ { pkgconfig, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-mtpfs-${version}"; + pname = "go-mtpfs"; version = "2018-02-09"; rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix index ca2d0a627ab..59b4785888b 100644 --- a/pkgs/tools/filesystems/gpart/default.nix +++ b/pkgs/tools/filesystems/gpart/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "gpart-${version}"; + pname = "gpart"; version = "0.3"; # GitHub repository 'collating patches for gpart from all distributions': diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index 4f7c2248a8e..59ee358e028 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; - name = "grive2-${version}"; + pname = "grive2"; src = fetchFromGitHub { owner = "vitalif"; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 4594aa9370c..9b1c2b66e7a 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: stdenv.mkDerivation rec { - name = "hubicfuse-${version}"; + pname = "hubicfuse"; version = "3.0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index 083bae24d60..aef6087d3f2 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "ifuse"; version = "2018-10-08"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index f6637b621b8..6a9d68291f2 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -28,7 +28,7 @@ let sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q"; }; in stdenv.mkDerivation rec { - name = "lizardfs-${version}"; + pname = "lizardfs"; version = "3.12.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 15bb390e364..4d90e189b95 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fuse, pkgconfig, attr, uthash }: stdenv.mkDerivation rec { - name = "mhddfs-${version}"; + pname = "mhddfs"; version = "0.1.39"; src = fetchurl { diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix index 48f13925ab0..6733b3df45e 100644 --- a/pkgs/tools/filesystems/mkspiffs/default.nix +++ b/pkgs/tools/filesystems/mkspiffs/default.nix @@ -4,7 +4,7 @@ # overriding the same-named attributes. See ./presets.nix for examples. stdenv.mkDerivation rec { - name = "mkspiffs-${version}"; + pname = "mkspiffs"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index cc8ca841124..b453067eaef 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: stdenv.mkDerivation rec { - name = "mp3fs-${version}"; + pname = "mp3fs"; version = "0.91"; src = fetchurl { - url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4"; }; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index d0ceaf94a75..c4910b166de 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libuuid, lzo, zlib, acl }: stdenv.mkDerivation rec { - name = "mtd-utils-${version}"; + pname = "mtd-utils"; version = "1.5.2"; src = fetchurl { diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 24aab7dc6dd..48a72c5dd62 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -8,12 +8,12 @@ assert useNixUdev -> systemd != null; buildPythonApplication rec { - name = "blivet-${version}"; + pname = "blivet"; version = "0.17-1"; src = fetchurl { url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" - + "${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2"; sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 6a1c12e3e72..306783d6308 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -54,7 +54,7 @@ let }; in buildPythonApplication rec { - name = "nixpart-${version}"; + pname = "nixpart"; version = "0.4.1"; src = fetchurl { diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 881301ed38e..408d02bced7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, lvm2, dmraid }: stdenv.mkDerivation rec { - name = "pyblock-${version}"; + pname = "pyblock"; version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = fetchurl rec { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index ce1d0bf28a1..ffe31b464b8 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -1,13 +1,13 @@ { stdenv, python, buildPythonApplication, fetchurl, urlgrabber }: buildPythonApplication rec { - name = "pykickstart-${version}"; + pname = "pykickstart"; version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; src = fetchurl rec { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" - + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; + + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index fd6c5b91309..e0947b01f51 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }: buildPythonApplication rec { - name = "pyparted-${version}"; + pname = "pyparted"; version = "3.10"; src = fetchurl { - url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; + url = "https://fedorahosted.org/releases/p/y/pyparted/${pname}-${version}.tar.gz"; sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; }; diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index ce00367c771..8f59ff809a8 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonApplication, blivet }: buildPythonApplication rec { - name = "nixpart-${version}"; + pname = "nixpart"; version = "1.0.0"; src = fetchurl { diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index c919bfade3a..3660649553d 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "ntfs3g"; version = "2017.3.23"; - name = "${pname}-${version}"; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 2457ac59a21..424f84ec34f 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nettle }: stdenv.mkDerivation rec { - name = "rdfind-${version}"; + pname = "rdfind"; version = "1.4.1"; src = fetchurl { - url = "https://rdfind.pauldreik.se/${name}.tar.gz"; + url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz"; sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih"; }; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 8fb002b2d7f..73f88964f2c 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -3,7 +3,7 @@ , fuse, curl, expat }: stdenv.mkDerivation rec { - name = "s3backer-${version}"; + pname = "s3backer"; version = "1.5.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 816c09161dc..3fc082dad46 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }: stdenv.mkDerivation rec { - name = "s3fs-fuse-${version}"; + pname = "s3fs-fuse"; version = "1.85"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index a21aacb7e6b..c5a5af212d9 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -3,7 +3,7 @@ , fuse }: stdenv.mkDerivation rec { - name = "securefs-${version}"; + pname = "securefs"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix index 94c45ec4689..997aa321afa 100644 --- a/pkgs/tools/filesystems/simg2img/default.nix +++ b/pkgs/tools/filesystems/simg2img/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { - name = "simg2img-${version}"; + pname = "simg2img"; version = "1.1.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 26cef4ac90f..be46abb2694 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: stdenv.mkDerivation rec { - name = "smbnetfs-${version}"; + pname = "smbnetfs"; version = "0.6.1"; src = fetchurl { - url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2"; sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4"; }; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 725ff3e56dc..b5ffdade98f 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "snapraid-${version}"; + pname = "snapraid"; version = "11.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 59a786116df..9a0073f939f 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -7,7 +7,7 @@ assert lz4Support -> (lz4 != null); stdenv.mkDerivation rec { - name = "squashfs-${version}"; + pname = "squashfs"; version = "4.4dev_20180612"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 40e350846c5..abe89680102 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "squashfuse"; version = "0.1.103"; - name = "${pname}-${version}"; meta = { description = "FUSE filesystem to mount squashfs archives"; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 73b7f51fd36..4a1215397be 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.5.2"; - name = "sshfs-fuse-${version}"; + pname = "sshfs-fuse"; src = fetchFromGitHub { owner = "libfuse"; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index fd557a7ff56..67e21ac4c2c 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchFromGitHub, go, fuse }: stdenv.mkDerivation rec { - name = "tmsu-${version}"; + pname = "tmsu"; version = "0.7.4"; go-sqlite3 = fetchgit { diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix index 65eafe76710..62b4b930139 100644 --- a/pkgs/tools/filesystems/u3-tool/default.nix +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -3,12 +3,11 @@ stdenv.mkDerivation rec { pname = "u3-tool"; version = "0.3"; - name = "${pname}-${version}"; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f"; }; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index f17f9e0d2de..11ea490446d 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - name = "udftools-${version}"; + pname = "udftools"; version = "2.0"; src = fetchFromGitHub { owner = "pali"; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index cfe3ff421fe..73272b83989 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, fuse }: stdenv.mkDerivation rec { - name = "unionfs-fuse-${version}"; + pname = "unionfs-fuse"; version = "2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 98cc327bc29..aa28ee62596 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - name = "xfsprogs-${version}"; + pname = "xfsprogs"; version = "4.19.0"; src = fetchgit { diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 4c0c2343dd2..557367ea22c 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0"; }; - name = "XtreemFS-${version}"; + pname = "XtreemFS"; version = "1.5.1.81"; buildInputs = [ which attr makeWrapper python ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 61fd5f26e30..041d9a4e3f8 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { - name = "yandex-disk-${version}"; + pname = "yandex-disk"; version = "0.1.5.1039"; src = fetchurl { - url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"; sha256 = p.sha256; }; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index c311ac1af23..734c8df9b6a 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, e2fsprogs }: stdenv.mkDerivation rec { - name = "zerofree-${version}"; + pname = "zerofree"; version = "1.1.1"; src = fetchurl { - url = "https://frippery.org/uml/${name}.tgz"; + url = "https://frippery.org/uml/${pname}-${version}.tgz"; sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 0e182d3bd2e..0269df84634 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: stdenv.mkDerivation rec { - name = "zkfuse-${version}"; + pname = "zkfuse"; inherit (zookeeper) version src; sourceRoot = "${zookeeper.name}/src/contrib/zkfuse"; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index 72f1a418807..87686108720 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -9,7 +9,7 @@ let boost_static = boost165.override { }; in stdenv.mkDerivation rec { - name = "appleseed-${version}"; + pname = "appleseed"; version = "2.0.5-beta"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index de09c2b2780..179085e1fd6 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "0.99"; pname = "barcode"; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"; }; diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index ad72933cc77..b4f99a9192c 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: stdenv.mkDerivation rec { - name = "blockhash-${version}"; + pname = "blockhash"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index c65d1302dca..2c96e872f4e 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpng, bison, flex, ffmpeg }: stdenv.mkDerivation rec { - name = "cfdg-${version}"; + pname = "cfdg"; version = "3.0.9"; src = fetchurl { sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp cfdg $out/bin/ - mkdir -p $out/share/doc/${name} - cp *.txt $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} + cp *.txt $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix index 12fc6934531..b1ce3082d25 100644 --- a/pkgs/tools/graphics/convchain/default.nix +++ b/pkgs/tools/graphics/convchain/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { - name = "convchain-${version}"; + pname = "convchain"; version = "0.0pre20160901"; src = fetchFromGitHub { owner = "mxgmn"; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 9fcb7ba404d..04b73995580 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, imagemagick }: stdenv.mkDerivation rec { - name = "cuneiform-${version}"; + pname = "cuneiform"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 33e94866337..f21b84c1521 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dpic-${version}"; + pname = "dpic"; version = "2016.01.12"; src = fetchurl { - url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz"; + url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz"; }; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 2ffe4eb7f80..79c90575653 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -3,11 +3,11 @@ , help2man, pkgconfig, perl, texlive }: stdenv.mkDerivation rec { - name = "enblend-enfuse-${version}"; + pname = "enblend-enfuse"; version = "4.2"; src = fetchurl { - url = "mirror://sourceforge/enblend/${name}.tar.gz"; + url = "mirror://sourceforge/enblend/${pname}-${version}.tar.gz"; sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7"; }; diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 9735adca53d..2ad52d2de43 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.08"; - name = "epstool-${version}"; + pname = "epstool"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz"; diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index 02a3a70fe51..aab2e111e85 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { - name = "facedetect-${version}"; + pname = "facedetect"; version = "0.1"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -v -m644 -D README.rst $out/share/doc/${name}/README.rst + install -v -m644 -D README.rst $out/share/doc/${pname}-${version}/README.rst install -v -m755 -D facedetect $out/bin/facedetect wrapPythonPrograms ''; diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix index 5d42482b309..17e1c710586 100644 --- a/pkgs/tools/graphics/fast-neural-doodle/default.nix +++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix @@ -2,7 +2,7 @@ , python, numpy, scipy, h5py, scikitlearn, pillow }: stdenv.mkDerivation rec { - name = "fast-neural-doodle-${version}"; + pname = "fast-neural-doodle"; version = "0.0pre2016-07-01"; buildInputs = [ torch torch-hdf5 python numpy h5py scikitlearn scipy pillow diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 7303f27fe11..296ba43a5ed 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "fim-${version}"; + pname = "fim"; version = "0.6"; src = fetchurl { - url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz"; + url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz"; sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp"; }; diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index e619a889219..e05f05a977b 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "flam3"; version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}"; rev = "e0801543538451234d7a8a240ba3b417cbda5b21"; diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index 0ed1855a338..de02865c36e 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.1.11"; - name = "ggobi-${version}"; + pname = "ggobi"; src = fetchurl { url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2"; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index 52f5a099727..ae6291811a4 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchgit, cmake, libGLU_combined, xorg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "glee"; rev = "f727ec7463d514b6279981d12833f2e11d62b33d"; version = "20170205-${stdenv.lib.strings.substring 0 7 rev}"; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 1331e38aef7..111a9b59afd 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -2,7 +2,7 @@ python27, wayland, udev, mesa, wafHook }: stdenv.mkDerivation rec { - name = "glmark2-${version}"; + pname = "glmark2"; version = "2017-09-01"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 1f8a98e0296..0710f47cb57 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libGL, libX11 }: stdenv.mkDerivation rec { - name = "glxinfo-${version}"; + pname = "glxinfo"; version = "8.4.0"; src = fetchurl { diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 1d3a8b26aae..4c251f21c71 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gromit-mpx-${version}"; + pname = "gromit-mpx"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix index 11fad25b85a..564685c1cea 100644 --- a/pkgs/tools/graphics/ibniz/default.nix +++ b/pkgs/tools/graphics/ibniz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "ibniz-${version}"; + pname = "ibniz"; version = "1.18"; src = fetchurl { - url = "http://www.pelulamu.net/ibniz/${name}.tar.gz"; + url = "http://www.pelulamu.net/ibniz/${pname}-${version}.tar.gz"; sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2"; }; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 8db5b6c7dea..1099b11176c 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -3,7 +3,7 @@ let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { version = "1.7.4"; - name = "imgur-screenshot-${version}"; + pname = "imgur-screenshot"; src = fetchFromGitHub { owner = "jomo"; diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index e4405455097..a2592d5522b 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - name = "jhead-${version}"; + pname = "jhead"; version = "3.03"; src = fetchurl { - url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz"; + url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2"; }; @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { mkdir -p \ $out/bin \ $out/man/man1 \ - $out/share/doc/${name} + $out/share/doc/${pname}-${version} cp -v jhead $out/bin cp -v jhead.1 $out/man/man1 - cp -v *.txt $out/share/doc/${name} + cp -v *.txt $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index fec092db0c5..b0836d67086 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "lepton-${version}"; + pname = "lepton"; src = fetchFromGitHub { repo = "lepton"; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index a3cefddeb41..1f1da8df3f2 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -2,11 +2,11 @@ , libGLU_combined, boost, glm, freetype }: stdenv.mkDerivation rec { - name = "logstalgia-${version}"; + pname = "logstalgia"; version = "1.1.2"; src = fetchurl { - url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; }; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index ffba2280e8a..b65cbfca7bb 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -14,7 +14,7 @@ let boost_static = boost165.override { }; in stdenv.mkDerivation rec { - name = "luxcorerender-${version}"; + pname = "luxcorerender"; version = "2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 360a233e139..63758e23b15 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "maim-${version}"; + pname = "maim"; version = "5.5.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix index 99421cfde17..a4706e95cee 100644 --- a/pkgs/tools/graphics/neural-style/default.nix +++ b/pkgs/tools/graphics/neural-style/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}: stdenv.mkDerivation rec { - name = "neural-style-${version}"; + pname = "neural-style"; version = "0.0pre2016.08.15"; buildInputs = [torch loadcaffe]; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 42da24e3239..ebebe508752 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "nifskope-${version}"; + pname = "nifskope"; version = "2.0.dev7"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index bc141907075..c1138e5f458 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, imagemagick, libpng }: stdenv.mkDerivation rec { - name = "optar-${version}"; + pname = "optar"; version = "20150210"; src = fetchurl { diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 058900b8e23..46eb61d1cf7 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -2,7 +2,7 @@ , cairo, gtk2, poppler }: stdenv.mkDerivation rec { - name = "pdf2svg-${version}"; + pname = "pdf2svg"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix index 8428480ca03..7e022936318 100644 --- a/pkgs/tools/graphics/pdftag/default.nix +++ b/pkgs/tools/graphics/pdftag/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "pdftag"; - name = "${pname}-${version}"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index d394a816a49..dc5acc9433f 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "perceptualdiff"; - name = "${pname}-${version}"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 77edcd34578..08c5f308f5c 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -4,12 +4,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pfstools"; version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${name}.tgz"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz"; sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six"; }; diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 4e7d1e361f9..b519733f964 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { - name = "pngquant-${version}"; + pname = "pngquant"; version = "2.12.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index dc9d9630ae5..d2042540d71 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "povray-${version}"; + pname = "povray"; version = "3.7.0.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 44444e6148a..eec8c5158b4 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "qrcode-git-${version}"; + pname = "qrcode-git"; version = "20160804"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index c27eacaec8a..8628b72bbae 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase }: stdenv.mkDerivation rec { - name = "rocket-${version}"; + pname = "rocket"; version = "2018-06-09"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index fd538eec573..e7d3b8151a4 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }: stdenv.mkDerivation rec { - name = "s2png-${version}"; + pname = "s2png"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 5dbbd20cd82..fd26869d298 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -2,12 +2,12 @@ , dbus, libconfuse, libjpeg, sane-backends, systemd }: stdenv.mkDerivation rec { - name = "scanbd-${version}"; + pname = "scanbd"; version = "1.5.1"; src = fetchurl { sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n"; - url = "mirror://sourceforge/scanbd/${name}.tgz"; + url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index 182ab5806d7..c7d2f49406b 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpng, netpbm }: stdenv.mkDerivation rec { - name = "sng-${version}"; + pname = "sng"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index c1e6c2afecc..a3497aefe10 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "structure-synth-${version}"; + pname = "structure-synth"; version = "v1.5"; src = fetchurl { diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix index 1c3c0f3b451..8a64e25d879 100644 --- a/pkgs/tools/graphics/swfdec/default.nix +++ b/pkgs/tools/graphics/swfdec/default.nix @@ -4,7 +4,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "swfdec"; version = "0.8.4"; diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix index 0862293830d..693f116a6e8 100644 --- a/pkgs/tools/graphics/syntex/default.nix +++ b/pkgs/tools/graphics/syntex/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { - name = "syntex-${version}"; + pname = "syntex"; version = "0.0pre20160915"; src = fetchFromGitHub { owner = "mxgmn"; diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index b58114a61a5..44a86e961ec 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libav, libxslt }: stdenv.mkDerivation rec { - name = "unpaper-${version}"; + pname = "unpaper"; version = "6.1"; src = fetchurl { - url = "https://www.flameeyes.eu/files/${name}.tar.xz"; + url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz"; sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13"; }; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index db06c2a1588..ad352c04ad9 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "vips-${version}"; + pname = "vips"; version = "8.8.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 320b4eed14c..75b5722b141 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -2,7 +2,7 @@ glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { - name = "vulkan-tools-${version}"; + pname = "vulkan-tools"; version = "1.1.106.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 56fd5350244..ba1044e3bb4 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -3,7 +3,7 @@ }: buildGoModule rec { - name = "wallutils-${version}"; + pname = "wallutils"; version = "5.8.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix index 20d07e52f6c..65fe38937df 100644 --- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { - name = "wavefunctioncollapse-${version}"; + pname = "wavefunctioncollapse"; version = "0.0pre20170130"; src = fetchFromGitHub { owner = "mxgmn"; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 2882ae960de..be4ba53319a 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "welkin-${version}"; + pname = "welkin"; version = "1.1"; src = fetchsvn { diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 237c9bb398b..c173d00221d 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.12.5"; - name = "wkhtmltopdf-${version}"; + pname = "wkhtmltopdf"; src = fetchFromGitHub { owner = "wkhtmltopdf"; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 7321128a6b5..6dd0b206878 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - name = "yafaray-core-${version}"; + pname = "yafaray-core"; version = "3.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index 8fbc09a6d82..094ec2d5bc4 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -2,7 +2,7 @@ maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }: stdenv.mkDerivation rec { - name = "yaxg-${version}"; + pname = "yaxg"; version = "unstable-2018-05-03"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index 3efb68e60d2..97bbeb4d2d4 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "zxing-${version}"; + pname = "zxing"; version = "3.1.0"; # Maven builds are hard to get right core_jar = fetchurl { diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index a3f12d648d5..d1e7f85f75f 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-anthy-${version}"; + pname = "fcitx-anthy"; version = "0.2.3"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz"; sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index e2d58c56498..d9b202f7ef1 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-chewing-${version}"; + pname = "fcitx-chewing"; version = "0.2.3"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-chewing/${pname}-${version}.tar.xz"; sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index f7bb7126bef..4c0a7f0b410 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }: stdenv.mkDerivation rec { - name = "fcitx-cloudpinyin-${version}"; + pname = "fcitx-cloudpinyin"; version = "0.3.6"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${pname}-${version}.tar.xz"; sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index 32c9ecff9bd..c9a40b84a6d 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-hangul-${version}"; + pname = "fcitx-hangul"; version = "0.3.1"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-hangul/${pname}-${version}.tar.xz"; sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 5b55e0f0478..9e0ef551d82 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: stdenv.mkDerivation rec { - name = "fcitx-libpinyin-${version}"; + pname = "fcitx-libpinyin"; version = "0.5.3"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz"; sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index 292d2dbb57f..8b25b2846ff 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-m17n-${version}"; + pname = "fcitx-m17n"; version = "0.2.4"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-m17n/${pname}-${version}.tar.xz"; sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 2bd4bf1c878..095be7469cd 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "fcitx-rime-${version}"; + pname = "fcitx-rime"; version = "0.3.2"; src = fetchurl { - url = "https://download.fcitx-im.org/fcitx-rime/${name}.tar.xz"; + url = "https://download.fcitx-im.org/fcitx-rime/${pname}-${version}.tar.xz"; sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix index c2e8837f5d1..cf0a0f1fa17 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: stdenv.mkDerivation rec { - name = "fcitx-skk-${version}"; + pname = "fcitx-skk"; version = "0.1.4"; src = fetchFromGitHub { owner = "fcitx"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix index 918edf0240a..833e417ae91 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { - name = "fcitx-table-extra-${version}"; + pname = "fcitx-table-extra"; version = "0.3.8"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-table-extra/${pname}-${version}.tar.xz"; sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 929cdb30b91..ffee83875a1 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { - name = "fcitx-table-other-${version}"; + pname = "fcitx-table-other"; version = "0.2.4"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-table-other/${pname}-${version}.tar.xz"; sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index ddfa41dda31..1deff93e201 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-unikey-${version}"; + pname = "fcitx-unikey"; version = "0.2.5"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-unikey/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-unikey/${pname}-${version}.tar.xz"; sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf"; }; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index b32368c93d3..34dd3ac3509 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -36,7 +36,7 @@ let }; in stdenv.mkDerivation rec { - name = "fcitx-${version}"; + pname = "fcitx"; version = "4.2.9.6"; src = fetchFromGitLab { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 77ec251ec88..d2f68fd5269 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-anthy-${version}"; + pname = "ibus-anthy"; version = "1.5.11"; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0"; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index daebceaf887..3b8b3489a1d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ibus-hangul-${version}"; + pname = "ibus-hangul"; version = "1.5.1"; src = fetchurl { - url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 19d862e0308..589ddd09144 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -7,10 +7,9 @@ stdenv.mkDerivation rec { pname = "ibus-kkc"; version = "1.5.22"; - name = "${pname}-${version}"; src = fetchurl { - url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz"; + url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2"; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 3bdb69391cc..fc4677e06b0 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-libpinyin-${version}"; + pname = "ibus-libpinyin"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index a0d50cf9479..01b227f6f1b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-m17n-${version}"; + pname = "ibus-m17n"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index 368de091777..c3ee5eafd7b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -14,7 +14,7 @@ let sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n"; }; in stdenv.mkDerivation rec { - name = "ibus-table-chinese-${version}"; + pname = "ibus-table-chinese"; version = "1.8.2"; srcs = [ src cmakeFedoraSrc ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index ff01c841926..5e839b354a3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }: stdenv.mkDerivation rec { - name = "ibus-table-others-${version}"; + pname = "ibus-table-others"; version = "1.3.9"; src = fetchurl { - url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3"; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 3f2ab1fc96a..d0873d764aa 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -4,7 +4,7 @@ , ibus, python3 }: stdenv.mkDerivation rec { - name = "ibus-table-${version}"; + pname = "ibus-table"; version = "1.9.21"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index e31d1ddfaa8..107c8c60271 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-uniemoji-${version}"; + pname = "ibus-uniemoji"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 07fa8d2beb5..d36697221a4 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -40,7 +40,7 @@ let ''; }; cldrEmojiAnnotation = stdenv.mkDerivation rec { - name = "cldr-emoji-annotation-${version}"; + pname = "cldr-emoji-annotation"; version = "31.90.0_1"; src = fetchFromGitHub { owner = "fujiwarat"; @@ -80,7 +80,7 @@ let in stdenv.mkDerivation rec { - name = "ibus-${version}"; + pname = "ibus"; version = "1.5.20"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 8d02d4edde8..85fccc46de0 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: stdenv.mkDerivation rec { - name = "ibus-qt-${version}"; + pname = "ibus-qt"; version = "1.3.3"; src = fetchurl { - url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz"; + url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz"; sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index bb179e18e07..cd7d1cd8bbf 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "keyfuzz-${version}"; + pname = "keyfuzz"; version = "0.2"; meta = with stdenv.lib; { diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index 75670dfe9df..f4b2f7e94e7 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation rec { pname = "libinput-gestures"; version = "2.39"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bulletmark"; diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 33de43b6f5e..68889d45df0 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -7,10 +7,9 @@ stdenv.mkDerivation rec { pname = "libkkc"; version = "0.3.5"; - name = "${pname}-${version}"; src = fetchurl { - url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz"; + url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef"; }; diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index cecacd4af95..cf32e8d51ca 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { - name = "skk-dicts-unstable-${version}"; + pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ]; diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index 8661da66b92..d4ef2e2422e 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -9,7 +9,7 @@ # - We for the moment do not package them to keep the dependencies slim. # Probably, shall package the newer tools as skktools-extra in the future. stdenv.mkDerivation rec { - name = "skktools-${version}"; + pname = "skktools"; version = "1.3.3"; src = fetchFromGitHub { owner = "skk-dev"; diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index 55cf0945582..02993b248ab 100644 --- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "tegaki-zinnia-japanese-${version}"; + pname = "tegaki-zinnia-japanese"; version = "0.3"; src = fetchurl { diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 82dd387f536..ff14a13da04 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }: stdenv.mkDerivation rec { - name = "touchegg-${version}"; + pname = "touchegg"; version = "1.1.1"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz"; sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index ec8ac884559..a9e106f2c72 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: stdenv.mkDerivation rec { - name = "triggerhappy-${version}"; + pname = "triggerhappy"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 984eecf9e9d..7fe00bd4dfc 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -39,7 +39,7 @@ assert withMisc -> libeb != null; stdenv.mkDerivation rec { version = "1.8.8"; - name = "uim-${version}"; + pname = "uim"; src = fetchFromGitHub { owner = "uim"; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index 60f3a0feb55..ce87e1a7141 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zinnia-${version}"; + pname = "zinnia"; version = "2016-08-28"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index ad129503de3..a349a3f2fc0 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -1,7 +1,7 @@ { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: stdenv.mkDerivation rec { - name = "0x0-${version}"; + pname = "0x0"; version = "2018-06-24"; src = fetchFromGitLab { diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 3c529f31f66..75d8d71b895 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.14"; - name = "aescrypt-${version}"; + pname = "aescrypt"; src = fetchurl { - url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz"; + url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz"; sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; }; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 8ee363ed91d..7b869d66d1c 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; - name = "alarm-clock-applet-${version}"; + pname = "alarm-clock-applet"; src = fetchFromGitHub { owner = "joh"; diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 62d46bba5b0..6ff0c7cd0d7 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: mkDerivation rec { - name = "antimicro-${version}"; + pname = "antimicro"; version = "2.23"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix index 6b1512e854b..8b2a2a4b215 100644 --- a/pkgs/tools/misc/argtable/default.nix +++ b/pkgs/tools/misc/argtable/default.nix @@ -2,7 +2,7 @@ , fetchgit }: stdenv.mkDerivation rec { - name = "argtable-${version}"; + pname = "argtable"; version = "3.0.1"; src = fetchgit { diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index dc51d04e4b5..4f50e0f556b 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "arp-scan-${version}"; + pname = "arp-scan"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 859112d29bc..b58f603ce59 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.9.4"; - name = "aspcud-${version}"; + pname = "aspcud"; src = fetchzip { url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ca4dde7a450..8294e92d13f 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, bash }: stdenv.mkDerivation rec { - name = "autojump-${version}"; + pname = "autojump"; version = "22.5.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix index 3fd52051357..3bfb2d656d9 100644 --- a/pkgs/tools/misc/automirror/default.nix +++ b/pkgs/tools/misc/automirror/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, git, ronn}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "automirror"; version = "49"; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 75c7b258a44..ee07221b755 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "autorevision-${version}"; + pname = "autorevision"; version = "1.21"; src = fetchurl { diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index 5ead0e1020c..6f2afc888e8 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "azure-vhd-utils-${version}"; + pname = "azure-vhd-utils"; version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 4f90c0f03e9..3b5e72c89f7 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -10,11 +10,11 @@ let else throw "Unknown architecture"; in stdenv.mkDerivation rec { - name = "bandwidth-${version}"; + pname = "bandwidth"; version = "1.5.1"; src = fetchurl { - url = "https://zsmith.co/archives/${name}.tar.gz"; + url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix index ecff2459ef2..b0af13160d2 100644 --- a/pkgs/tools/misc/bbe/default.nix +++ b/pkgs/tools/misc/bbe/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "bbe-${version}"; + pname = "bbe"; version = "0.2.2"; src = fetchurl { diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 89d68461431..c7a9af4abd1 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "bibtex2html-${version}"; + pname = "bibtex2html"; version = "1.99"; src = fetchurl { diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index 5e8a8c56b0a..7664b96563b 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bibtool-${version}"; + pname = "bibtool"; version = "2.67"; src = fetchurl { diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index d7cca2a77bd..d84c6ebaabc 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bibutils-${version}"; + pname = "bibutils"; version = "6.7"; src = fetchurl { diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 4248dd6bd93..8d587e34af4 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libusb1, pkgconfig, ... }: stdenv.mkDerivation rec { - name = "blink1-${version}"; + pname = "blink1"; version = "1.98a"; src = fetchurl { diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix index 8e3e08fb5e5..655fd44c039 100644 --- a/pkgs/tools/misc/blsd/default.nix +++ b/pkgs/tools/misc/blsd/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: buildGoPackage rec { - name = "blsd-${version}"; + pname = "blsd"; version = "2017-07-27"; goPackagePath = "github.com/junegunn/blsd"; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index fc10538bbbb..e4664e34b96 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -2,7 +2,7 @@ , libnl }: stdenv.mkDerivation rec { - name = "bmon-${version}"; + pname = "bmon"; version = "4.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 8a269e3eb4b..070b7a7699c 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -5,13 +5,12 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "calamares"; version = "3.2.8"; # release including submodule src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62"; }; diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index a3b30423aa8..377297ee479 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,7 +1,7 @@ { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { - name = "capture-unstable-${version}"; + pname = "capture-unstable"; version = "2019-03-10"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix index 4c54ab239d2..f9740f22375 100644 --- a/pkgs/tools/misc/chelf/default.nix +++ b/pkgs/tools/misc/chelf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "chelf-${version}"; + pname = "chelf"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index f15dfc2adba..a5500d65c51 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "chezmoi-${version}"; + pname = "chezmoi"; version = "1.3.0"; goPackagePath = "github.com/twpayne/chezmoi"; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 48ce782536f..a1b1b4eac2d 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "cht.sh-${version}"; + pname = "cht.sh"; version = "unstable-2019-08-06"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index fdb0f008a6c..9d2126db9ff 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.3.2"; - name = "ckb-next-${version}"; + pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index e4b3fab818b..f71faf6ab74 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clac"; version = "0.0.0.20170503"; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 54a6fac17a3..d5fd4e97df1 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "clex-${version}"; + pname = "clex"; version = "4.6.patch9"; src = fetchurl { sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc"; - url = "${meta.homepage}/download/${name}.tar.gz"; + url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix index 6bd0f8be2fa..91c428def28 100644 --- a/pkgs/tools/misc/clipnotify/default.nix +++ b/pkgs/tools/misc/clipnotify/default.nix @@ -1,6 +1,6 @@ { libX11, libXfixes, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "clipnotify-${version}"; + pname = "clipnotify"; version = "git-2018-02-20"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index ed0239256cd..d12f9f6c1f4 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,7 +2,7 @@ gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "clipster-${version}"; + pname = "clipster"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 38041f0b32d..987d694a0a4 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "cloc-${version}"; + pname = "cloc"; version = "1.82"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index b9046bf19ca..bc23958b581 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "cloud-sql-proxy-${version}"; + pname = "cloud-sql-proxy"; version = "1.13"; goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index bda8ebcf3b0..5408c39920b 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix - name = "cloud-utils-${version}"; + pname = "cloud-utils"; version = "0.30"; src = fetchurl { url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 12821cf864c..41c80146e68 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "colord-kde-${version}"; + pname = "colord-kde"; version = "0.5.0"; src = fetchurl { - url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz"; + url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index a7d230d8e89..1b3c5f16969 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1a-3"; - name = "contacts-${version}"; + pname = "contacts"; src = fetchurl { url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz"; diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 6b5c9c51394..fb44b051b7e 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ version = "3.03+dfsg2"; - name = "cowsay-${version}"; + pname = "cowsay"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/c/cowsay/cowsay_${version}.orig.tar.gz"; diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 9a764c12941..547e2a1f059 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cpulimit-${version}"; + pname = "cpulimit"; version = "2.6"; src = fetchurl { - url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; + url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz"; sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; }; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index b4abb3097b9..db0ab75d916 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, jansson, perl }: stdenv.mkDerivation rec { - name = "cpuminer-${version}"; + pname = "cpuminer"; version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; + url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz"; sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa"; }; diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix index 696fbe86383..a00f8d6654f 100644 --- a/pkgs/tools/misc/crex/default.nix +++ b/pkgs/tools/misc/crex/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "crex"; version = "0.2.5"; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 6bbf049d244..f1930c925ff 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: stdenv.mkDerivation rec { - name = "CUnit-${version}"; + pname = "CUnit"; version = "2.1-3"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool]; src = fetchurl { - url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2"; sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm"; }; diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index 94f36adcf9b..83010477c50 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }: stdenv.mkDerivation rec { - name = "cutecom-${version}"; + pname = "cutecom"; version = "0.50.0"; src = fetchFromGitHub { owner = "neundorf"; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 5a82c766089..f45889e78d8 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "dashing-unstable-${version}"; + pname = "dashing-unstable"; version = "2018-02-15"; rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49"; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index 230a97da5e4..efeb760e560 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "datamash-${version}"; + pname = "datamash"; version = "1.4"; src = fetchurl { - url = "mirror://gnu/datamash/${name}.tar.gz"; + url = "mirror://gnu/datamash/${pname}-${version}.tar.gz"; sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a"; }; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 05a312bb8bc..b440808833f 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.6"; - name = "dateutils-${version}"; + pname = "dateutils"; src = fetchurl { - url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; + url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816"; }; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 8dcaecf9851..ab52d73ac27 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: stdenv.mkDerivation rec { - name = "dbus-map-${version}"; + pname = "dbus-map"; version = "2015-05-28"; src = fetchFromGitHub { owner = "taviso"; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 3a607b4ec75..0ddceb76ffe 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -2,7 +2,7 @@ , glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }: stdenv.mkDerivation rec { - name = "ddcutil-${version}"; + pname = "ddcutil"; version = "0.9.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 3ed284aa3e1..35db9ef7db3 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -9,7 +9,7 @@ let inherit (python3Packages) python setuptools; in stdenv.mkDerivation rec { version = "2.16.8"; - name = "debian-devscripts-${version}"; + pname = "debian-devscripts"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 61c8a8370d7..e99e9289b67 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, check }: stdenv.mkDerivation rec { - name = "ding-libs-${version}"; + pname = "ding-libs"; version = "0.6.1"; src = fetchurl { diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e71971ccb09..22c0721d79d 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, bash }: buildGoPackage rec { - name = "direnv-${version}"; + pname = "direnv"; version = "2.20.1"; goPackagePath = "github.com/direnv/direnv"; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 7b97e58fdf9..193a631ccdc 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, ncurses, zlib }: stdenv.mkDerivation rec { - name = "diskscan-${version}"; + pname = "diskscan"; version = "0.20"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix index affcd310bea..efe65683e07 100644 --- a/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat }: stdenv.mkDerivation rec { - name = "docbook2mdoc-${version}"; + pname = "docbook2mdoc"; version = "0.0.9"; src = fetchurl { - url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk"; }; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index f6bc091c14a..c1baf8e82f5 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, stdenv, docker }: buildGoPackage rec { - name = "docker-ls-${version}"; + pname = "docker-ls"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 979b3be0493..74ce8c102c6 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "docui-${version}"; + pname = "docui"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index c50e3adb6ab..7d85decbb84 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dtach-${version}"; + pname = "dtach"; version = "0.9"; src = fetchurl { - url = "mirror://sourceforge/project/dtach/dtach/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/dtach/dtach/${version}/${pname}-${version}.tar.gz"; sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j"; }; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 82b29bb67f6..77ad7cd8ccd 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -7,7 +7,7 @@ assert enableCairo -> cairo != null && pango != null; stdenv.mkDerivation rec { - name = "duc-${version}"; + pname = "duc"; version = "1.4.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 892287fa2d7..1b9a6c9bbea 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dumptorrent-${version}"; + pname = "dumptorrent"; version = "1.2"; src = fetchurl { diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index e2f2f51ccfb..799236a5804 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "dynamic-colors-${version}"; + pname = "dynamic-colors"; version = "0.2.2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 6f491ac9349..160c3982cc1 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "emv-${version}"; + pname = "emv"; version = "1.95"; src = fetchurl { diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 19bcd77923b..954b570c79d 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, coreutils, ncurses }: stdenv.mkDerivation rec { - name = "entr-${version}"; + pname = "entr"; version = "4.2"; src = fetchurl { - url = "http://entrproject.org/code/${name}.tar.gz"; + url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17"; }; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index ea08608da01..db31df982cf 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { version = "1.0.0"; - name = "envdir-${version}"; + pname = "envdir"; goPackagePath = "github.com/d10n/envdir"; diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index 86f78af2560..9b2153d17cb 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "envsubst-${version}"; + pname = "envsubst"; version = "1.1.0"; goPackagePath = "github.com/a8m/envsubst"; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index b9efead2798..8d65aee9e7a 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "eot_utilities"; version = "1.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz"; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index 9d3b796c879..52b56f10ea9 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "esptool-ck-${version}"; + pname = "esptool-ck"; version = "0.4.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index a6afa03a3f1..8fa1eccadf0 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-${version}"; + pname = "ethtool"; version = "5.2"; src = fetchurl { - url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; + url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz"; sha256 = "01bq2g7amycfp4syzcswz52pgphdgswklziqfjwnq3c6844dfpv6"; }; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index bb701f187fa..fe18a506560 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.45.4"; - name = "expect-${version}"; + pname = "expect"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 84b61f9aae9..25179c36c01 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fdupes-${version}"; + pname = "fdupes"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 14858428ee9..b3ed85ca228 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { - name = "file-${version}"; + pname = "file"; version = "5.37"; src = fetchurl { urls = [ - "ftp://ftp.astron.com/pub/file/${name}.tar.gz" - "https://distfiles.macports.org/file/${name}.tar.gz" + "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" + "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9"; }; diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix index e934da76e6e..a16695cf7c3 100644 --- a/pkgs/tools/misc/filebench/default.nix +++ b/pkgs/tools/misc/filebench/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, bison, flex }: stdenv.mkDerivation rec { - name = "filebench-${version}"; + pname = "filebench"; version = "1.4.9.1"; src = fetchurl { - url = "mirror://sourceforge/filebench/${name}.tar.gz"; + url = "mirror://sourceforge/filebench/${pname}-${version}.tar.gz"; sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc"; }; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index a7ca7700c71..18914a304f3 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: stdenv.mkDerivation rec { - name = "flashrom-${version}"; + pname = "flashrom"; version = "1.1"; src = fetchurl { diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index a72279b90b6..692f7daa9cf 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "fltrdr-${version}"; + pname = "fltrdr"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index e31da3bfd21..33efd2bd614 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "060102"; - name = "fondu-${version}"; + pname = "fondu"; src = fetchurl { url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz"; diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index f75dfec5e56..563152cc10d 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "fpart-${version}"; + pname = "fpart"; version = "1.1.0"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4"; }; diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 6271eb599b5..bfaf30f3f37 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python27 }: stdenv.mkDerivation rec { - name = "fpp-${version}"; + pname = "fpp"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix index 0e821ce7f1f..ac56d948bda 100644 --- a/pkgs/tools/misc/fsmark/default.nix +++ b/pkgs/tools/misc/fsmark/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fsmark-${version}"; + pname = "fsmark"; version = "3.3"; src = fetchurl { diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index f9e40b6b786..dde69778e5f 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fsmon-${version}"; + pname = "fsmon"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index e723db260eb..4e7db2dc484 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "fsql-${version}"; + pname = "fsql"; version = "0.3.1"; goPackagePath = "github.com/kshvmdn/fsql"; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index a5baf4de5b8..a189e8c1dba 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -3,7 +3,7 @@ , libarchive, darwin, coreutils }: stdenv.mkDerivation rec { - name = "fwup-${version}"; + pname = "fwup"; version = "1.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 6a04213e21a..5b05ce534d7 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fzy-${version}"; + pname = "fzy"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 011231692f3..ba0b76026a5 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -4,7 +4,7 @@ assert licenseFile != null; stdenv.mkDerivation rec { version = "25.0.2"; - name = "gams-${version}"; + pname = "gams"; src = fetchurl { url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe"; sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index c187b09624a..002853abc1d 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -3,7 +3,7 @@ with builtins; buildGoPackage rec { - name = "gawp-${version}"; + pname = "gawp"; version = "20160121-${stdenv.lib.strings.substring 0 7 rev}"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 6307d012deb..9b41dba4e25 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "gbdfed-${version}"; + pname = "gbdfed"; src = fetchurl { - url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${name}.tar.bz2"; + url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${pname}-${version}.tar.bz2"; sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index fddb1c99634..33b884a5eb9 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "geekbench-${version}"; + pname = "geekbench"; version = "4.4.0"; src = fetchurl { diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index b95c7179141..d6fbb623331 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -1,7 +1,7 @@ { stdenv, perl, ronn, fetchurl }: stdenv.mkDerivation rec { - name = "geteltorito-${version}"; + pname = "geteltorito"; version = "0.6"; src = fetchurl { diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index 5c8bacac162..a8e957ce484 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, coreutils, findutils, git }: stdenv.mkDerivation rec { - name = "gibo-${version}"; + pname = "gibo"; version = "1.0.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index afcf9cf4c78..5438f71930d 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-town-${version}"; + pname = "git-town"; version = "7.2.0"; goPackagePath = "github.com/Originate/git-town"; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index be4de738c1c..581a1f84fc7 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -2,12 +2,12 @@ , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { - name = "gnokii-${version}"; + pname = "gnokii"; version = "0.6.31"; src = fetchurl { sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8"; - url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz"; + url = "https://www.gnokii.org/download/gnokii/${pname}-${version}.tar.gz"; }; buildInputs = [ diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 0430f010e97..6fad9829d79 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "goaccess-${version}"; + pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index d7c10220f4b..bd53529a5d2 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gosu-${version}"; + pname = "gosu"; version = "2017-05-09"; rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index bdb919006fd..f951e6cba70 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.0.2"; - name = "graylog-${version}"; + pname = "graylog"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 451828b0f47..fde08702f67 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages, makeWrapper }: stdenv.mkDerivation rec { - name = "grc-${version}"; + pname = "grc"; version = "1.11.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index ec77f396527..edb9508df31 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -5,7 +5,7 @@ let arch = else if stdenv.isx86_64 then "x86_64" else throw "Unknown architecture"; in stdenv.mkDerivation rec { - name = "grub4dos-${version}"; + pname = "grub4dos"; version = "0.4.6a-2019-05-12"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index f7cdf5ca608..78a678f0714 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version="1.1.3"; - name = "gsmartcontrol-${version}"; + pname = "gsmartcontrol"; src = fetchurl { url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index a66b32c789c..bca481cade4 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gti-${version}"; + pname = "gti"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix index db18cae77b1..9fe26777110 100644 --- a/pkgs/tools/misc/h5utils/default.nix +++ b/pkgs/tools/misc/h5utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.13.1"; - name = "h5utils-${version}"; + pname = "h5utils"; # fetchurl is used instead of fetchFromGitHub because the git repo version requires # additional tools to build compared to the tarball release; see the README for details. diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index be5e1371cd4..8c2e7dc7451 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, wxGTK30, openssl, curl }: stdenv.mkDerivation rec { - name = "hakuneko-${version}"; + pname = "hakuneko"; version = "1.4.2"; src = fetchurl { diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index bd3bebc881e..e765e923474 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "hdf-${version}"; + pname = "hdf"; version = "4.2.14"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix index 17b48ad8741..d27f6fc01bc 100644 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ b/pkgs/tools/misc/hdf5/1_8.nix @@ -24,9 +24,9 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { version = "1.8.19"; - name = "hdf5-${version}"; + pname = "hdf5"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ; }; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index e6402322d35..336010718dd 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -17,9 +17,9 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { version = "1.10.5"; - name = "hdf5-${version}"; + pname = "hdf5"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8"; }; diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 0fe72425d79..6087a76e6bd 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, javac }: stdenv.mkDerivation rec { - name = "hdf-java-${version}"; + pname = "hdf-java"; version = "3.3.2"; src = fetchurl { diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 82801da322c..fb6914c01d0 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { - name = "hdfview-${version}"; + pname = "hdfview"; version = "2.14"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; + url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz"; sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; }; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index 55542b4c7fc..39678abeba4 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.18"; - name = "hebcal-${version}"; + pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index b080e23b265..eabb7838e8a 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "hexd-${version}"; + pname = "hexd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index b4ee1f2f5c0..4b1b0d0c762 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, xorg, pkgconfig}: stdenv.mkDerivation rec { - name = "hhpc-${version}"; + pname = "hhpc"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix index a0fcc6074dc..61832a5d326 100644 --- a/pkgs/tools/misc/hostsblock/default.nix +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -20,7 +20,7 @@ ] }: stdenv.mkDerivation rec { - name = "hostsblock-${version}"; + pname = "hostsblock"; version = "20161213"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index d9aaefb46d9..16bc0393f23 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openblasCompat, mpi } : stdenv.mkDerivation rec { - name = "hpl-${version}"; + pname = "hpl"; version = "2.3"; src = fetchurl { - url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz"; + url = "http://www.netlib.org/benchmark/hpl/${pname}-${version}.tar.gz"; sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j"; }; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 7035f2ecedf..bc934c424f3 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "i3cat-${version}"; + pname = "i3cat"; version = "20150321-${stdenv.lib.strings.substring 0 7 rev}"; rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 898ecd9df4a..372eebb59f6 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "i3minator-${version}"; + pname = "i3minator"; version = "0.0.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 141fc968a2d..872de2c702b 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage}: buildGoPackage rec { - name = "ical2org-${version}"; + pname = "ical2org"; version="1.1.5"; goPackagePath = "github.com/rjhorniii/ical2org"; diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 15af413a999..98b039e3f8a 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "ideviceinstaller"; version = "2018-10-01"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix index 7d15825c27e..7fe4ad86b8e 100644 --- a/pkgs/tools/misc/ifdtool/default.nix +++ b/pkgs/tools/misc/ifdtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ifdtool-${version}"; + pname = "ifdtool"; version = "4.9"; src = fetchurl { diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix index 66378e457a2..87aa7df8d6d 100644 --- a/pkgs/tools/misc/intelmetool/default.nix +++ b/pkgs/tools/misc/intelmetool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, zlib, pciutils }: stdenv.mkDerivation rec { - name = "intelmetool-${version}"; + pname = "intelmetool"; version = "4.8.1"; src = fetchgit { diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index caefcb835a3..981d9f2dc6c 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { - name = "ipad_charge-${version}"; + pname = "ipad_charge"; version = "2015-02-03"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index a87d199d9bd..3529324b30a 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ised-${version}"; + pname = "ised"; version = "2.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/ised/${name}.tar.bz2"; + url = "mirror://sourceforge/project/ised/${pname}-${version}.tar.bz2"; sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb"; }; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index d82347fef8f..bf1501155d9 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jdupes-${version}"; + pname = "jdupes"; version = "1.13.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 208c04ff039..c19ed50ece2 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -2,7 +2,7 @@ , perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { - name = "keychain-${version}"; + pname = "keychain"; version = "2.8.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index be0ceda511c..c272584e2c0 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "kt-${version}"; + pname = "kt"; version = "12.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index b7963c3ed81..2ca99eb61e8 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -6,7 +6,7 @@ # https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb stdenv.mkDerivation rec { - name = "latex2html-${version}"; + pname = "latex2html"; version = "2018"; src = fetchurl { diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 72c9cecf540..5955c1104d3 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: stdenv.mkDerivation rec { - name = "ldapvi-${version}"; + pname = "ldapvi"; version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; # use latest git, it includes some important patches since 2007 release diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index c6b544f9e0a..b59c46a8477 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -2,7 +2,7 @@ libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "ldmtool-${version}"; + pname = "ldmtool"; version = "0.2.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 95f88654425..61e115e71eb 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "lf-${version}"; + pname = "lf"; version = "13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 8c9db5b8a77..e31112a74d8 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libcpuid-${version}"; + pname = "libcpuid"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index d489a5188f1..9bc7c372d93 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.05"; - name = "quota-${version}"; + pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 7834bc96bef..2545dd1e6bc 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = elk5Version; - name = "logstash-${version}"; + pname = "logstash"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0"; }; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index dc33d2ece54..b580d559868 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -4,7 +4,7 @@ # $path/logstash/{inputs,codecs,filters,outputs}/*.rb stdenv.mkDerivation rec { version = "1.4.2"; - name = "logstash-contrib-${version}"; + pname = "logstash-contrib"; src = fetchzip { url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index cb594391e2a..4521f8b407a 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -4,7 +4,7 @@ # adding this to services.udev.packages on NixOS stdenv.mkDerivation rec { - name = "ltunify-${version}"; + pname = "ltunify"; version = "unstable-20180330"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 9ddd9218801..828e2358236 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "mandoc-${version}"; + pname = "mandoc"; version = "1.14.5"; src = fetchurl { diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index e2ff4868c9e..6d198a35605 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "massren-${version}"; + pname = "massren"; version = "1.5.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 59ed474e9bc..44b00adf5c1 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20190725"; - name = "mbuffer-${version}"; + pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 7f0cdac1dbf..b2711903ead 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -2,11 +2,11 @@ , libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}: stdenv.mkDerivation rec { - name = "mc-${version}"; + pname = "mc"; version = "4.8.23"; src = fetchurl { - url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; + url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"; }; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 52c96fda197..bc520c57a33 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.8"; - name = "mcrypt-${version}"; + pname = "mcrypt"; src = fetchurl { - url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${pname}-${version}.tar.gz"; sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; }; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index bbd78feaaf8..5121491625f 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,7 +1,7 @@ { stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }: stdenv.mkDerivation rec { - name = "megacli-${version}"; + pname = "megacli"; version = "8.07.14"; src = diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix index 4f6c4bad97c..e382db0b92c 100644 --- a/pkgs/tools/misc/mht2htm/default.nix +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -4,7 +4,7 @@ let date = "07.apr.2016"; in stdenv.mkDerivation rec { - name = "mht2mht-${version}"; + pname = "mht2mht"; version = "1.8.1.35"; src = fetchurl { diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 3c2ed135225..3e23e2bddcc 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -2,7 +2,7 @@ , lrzsz, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "minicom-${version}"; + pname = "minicom"; version = "2.7.1"; # The repository isn't tagged properly, so we need to use commit refs diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix index 7b9549a80fe..7b8b8a82b72 100644 --- a/pkgs/tools/misc/ministat/default.nix +++ b/pkgs/tools/misc/ministat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "ministat-${version}"; + pname = "ministat"; version = "20150715-1"; src = fetchgit { diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index da1e8be7cf4..b2f7fdf2a90 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, openssl}: stdenv.mkDerivation rec { - name = "mktorrent-${version}"; + pname = "mktorrent"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index baf418ac9f0..f8fb253af47 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -3,11 +3,11 @@ let dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; in stdenv.mkDerivation rec { - name = "mlocate-${version}"; + pname = "mlocate"; version = "0.26"; src = fetchurl { - url = "https://releases.pagure.org/mlocate/${name}.tar.xz"; + url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz"; sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh"; }; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index 1d3a355dd95..a791cbe5d48 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mmake-${version}"; + pname = "mmake"; version = "1.2.0"; goPackagePath = "github.com/tj/mmake"; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 602c9c26c78..6129f15c734 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mmv-${version}"; + pname = "mmv"; version = "1.01b"; src = fetchurl { diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index a728450d76e..dc7a64bdcf7 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -10,7 +10,7 @@ in with stdenv.lib; buildGoPackage rec { - name = "mongo-tools-${version}"; + pname = "mongo-tools"; version = "3.7.2"; rev = "r${version}"; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 00cbc8b4629..336d673f7ec 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "moreutils-${version}"; + pname = "moreutils"; version = "0.63"; src = fetchgit { diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 5be323a6f4b..df84084fc9c 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: stdenv.mkDerivation rec { - name = "mpdscribble-${version}"; + pname = "mpdscribble"; version = "0.22"; src = fetchurl { diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 778671f0b54..363e90ab5f2 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "mprime-${version}"; + pname = "mprime"; version = "29.4b7"; src = fetchurl { diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 26fcea669c2..922592a256d 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "2.17.7"; - name = "mrtg-${version}"; + pname = "mrtg"; src = fetchurl { - url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz"; sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; }; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 04271b61069..2607cf6f300 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "ms-sys-${version}"; + pname = "ms-sys"; version = "2.6.0"; src = fetchurl { - url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; + url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz"; sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz"; }; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 07561d390cd..3037b672498 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.4.2"; - name = "multitail-${version}"; + pname = "multitail"; src = fetchurl { - url = "https://www.vanheusden.com/multitail/${name}.tgz"; + url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz"; sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"; }; diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 9c483fe3b8f..183871c39a7 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mysqltuner-${version}"; + pname = "mysqltuner"; version = "1.7.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 57036acb58e..525c16b6024 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "nagstamon-${version}"; + pname = "nagstamon"; version = "3.2.1"; src = fetchurl { diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index 2312ce236ab..a1a6347642b 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nbench-byte-${version}"; + pname = "nbench-byte"; version = "2.2.3"; src = fetchurl { - url = "http://www.math.utah.edu/~mayer/linux/${name}.tar.gz"; + url = "http://www.math.utah.edu/~mayer/linux/${pname}-${version}.tar.gz"; sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj"; }; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index bb792451564..97842f82ae9 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ncdu-${version}"; + pname = "ncdu"; version = "1.14"; src = fetchurl { - url = "https://dev.yorhel.nl/download/${name}.tar.gz"; + url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"; }; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 18ae88547a0..9d1357f5d2c 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "neofetch-${version}"; + pname = "neofetch"; version = "6.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index e19eac1c51e..91dd56c9b0f 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2019-02-13"; - name = "nginx-config-formatter-${version}"; + pname = "nginx-config-formatter"; src = fetchFromGitHub { owner = "1connect"; diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix index 3037262322f..0005ffe824b 100644 --- a/pkgs/tools/misc/nms/default.nix +++ b/pkgs/tools/misc/nms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nms-${version}"; + pname = "nms"; version = "0.3.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index 77c84ab4511..b197e9bc5d2 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -3,7 +3,7 @@ with python3.pkgs; buildPythonApplication rec { - name = "noteshrink-${version}"; + pname = "noteshrink"; version = "0.1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 23646abe787..bfe674d2f5c 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: buildGoPackage rec { - name = "noti-${version}"; + pname = "noti"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 93c0f5e346b..307a08bbdf9 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, dbus, pkgconfig }: stdenv.mkDerivation rec { - name = "notify-desktop-${version}"; + pname = "notify-desktop"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix index fdce7076661..ecff547e951 100644 --- a/pkgs/tools/misc/nvramtool/default.nix +++ b/pkgs/tools/misc/nvramtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, iasl, flex, bison }: stdenv.mkDerivation rec { - name = "nvramtool-${version}"; + pname = "nvramtool"; version = "4.8.1"; src = fetchgit { diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix index 6d508a48901..3b45b7b0644 100644 --- a/pkgs/tools/misc/oci-image-tool/default.nix +++ b/pkgs/tools/misc/oci-image-tool/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "oci-image-tool-${version}"; + pname = "oci-image-tool"; version = "1.0.0-rc1"; goPackagePath = "github.com/opencontainers/image-tools"; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 9ffb89aca6b..4317c46190d 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -4,7 +4,7 @@ let system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; in stdenv.mkDerivation rec { - name = "ocz-ssd-guru-${version}"; + pname = "ocz-ssd-guru"; version = "1.0.1170"; src = fetchurl { diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index f6aea4a92ab..2a0846dd511 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "opentsdb-${version}"; + pname = "opentsdb"; version = "2.3.1"; src = fetchurl { - url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd"; }; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 59a60e356b8..78426329975 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -10,7 +10,7 @@ ntfs3g # ntfs3g stdenv.mkDerivation rec { version = "1.76"; - name = "os-prober-${version}"; + pname = "os-prober"; src = fetchurl { url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2"; sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g"; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index f14fb526997..370d1924711 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: stdenv.mkDerivation rec { - name = "osm2pgsql-${version}"; + pname = "osm2pgsql"; version = "0.96.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index 96e5e6a1d94..4b28a7c45e5 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, premake5 }: stdenv.mkDerivation rec { - name = "otfcc-${version}"; + pname = "otfcc"; version = "0.9.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 1e747961499..5313b69933b 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -3,7 +3,7 @@ , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { - name = "parcellite-${version}"; + pname = "parcellite"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index a5e45dc259b..c2c8e2b8573 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5"; - name = "pastebinit-${version}"; + pname = "pastebinit"; src = fetchurl { - url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index fe1d848ee50..858422b8532 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -6,7 +6,7 @@ assert video -> capture != null; assert clipboard -> xclip != null; stdenv.mkDerivation rec { - name = "pb_cli-unstable-${version}"; + pname = "pb_cli-unstable"; version = "2019-03-10"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index c16106f4637..6c1bc5fcf04 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }: stdenv.mkDerivation rec { - name = "phoronix-test-suite-${version}"; + pname = "phoronix-test-suite"; version = "8.8.1"; src = fetchurl { - url = "https://phoronix-test-suite.com/releases/${name}.tar.gz"; + url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn"; }; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index 74d24db574f..dd07fee3405 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "phraseapp-client-${version}"; + pname = "phraseapp-client"; version = "1.11.0"; goPackagePath = "github.com/phrase/phraseapp-client"; diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 45b0da6f8db..ceb2bace7db 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: stdenv.mkDerivation rec { - name = "pick-${version}"; + pname = "pick"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index c49695fd9ad..1ad21940368 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -5,7 +5,7 @@ assert stdenv.isDarwin -> IOKit != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "picocom-${version}"; + pname = "picocom"; version = "3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index abbd64cb62f..5bd1e347082 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { version = "0.2.8.2"; - name = "pipelight-${version}"; + pname = "pipelight"; src = fetchurl { url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index ececef39850..a16333f6e44 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pixd-${version}"; + pname = "pixd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 1cf64362e6d..eb2881b29f7 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2019.8"; - name = "plantuml-${version}"; + pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index 41913f96653..d2a7f3f37ea 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "plotinus-${version}"; + pname = "plotinus"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 191f8980d83..1d3e8c6c33d 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "plowshare-${version}"; + pname = "plowshare"; version = "2.1.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix index 0bd61c0fcdf..5712e02e8ea 100644 --- a/pkgs/tools/misc/pod2mdoc/default.nix +++ b/pkgs/tools/misc/pod2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pod2mdoc-${version}"; + pname = "pod2mdoc"; version = "0.0.10"; src = fetchurl { - url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f"; }; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 2c9ed7be039..5c1b1be2db3 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -3,7 +3,6 @@ buildGoModule rec { pname = "powerline-go"; version = "1.13.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "justjanne"; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 2a34224c126..0c9d3a0ea79 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.37"; - name = "profile-cleaner-${version}"; + pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index ac98df58784..989a2d3f22b 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.34"; - name = "profile-sync-daemon-${version}"; + pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index b29d0eafcc9..3edca413f3a 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: stdenv.mkDerivation rec { - name = "progress-${version}"; + pname = "progress"; version = "0.14"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1aaed4feafe..ca3016d1187 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { - name = "pspg-${version}"; + pname = "pspg"; version = "1.6.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index 6af33691a07..613ad263ed3 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "radeon-profile-${version}"; + pname = "radeon-profile"; version = "20170714"; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 11ac0fc1419..3d97874df7d 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rcm-${version}"; + pname = "rcm"; version = "1.3.3"; src = fetchurl { diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index 484bb765c0d..88aff4f3c08 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }: stdenv.mkDerivation rec { - name = "recoverjpeg-${version}"; + pname = "recoverjpeg"; version = "2.6.3"; src = fetchurl { - url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; + url = "https://www.rfc1149.net/download/recoverjpeg/${pname}-${version}.tar.gz"; sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv"; }; diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index ee7b2623b1d..627758e9c5e 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.11"; - name = "rig-${version}"; + pname = "rig"; src = fetchurl { url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz"; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index bd60e786036..af5bfedf203 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-${version}"; + pname = "rlwrap"; version = "0.43"; src = fetchurl { - url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; }; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 320edd83021..7b7fa9ce705 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "rmlint-${version}"; + pname = "rmlint"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 925bb199b27..232949b7dac 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -5,7 +5,7 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "rockbox-utility-${version}"; + pname = "rockbox-utility"; version = "1.4.0"; src = fetchurl { diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix index e24b1fce06e..7eebc194300 100644 --- a/pkgs/tools/misc/roundup/default.nix +++ b/pkgs/tools/misc/roundup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ronn, shocco }: stdenv.mkDerivation rec { - name = "roundup-${version}"; + pname = "roundup"; version = "0.0.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 650ac9f660a..d852818b315 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "routino-${version}"; + pname = "routino"; version = "3.2"; src = fetchurl { - url = "https://routino.org/download/${name}.tgz"; + url = "https://routino.org/download/${pname}-${version}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix index 345f26852dc..b6e53e46536 100644 --- a/pkgs/tools/misc/rw/default.nix +++ b/pkgs/tools/misc/rw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rw-${version}"; + pname = "rw"; version = "1.0"; src = fetchurl { diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 2d1db4eb64c..acab41e8ff5 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { version = "2.16"; - name = "sam-ba-${version}"; + pname = "sam-ba"; src = fetchzip { url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip"; diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index bd760adecf7..65b7b47256a 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.17"; - name = "scanmem-${version}"; + pname = "scanmem"; src = fetchFromGitHub { owner = "scanmem"; diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix index 1b7afdfbe9d..2ba3224a5f8 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: buildPythonApplication rec { - name = "scfbuild-${version}"; + pname = "scfbuild"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index df1fcd89ac7..beeeb84aac9 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { - name = "screen-${version}"; + pname = "screen"; version = "4.6.2"; src = fetchurl { - url = "mirror://gnu/screen/${name}.tar.gz"; + url = "mirror://gnu/screen/${pname}-${version}.tar.gz"; sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v"; }; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index a9cd9d75de8..883c2edd80a 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -19,7 +19,7 @@ let ])); in stdenv.mkDerivation rec { - name = "screenFetch-${version}"; + pname = "screenFetch"; version = "3.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 23dccc0273d..742b25601c0 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "sdate-${version}"; + pname = "sdate"; version = "0.5"; src = fetchurl { url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index 6a2ed3bcb91..e821d5e4332 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation rec { - name = "sdl-jstest-${version}"; + pname = "sdl-jstest"; version = "2018-06-15"; # Submodules diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index b45304a43c4..bb7586ee379 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "sl-${version}"; + pname = "sl"; version = "5.04"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 6f7c9d3506b..65031c2a1fe 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "slop-${version}"; + pname = "slop"; version = "7.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index f5e1fd7b1b4..c6661ee62e4 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.15"; - name = "smenu-${version}"; + pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index ac0b950a1da..5eba12285de 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -4,7 +4,7 @@ , lvm2, pam, python, utillinux }: stdenv.mkDerivation rec { - name = "snapper-${version}"; + pname = "snapper"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix index de9366d1d0f..d111e0b2b71 100644 --- a/pkgs/tools/misc/sonota/default.nix +++ b/pkgs/tools/misc/sonota/default.nix @@ -12,7 +12,7 @@ let }; in buildPythonApplication rec { - name = "sonota-unstable-${version}"; + pname = "sonota-unstable"; version = "2018-10-07"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 794c06b8044..e4e1adf2001 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { version = "2.8.1"; - name = "staruml-${version}"; + pname = "staruml"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index e5cc5ad4198..e54dc3b3f2b 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: stdenv.mkDerivation rec { - name = "subberthehut-${version}"; + pname = "subberthehut"; version = "20"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index c96ac41fb26..8d42d2d823f 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2"; - name = "sutils-${version}"; + pname = "sutils"; src = fetchFromGitHub { owner = "baskerville"; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5502f2542f1..e7759199fb9 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -4,7 +4,7 @@ let inherit (python3Packages) python nose pycrypto pyyaml requests mock; in stdenv.mkDerivation rec { - name = "svtplay-dl-${version}"; + pname = "svtplay-dl"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index fd0a766f54e..0d1ebd70041 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -6,7 +6,7 @@ libudev0-shim }: stdenv.mkDerivation rec { - name = "sweep-visualizer-${version}"; + pname = "sweep-visualizer"; version = "0.15.0"; src = fetchurl { diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 6750bbe8ae6..35259dada3d 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "system-config-printer-${version}"; + pname = "system-config-printer"; version = "1.5.11"; src = fetchurl { - url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q"; }; diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index 73e144d93aa..dd48156d456 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "systrayhelper-${version}"; + pname = "systrayhelper"; version = "0.0.4"; rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9"; diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 2d3eb91250a..4cac9befe16 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "teleconsole-${version}"; + pname = "teleconsole"; version = "0.4.0"; goPackagePath = "github.com/gravitational/teleconsole"; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index 2d713ae3821..d875b098ab5 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { - name = "tewisay-unstable-${version}"; + pname = "tewisay-unstable"; version = "2017-04-14"; goPackagePath = "github.com/lucy/tewisay"; diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix index 47216838476..abc25db2fa7 100644 --- a/pkgs/tools/misc/texi2mdoc/default.nix +++ b/pkgs/tools/misc/texi2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "texi2mdoc-${version}"; + pname = "texi2mdoc"; version = "0.1.2"; src = fetchurl { - url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs"; }; diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 9b587c27154..2ca5dfb7758 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: stdenv.mkDerivation rec { - name = "thin-provisioning-tools-${version}"; + pname = "thin-provisioning-tools"; version = "0.7.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 8f297542a3c..bb6276f7065 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "time-${version}"; + pname = "time"; version = "1.9"; src = fetchurl { - url = "mirror://gnu/time/${name}.tar.gz"; + url = "mirror://gnu/time/${pname}-${version}.tar.gz"; sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v"; }; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index ed26895fba6..3a8388280d6 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { - name = "tio-${version}"; + pname = "tio"; version = "1.32"; src = fetchzip { diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index fcd556c5596..d4ff9d8c844 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: stdenv.mkDerivation rec { - name = "tldr-${version}"; + pname = "tldr"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 6e431fdc98e..e5932d9e946 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -14,7 +14,7 @@ let ); in stdenv.mkDerivation rec { - name = "tlp-${version}"; + pname = "tlp"; version = "1.2.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index c87fe8bf446..420692c070c 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -2,7 +2,7 @@ , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { - name = "tmate-${version}"; + pname = "tmate"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index 968ead6131b..fa024e58fa8 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { - name = "togglesg-download-git-${version}"; + pname = "togglesg-download-git"; version = "2017-12-07"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 2729f6f8859..abc6933a777 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libcaca }: stdenv.mkDerivation rec { - name = "toilet-${version}"; + pname = "toilet"; version = "0.3"; src = fetchurl { - url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${name}.tar.gz"; + url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${pname}-${version}.tar.gz"; sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 4591c5ac5b5..be0c33fb6e5 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -6,7 +6,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "toybox"; version = "0.8.1"; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index eed527da416..bfb97c22b1d 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { version = "1.8.3"; - name = "ttfautohint-${version}"; + pname = "ttfautohint"; src = fetchurl { - url = "mirror://savannah/freetype/${name}.tar.gz"; + url = "mirror://savannah/freetype/${pname}-${version}.tar.gz"; sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7"; }; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 5663bcc35fd..59091bcd2bd 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -2,7 +2,7 @@ , enableUnsafe ? false }: stdenv.mkDerivation rec { - name = "ttwatch-${version}"; + pname = "ttwatch"; version = "2018-12-04"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 113359a8bce..edaa9b662e7 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, pkgconfig }: stdenv.mkDerivation rec { - name = "tty-clock-${version}"; + pname = "tty-clock"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index fda9dc506e2..70856fba731 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "ttylog-${version}"; + pname = "ttylog"; version = "0.31"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 78aeab00a50..45aa9ea5c0b 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "ttyplot-${version}"; + pname = "ttyplot"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix index ca665171811..56ec9afea43 100644 --- a/pkgs/tools/misc/ttyrec/default.nix +++ b/pkgs/tools/misc/ttyrec/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ttyrec-${version}"; + pname = "ttyrec"; version = "1.0.8"; src = fetchurl { - url = "http://0xcc.net/ttyrec/${name}.tar.gz"; + url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz"; sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec"; }; diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index f37892a231a..90f9559e6b7 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { - name = "txt2man-${version}"; + pname = "txt2man"; version = "1.6.0"; src = fetchurl { - url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz"; + url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; }; diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix index 90a9e0fa66f..b642fb6ec5c 100644 --- a/pkgs/tools/misc/txtw/default.nix +++ b/pkgs/tools/misc/txtw/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "txtw-${version}"; + pname = "txtw"; src = fetchFromGitHub { owner = "baskerville"; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 195a31b63e5..d80af088342 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -7,7 +7,7 @@ # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed stdenv.mkDerivation rec { - name = "ultrastar-creator-${version}"; + pname = "ultrastar-creator"; version = "2019-04-23"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 9ac60ca8b13..2b70848cbb8 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { major = "14"; minor = "3"; version = "${major}.${minor}.0"; - name = "umlet-${version}"; + pname = "umlet"; src = fetchurl { url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip"; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 374e1b9eaf6..8f66f566aa7 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "units-${version}"; + pname = "units"; version = "2.19"; src = fetchurl { - url = "mirror://gnu/units/${name}.tar.gz"; + url = "mirror://gnu/units/${pname}-${version}.tar.gz"; sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2"; }; diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index 01b62eed56c..b3937175604 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "up-${version}"; + pname = "up"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index 7751e03df19..607cb47ed4e 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -7,7 +7,7 @@ # (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) & # ''; buildGoPackage rec { - name = "upower-notify-${version}"; + pname = "upower-notify"; version = "20160310-${stdenv.lib.strings.substring 0 7 rev}"; rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 545d7c554ac..fe89e74cb69 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.10"; - name = "urjtag-${version}"; + pname = "urjtag"; src = fetchsvn { url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag"; diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index 83b91f6203e..48bd2b140b7 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "vfdecrypt-${version}"; + pname = "vfdecrypt"; version = "unstable-2010-08-13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index a655aa9502e..7f81774aebe 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.0"; - name = "vimer-${version}"; + pname = "vimer"; src = fetchFromGitHub { owner = "susam"; diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index e9733c7ef79..858cbe9e317 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit version; - name = "vimpager-${version}"; + pname = "vimpager"; src = fetchFromGitHub { inherit sha256; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 4f1ca8f89ce..06280b49fbf 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,7 +2,7 @@ with python3Packages; buildPythonApplication rec { - name = "wakatime-${version}"; + pname = "wakatime"; version = "10.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 00e26d762a4..de3a19c3f51 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -2,7 +2,7 @@ , wayland, wayland-protocols }: stdenv.mkDerivation rec { - name = "wl-clipboard-${version}"; + pname = "wl-clipboard"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 12a97a2e8e4..f25034dd8cd 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.3.0"; - name = "woeusb-${version}"; + pname = "woeusb"; src = fetchFromGitHub { owner = "slacka"; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 35da2e0a4e9..fa3ab747f64 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2012-05-31"; - name = "woof-${version}"; + pname = "woof"; src = fetchurl { url = "http://www.home.unix-ag.org/simon/woof-${version}.py"; diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index f19d448e5fc..78affe34b58 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "wv"; version = "1.2.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; + url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 1029dbb29d8..ec516555273 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.6"; - name = "wyrd-${version}"; + pname = "wyrd"; src = fetchurl { url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz"; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 79565af8e92..69009b86af8 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { - name = "xclip-${version}"; + pname = "xclip"; version = "0.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 8260d7921ec..28268052826 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }: stdenv.mkDerivation rec { - name = "xdaliclock-${version}"; + pname = "xdaliclock"; version = "2.44"; src = fetchurl { - url="https://www.jwz.org/xdaliclock/${name}.tar.gz"; + url="https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz"; sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0"; }; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index c33e01fa0e7..f042b9e209f 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }: stdenv.mkDerivation rec { - name = "xdo-${version}"; + pname = "xdo"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index d8959687945..f3f80143c57 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -3,7 +3,7 @@ , libappindicator-gtk2, xflux, librsvg, wrapGAppsHook }: pythonPackages.buildPythonApplication rec { - name = "xflux-gui-${version}"; + pname = "xflux-gui"; version = "1.1.10"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index f51746e312e..43a67406970 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: stdenv.mkDerivation rec { - name = "xiccd-${version}"; + pname = "xiccd"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index 7a092e59562..ad5086f2f59 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "xmonad-log-${version}"; + pname = "xmonad-log"; version = "0.1.0"; goPackagePath = "github.com/xintron/xmonad-log"; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 0ec7d58598f..cd4d709fb76 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }: stdenv.mkDerivation rec { - name = "xsel-unstable-${version}"; + pname = "xsel-unstable"; version = "2018-01-10"; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 303722aac0b..d369bb4fed7 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }: pythonPackages.buildPythonApplication rec { - name = "yle-dl-${version}"; + pname = "yle-dl"; version = "2.31"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 8308d5eebcd..c20fe68b7b2 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: stdenv.mkDerivation rec { - name = "yubikey-personalization-${version}"; + pname = "yubikey-personalization"; version = "1.20.0"; src = fetchurl { diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index a8b621e32ac..d2157388512 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -3,7 +3,7 @@ let pythonPackages = python2Packages; in pythonPackages.buildPythonApplication rec { - name = "zabbix-cli-${version}"; + pname = "zabbix-cli"; version = "2.1.1"; propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 61945266e13..657d93a3ca0 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { - name = "zsh-autoenv-${version}"; + pname = "zsh-autoenv"; version = "2017-12-16"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 108071edb64..be64ff47e6b 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zsh-navigation-tools-${version}"; + pname = "zsh-navigation-tools"; version = "2.2.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 1e10529082f..60b3b6df69a 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "acme-client-${version}"; + pname = "acme-client"; version = "0.1.16"; src = fetchurl { diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index dccab1796fb..08db7b4f58d 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "argus-clients"; version = "3.0.8.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://qosient.com/argus/src/${name}.tar.gz"; + url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz"; sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj"; }; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index 8b9d1e3b704..72c0a78a447 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "argus"; version = "3.0.8.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://qosient.com/argus/src/${name}.tar.gz"; + url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz"; sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 8d9ec928811..e086105e19e 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "aria2-${version}"; + pname = "aria2"; version = "1.34.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 4358d22142d..2d68affacc1 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.19"; - name = "arping-${version}"; + pname = "arping"; buildInputs = [ libnet libpcap ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 7904ffb0d04..bfb1abaeaf2 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: buildGoPackage rec { - name = "assh-${version}"; + pname = "assh"; version = "2.7.0"; goPackagePath = "github.com/moul/advanced-ssh-config"; diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index de8bcc8e7ff..4d069a7e6d7 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "ASynK-${version}"; + pname = "ASynK"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz"; sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1"; }; diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index e6d5abc1761..7fcd677044f 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: stdenv.mkDerivation rec { - name = "atftp-${version}"; + pname = "atftp"; version = "0.7.2"; src = fetchurl { - url = "mirror://sourceforge/atftp/${name}.tar.gz"; + url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s"; }; diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index 93a98a10daa..7cd7254518a 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }: stdenv.mkDerivation rec { - name = "biosdevname-${version}"; + pname = "biosdevname"; version = "0.7.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index 386642614bc..2c5e1a2f8f4 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, python, gyp, utillinux }: stdenv.mkDerivation rec { - name = "bud-${version}"; + pname = "bud"; version = "0.34.1"; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 81dd294d786..46bac3d5b5b 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "bully-${version}"; + pname = "bully"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 6fac4a282d0..2c78b20138a 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "6.1.8"; seafileVersion = "6.1.8"; - name = "ccnet-${version}"; + pname = "ccnet"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 33f004190e4..740c6c998fe 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -4,12 +4,12 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "chrony-${version}"; + pname = "chrony"; version = "3.5"; src = fetchurl { - url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; + url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf"; }; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index cc88153bab9..63aec7cfb92 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, qmake, qtbase }: stdenv.mkDerivation rec { - name = "cmst-${version}"; + pname = "cmst"; version = "2019.01.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; - rev = name; + rev = "${pname}-${version}"; sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh"; }; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index 6267e3a7790..9b8a1f0e790 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which}: stdenv.mkDerivation rec { - name = "cntlm-${version}"; + pname = "cntlm"; version = "0.92.3"; src = fetchurl { - url = "mirror://sourceforge/cntlm/${name}.tar.gz"; + url = "mirror://sourceforge/cntlm/${pname}-${version}.tar.gz"; sha256 = "1632szz849wasvh5sm6rm1zbvbrkq35k7kcyvx474gyl4h4x2flw"; }; diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 3d63340adb0..17923081dfd 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "connect-${version}"; + pname = "connect"; version ="1.105"; src = fetchurl { diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix index d5688354a76..a3c774a62b1 100644 --- a/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -2,7 +2,7 @@ gtk3, connman, openconnect, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "connman-gtk-${version}"; + pname = "connman-gtk"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 8c4d4fa8486..dd636173cb7 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: stdenv.mkDerivation rec { - name = "connman-ncurses-${version}"; + pname = "connman-ncurses"; version = "2015-07-21"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index 42b0c37411c..3b30935d6cf 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "connman-notify-${version}"; + pname = "connman-notify"; version = "2014-06-23"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index c39c82df634..0d91dabaaeb 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, connman, dmenu }: stdenv.mkDerivation rec { - name = "connman_dmenu-${version}"; + pname = "connman_dmenu"; version = "git-29-9-2015"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix index 7c42cc965a0..17e8551fdda 100644 --- a/pkgs/tools/networking/connman/connmanui/default.nix +++ b/pkgs/tools/networking/connman/connmanui/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: stdenv.mkDerivation rec { - name = "connmanui-${version}"; + pname = "connmanui"; rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516"; version = "22062015-${rev}"; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index a4e8c17a545..56b0347e17f 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -3,10 +3,10 @@ wpa_supplicant, readline6, pptp, ppp }: stdenv.mkDerivation rec { - name = "connman-${version}"; + pname = "connman"; version = "1.37"; src = fetchurl { - url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; + url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; }; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index 4ec23862522..6509c9c3106 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.719"; - name = "darkstat-${version}"; + pname = "darkstat"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.bz2"; + url = "${meta.homepage}/${pname}-${version}.tar.bz2"; sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf"; }; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 4b16eb406e3..ff4d0d64c20 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.4"; - name = "davix-${version}"; + pname = "davix"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index 02bdb3e2a46..98902e9809b 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { version = "5.11.2"; - name = "dd-agent-${version}"; + pname = "dd-agent"; src = fetchFromGitHub { owner = "datadog"; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index d2ae24c8a71..32fbed7eb9f 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -6,7 +6,7 @@ let python = pythonPackages.python; in buildGoPackage rec { - name = "datadog-agent-${version}"; + pname = "datadog-agent"; version = "6.11.2"; owner = "DataDog"; repo = "datadog-agent"; diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 25ce4bcd68e..340bf4d863c 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "datadog-process-agent-${version}"; + pname = "datadog-process-agent"; version = "6.11.1"; owner = "DataDog"; repo = "datadog-process-agent"; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 6987bc553a5..24e23e6e0d3 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dhcp-${version}"; + pname = "dhcp"; version = "4.4.1"; src = fetchurl { - url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz"; sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia"; }; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index d557c0ab9ad..a6cb05b3865 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcping-${version}"; + pname = "dhcping"; version = "1.2"; src = fetchurl { diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index fd306a0bcca..43c9455712d 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dibbler-${version}"; + pname = "dibbler"; version = "1.0.1"; src = fetchurl { - url = "http://www.klub.com.pl/dhcpv6/dibbler/${name}.tar.gz"; + url = "http://www.klub.com.pl/dhcpv6/dibbler/${pname}-${version}.tar.gz"; sha256 = "18bnwkvax02scjdg5z8gvrkvy1lhssfnlpsaqb5kkh30w1vri1i7"; }; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index d4837d28c82..fe845f3cae8 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -4,7 +4,7 @@ let major = "2"; minor = "22"; in stdenv.mkDerivation rec { - name = "dirb-${version}"; + pname = "dirb"; version = "${major}.${minor}"; src = fetchurl { diff --git a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix index c0b2c795a40..fc4e40929c9 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dnscrypt-proxy-${version}"; + pname = "dnscrypt-proxy"; version = "1.9.5"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${name}.orig.tar.gz"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}-${version}.orig.tar.gz"; sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8"; }; diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index a43900ea4a5..94d52b953d4 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }: stdenv.mkDerivation rec { - name = "dnscrypt-wrapper-${version}"; + pname = "dnscrypt-wrapper"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index ed46b49d8c7..63e19e924fc 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "dnsperf-${version}"; + pname = "dnsperf"; version = "2.3.1"; # The same as the initial commit of the new GitHub repo (only readme changed). diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index fd932617c93..566579555d3 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -5,7 +5,7 @@ with lib; stdenv.mkDerivation rec { - name = "driftnet-${version}"; + pname = "driftnet"; version = "1.1.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index 12d9da87b39..f5dfff62a96 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tcl }: stdenv.mkDerivation rec { - name = "eggdrop-${version}"; + pname = "eggdrop"; version = "1.6.21-nix1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix index 83af542b8ad..2800139f8fa 100644 --- a/pkgs/tools/networking/envoy/default.nix +++ b/pkgs/tools/networking/envoy/default.nix @@ -215,7 +215,7 @@ let in stdenv.mkDerivation rec { - name = "envoy-${version}"; + pname = "envoy"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 607b11aaffb..ffd7d25a0dc 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }: stdenv.mkDerivation rec { - name = "eternal-terminal-${version}"; + pname = "eternal-terminal"; version = "5.1.10"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix index 9737108e6ac..d5190331d33 100644 --- a/pkgs/tools/networking/fakeroute/default.nix +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fakeroute-${version}"; + pname = "fakeroute"; version = "0.3"; src = fetchurl { - url = "https://moxie.org/software/fakeroute/${name}.tar.gz"; + url = "https://moxie.org/software/fakeroute/${pname}-${version}.tar.gz"; sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f"; }; diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index ef356935c56..43efe2090f2 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "18"; - name = "fastd-${version}"; + pname = "fastd"; src = fetchgit { url = "git://git.universe-factory.net/fastd"; diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index a0b298f3f4e..2cf111e8ccf 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; - name = "ferm-${version}"; + pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz"; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 259225e0b7c..f16fcc7048c 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "flannel-${version}"; + pname = "flannel"; version = "0.11.0"; rev = "v${version}"; diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix index 3f89323de36..4ac979cc4a6 100644 --- a/pkgs/tools/networking/freebind/default.nix +++ b/pkgs/tools/networking/freebind/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }: stdenv.mkDerivation rec { - name = "freebind-${version}"; + pname = "freebind"; version = "2017-12-27"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index e94c3e4330f..aab5b77351c 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { version = "1.9.1"; - name = "gmvault-${version}"; + pname = "gmvault"; src = fetchurl { url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz"; - name = "${name}.tar.bz"; + name = "${pname}-${version}.tar.bz"; sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji"; }; diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix index 88a6b74686c..c260b47a633 100644 --- a/pkgs/tools/networking/goklp/default.nix +++ b/pkgs/tools/networking/goklp/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goklp-${version}"; + pname = "goklp"; version = "1.6"; goPackagePath = "github.com/AppliedTrust/goklp"; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index 10100b933d4..12f285c2a60 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -3,7 +3,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "grpcurl-${version}"; + pname = "grpcurl"; version = "1.0.0"; rev = "v${version}"; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index bcc68a2a19f..ba59870a6b8 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: stdenv.mkDerivation rec { - name = "gvpe-${version}"; + pname = "gvpe"; version = "3.0"; src = fetchurl { diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 6fd4ab36163..ccc598b0692 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, nettools }: stdenv.mkDerivation rec { - name = "hans-${version}"; + pname = "hans"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 62ac791252d..d8711d516dc 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -10,10 +10,9 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; version = "1.9.8"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; + url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id"; }; diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index ba76c37a4bb..96fb342e27f 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }: stdenv.mkDerivation rec { - name = "horst-${version}"; + pname = "horst"; version = "5.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 3fdebbf4966..6e00a6e9afa 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, tcl }: stdenv.mkDerivation rec { - name = "hping-${version}"; + pname = "hping"; version = "20051105"; src = fetchurl { diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index a4c6e517a75..4a350d237d0 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "htpdate-${version}"; + pname = "htpdate"; src = fetchurl { - url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz"; + url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz"; sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q"; }; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 78dc52905d8..5200a751be4 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -3,7 +3,6 @@ pythonPackages.buildPythonApplication rec { pname = "http-prompt"; version = "1.0.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index fa8bbb91c5b..271be9c2352 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "httperf"; - name = "${pname}-${version}"; version = "0.9.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index abde3f2a380..05d4f180ef7 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -2,11 +2,11 @@ , fftw ? null }: stdenv.mkDerivation rec { - name = "httping-${version}"; + pname = "httping"; version = "2.5"; src = fetchurl { - url = "https://vanheusden.com/httping/${name}.tgz"; + url = "https://vanheusden.com/httping/${pname}-${version}.tgz"; sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index 8ec0ce2847d..a7b157d3ebc 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "httplab-${version}"; + pname = "httplab"; version = "0.3.0"; rev = "v${version}"; diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index 5a29657bd5b..1649ebfb3ce 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "httpstat"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix index c47dd03cb9d..df62f90ad0b 100644 --- a/pkgs/tools/networking/httptunnel/default.nix +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.3"; - name = "httptunnel-${version}"; + pname = "httptunnel"; src = fetchurl { - url = "http://www.nocrew.org/software/httptunnel/${name}.tar.gz"; + url = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz"; sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"; }; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 7d709df75b6..0b0860126b5 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,7 +1,7 @@ { stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: let wrapper = stdenv.mkDerivation rec { - name = "wrapper-${version}"; + pname = "wrapper"; version = "3.5.35"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 050f1c9cd4a..97dbb1bdb8f 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,8 +8,6 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { - - name = pname + "-" + version; pname = "i2pd"; version = "2.26.0"; diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 8b7f4e1c2a0..756e77f1157 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, net_snmp }: stdenv.mkDerivation rec { - name = "ifstat-legacy-${version}"; + pname = "ifstat-legacy"; version = "1.1"; src = fetchurl { diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 47352d21c4a..20169121cd9 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -2,7 +2,7 @@ , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { - name = "inadyn-${version}"; + pname = "inadyn"; version = "2.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix index c37b409cdfb..b49b34d6dc7 100644 --- a/pkgs/tools/networking/iouyap/default.nix +++ b/pkgs/tools/networking/iouyap/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "iouyap"; version = "0.97"; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 3c2e7f53bee..c3304c385e7 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ip2location-${version}"; + pname = "ip2location"; version = "7.0.0"; src = fetchurl { diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 549461fe5d0..ab09399cd8e 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ip2unix-${version}"; + pname = "ip2unix"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 26c8d89b5d4..2727175f041 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "ipcalc-${version}"; + pname = "ipcalc"; version = "0.41"; src = fetchurl { - url = "http://jodies.de/ipcalc-archive/${name}.tar.gz"; + url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz"; sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a"; }; buildInputs = [perl]; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 9b4edd76305..169fea6c447 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -2,11 +2,11 @@ , geoip ? null, geolite-legacy ? null }: stdenv.mkDerivation rec { - name = "ipv6calc-${version}"; + pname = "ipv6calc"; version = "1.1.0"; src = fetchurl { - url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; + url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"; sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq"; }; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 7877200116d..931cfa3a74d 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kail-${version}"; + pname = "kail"; version = "0.8.0"; goPackagePath = "github.com/boz/kail"; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index a1c156475fb..17a0e32efbd 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -2,12 +2,11 @@ , boost, python3, postgresql, mysql, gmp, bzip2 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "kea"; version = "1.5.0"; src = fetchurl { - url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "1v5a3prgrplw6dp9124f9gpy0kz0jrjwhnvzrw3zcynad2mlzkpd"; }; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 43d0944a415..9ae981e0369 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "keepalived-${version}"; + pname = "keepalived"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index b4886f58cbb..13bdbe17ff8 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: stdenv.mkDerivation rec { - name = "lftp-${version}"; + pname = "lftp"; version = "4.8.4"; src = fetchurl { urls = [ - "https://lftp.tech/ftp/${name}.tar.xz" - "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz" - "https://lftp.yar.ru/ftp/${name}.tar.xz" + "https://lftp.tech/ftp/${pname}-${version}.tar.xz" + "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz" + "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz" ]; sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f"; }; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index a8e4f2dc83f..b8ba1357f5f 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "lldpd-${version}"; + pname = "lldpd"; version = "1.0.4"; src = fetchurl { - url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; + url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak"; }; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index c5c7e18ba6d..52b2a9a94dc 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -15,11 +15,11 @@ let libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "logmein-hamachi-${version}"; + pname = "logmein-hamachi"; version = "2.1.0.198"; src = fetchurl { - url = "https://www.vpn.net/installers/${name}-${arch}.tgz"; + url = "https://www.vpn.net/installers/${pname}-${version}-${arch}.tgz"; inherit sha256; }; diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index a7648fd59c3..32f6b11d77c 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "maxscale-${version}"; + pname = "maxscale"; version = "2.1.17"; src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "MaxScale"; - rev = "${name}"; + rev = "${pname}-${version}"; sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6"; }; diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index 38b2aa531e6..e902f24ca0e 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mcrcon-${version}"; + pname = "mcrcon"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index c995eea7b14..5a6fb5e5104 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -2,7 +2,7 @@ , asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "megatools-${version}"; + pname = "megatools"; version = "1.10.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index ae8d3d96483..6d29ac29701 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "memtier-benchmark-${version}"; + pname = "memtier-benchmark"; version = "1.2.11"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 3a3ca03f18a..ebd6e7c5799 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "minio-client-${version}"; + pname = "minio-client"; version = "2019-01-30T19-57-22Z"; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 9809b330fab..1277a17f9ba 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libnfnetlink }: stdenv.mkDerivation rec { - name = "minissdpd-${version}"; + pname = "minissdpd"; version = "1.5.20180223"; src = fetchurl { sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - name = "${name}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; buildInputs = [ libnfnetlink ]; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index babfcf1db21..26f6c2498e1 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.6"; - name = "miredo-${version}"; + pname = "miredo"; buildInputs = [ judy ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 75462659699..bd035e8f03c 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -4,7 +4,7 @@ , withMug ? false }: stdenv.mkDerivation rec { - name = "mu-${version}"; + pname = "mu"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix index a352596eed0..a4dcfb4a40f 100644 --- a/pkgs/tools/networking/nat-traverse/default.nix +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "nat-traverse-${version}"; + pname = "nat-traverse"; version = "0.7"; src = fetchurl { diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 90ac44aa375..acd9a0e27f8 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, coreutils }: stdenv.mkDerivation rec { - name = "ncftp-${version}"; + pname = "ncftp"; version = "3.2.6"; src = fetchurl { diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 255d430a3a5..77f797fc7c7 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.06"; - name = "ndjbdns-${version}"; + pname = "ndjbdns"; src = fetchFromGitHub { owner = "pjps"; diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix index 8f8cf929e9d..940a37ab86f 100644 --- a/pkgs/tools/networking/netalyzr/default.nix +++ b/pkgs/tools/networking/netalyzr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "netalyzr-${version}"; + pname = "netalyzr"; version = "57861"; # unfortunately there is not a version specific download URL diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index eac95a32008..a85d4d7ad10 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { - name = "nethogs-${version}"; + pname = "nethogs"; version = "0.8.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index e9704c4babe..864838bdd39 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, texinfo }: stdenv.mkDerivation rec { - name = "netmask-${version}"; + pname = "netmask"; version = "2.4.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index d10125e09a6..dfd355237dc 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -8,7 +8,7 @@ assert checksumType == "mhash" -> libmhash != null; assert checksumType == "openssl" -> openssl != null; stdenv.mkDerivation rec { - name = "netrw-${version}"; + pname = "netrw"; version = "1.3.2"; configureFlags = [ diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index 702fee86922..c40f43c214f 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netselect-${version}"; + pname = "netselect"; version = "0.4"; src = fetchFromGitHub { owner = "apenwarr"; repo = "netselect"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1zncyvjzllrjbdvz7c50d1xjyhs9mwqfy92ndpfc5b3mxqslw4kx"; }; diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index c5613341aab..131ec675115 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -3,7 +3,7 @@ , libgcrypt, perl, libgudev, avahi, ppp, kmod }: stdenv.mkDerivation rec { - name = "network-manager-${version}"; + pname = "network-manager"; version = "0.9.8.10"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c0e29c6538b..28ba97d70c5 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -10,7 +10,7 @@ let pname = "NetworkManager"; pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { - name = "network-manager-${version}"; + pname = "network-manager"; version = "1.18.2"; src = fetchurl { diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix index 665db4cc287..93a169a3fb0 100644 --- a/pkgs/tools/networking/network-manager/dmenu.nix +++ b/pkgs/tools/networking/network-manager/dmenu.nix @@ -3,7 +3,7 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { - name = "networkmanager_dmenu-${version}"; + pname = "networkmanager_dmenu"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 6b69b97552a..60c344e8eb4 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -2,12 +2,11 @@ , gtk3, gnome3, libsecret }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "NetworkManager-strongswan"; version = "1.4.5"; src = fetchurl { - url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; + url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; }; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 9cddc5bbd87..ab8da6236cf 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, pcre }: stdenv.mkDerivation rec { - name = "ngrep-${version}"; + pname = "ngrep"; version = "1.47"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index d0aec7889ef..463227741fb 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { - name = "ngrok-${version}"; + pname = "ngrok"; version = "1.7.1"; rev = "${version}"; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index b199d850f97..dc921dc495a 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nss-pam-ldapd-${version}"; + pname = "nss-pam-ldapd"; version = "0.9.10"; src = fetchurl { - url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; + url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz"; sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0"; }; diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 2ed9c330181..f01d5ccada1 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nuttcp-${version}"; + pname = "nuttcp"; version = "8.1.4"; src = fetchurl { urls = [ - "http://nuttcp.net/nuttcp/latest/${name}.c" - "http://nuttcp.net/nuttcp/${name}/${name}.c" - "http://nuttcp.net/nuttcp/beta/${name}.c" + "http://nuttcp.net/nuttcp/latest/${pname}-${version}.c" + "http://nuttcp.net/nuttcp/${pname}-${version}/${pname}-${version}.c" + "http://nuttcp.net/nuttcp/beta/${pname}-${version}.c" ]; sha256 = "1mygfhwxfi6xg0iycivx98ckak2abc3vwndq74278kpd8g0yyqyh"; }; man = fetchurl { - url = "http://nuttcp.net/nuttcp/${name}/nuttcp.8"; + url = "http://nuttcp.net/nuttcp/${pname}-${version}/nuttcp.8"; sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx"; }; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index af7c4401dae..b3c77f5b797 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -2,7 +2,7 @@ , gnutls, libgcrypt, zlib, openssl }: stdenv.mkDerivation rec { - name = "nzbget-${version}"; + pname = "nzbget"; version = "21.0"; src = fetchurl { diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix index c93e94e2f28..729f5b31998 100644 --- a/pkgs/tools/networking/ocproxy/default.nix +++ b/pkgs/tools/networking/ocproxy/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.60"; - name = "ocproxy-${version}"; + pname = "ocproxy"; src = fetchFromGitHub { owner = "cernekee"; diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 094bebe628f..e695c460422 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ocserv-${version}"; + pname = "ocserv"; version = "0.12.4"; src = fetchFromGitLab { diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix index 8fa30a5c221..cff4b7e9713 100644 --- a/pkgs/tools/networking/olsrd/default.nix +++ b/pkgs/tools/networking/olsrd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "olsrd-${version}"; + pname = "olsrd"; version = "0.9.6.1"; src = fetchurl { - url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2"; + url = "http://www.olsr.org/releases/0.9/${pname}-${version}.tar.bz2"; sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612"; }; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index d261e571705..ba8fc6694d1 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -4,7 +4,7 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { version = "unstable-2018-10-08"; - name = "openconnect_pa-${version}"; + pname = "openconnect_pa"; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 019806fcd57..9ef8c75b728 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "openntpd-${version}"; + pname = "openntpd"; version = "6.2p3"; src = fetchurl { - url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; + url = "mirror://openbsd/OpenNTPD/${pname}-${version}.tar.gz"; sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv"; }; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 302e08617af..73cb98060a0 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "openresolv-${version}"; + pname = "openresolv"; version = "3.9.1"; src = fetchurl { - url = "mirror://roy/openresolv/${name}.tar.xz"; + url = "mirror://roy/openresolv/${pname}-${version}.tar.xz"; sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q"; }; diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index d52cc9d8def..592c24b81fd 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }: stdenv.mkDerivation rec { - name = "opensm-${version}"; + pname = "opensm"; version = "3.3.22"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 24adb554bc1..bb51e3153e1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -21,7 +21,7 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-${version}"; + pname = "openssh"; version = if hpnSupport then "7.8p1" else "7.9p1"; src = if hpnSupport then @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { } else fetchurl { - url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; + url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"; }; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 732687ecfa1..c8aa2c1f5c5 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -18,11 +18,11 @@ let }; in stdenv.mkDerivation rec { - name = "openvpn-${version}"; + pname = "openvpn"; version = "2.4.7"; src = fetchurl { - url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz"; + url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4"; }; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 8c043294143..a5305acdf59 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { version = "1.13.0"; - name = "tahoe-lafs-${version}"; + pname = "tahoe-lafs"; namePrefix = ""; src = fetchurl { @@ -65,8 +65,8 @@ pythonPackages.buildPythonApplication rec { cd docs make singlehtml - mkdir -p "$doc/share/doc/${name}" - cp -rv _build/singlehtml/* "$doc/share/doc/${name}" + mkdir -p "$doc/share/doc/${pname}-${version}" + cp -rv _build/singlehtml/* "$doc/share/doc/${pname}-${version}" make info mkdir -p "$info/share/info" diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index d770a51dc82..13aa8fcbd00 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { version = "1.0"; - name = "packetdrill-${version}"; + pname = "packetdrill"; src = fetchFromGitHub { owner = "google"; repo = "packetdrill"; diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index fbb17308f90..211256ea72b 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pacparser-${version}"; + pname = "pacparser"; version = "1.3.7"; src = fetchurl { - url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/manugarg/pacparser/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b"; }; diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index f2c92d689f3..9bc4c178665 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "par2cmdline-${version}"; + pname = "par2cmdline"; version = "0.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 71d1e6fa6d6..663e04db460 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libpcap, cmake }: stdenv.mkDerivation rec { - name = "pcapc-${version}"; + pname = "pcapc"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 5dff64e27c5..c8b44116846 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "philter-${version}"; + pname = "philter"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/philter/${name}.tar.gz"; + url = "mirror://sourceforge/philter/${pname}-${version}.tar.gz"; sha256 = "177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l"; }; diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 2d13515d83d..d791f6b91d9 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "pingtcp-${version}"; + pname = "pingtcp"; version = "0.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index b082a981ae7..8bbf589f3b3 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pixiewps-${version}"; + pname = "pixiewps"; version = "1.2.2"; src = fetchFromGitHub { owner = "wiire"; diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index 2a70218f287..cf963068d1c 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -4,10 +4,10 @@ let inherit (python2Packages) buildPythonApplication; in buildPythonApplication rec { - name = "polysh-${version}"; + pname = "polysh"; version = "0.4"; src = fetchurl { - url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/polysh/files/${pname}-${version}.tar.bz2"; sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; }; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 26dc71b7d61..b072ed21318 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.4.7"; - name = "ppp-${version}"; + pname = "ppp"; src = fetchurl { - url = "mirror://samba/ppp/${name}.tar.gz"; + url = "mirror://samba/ppp/${pname}-${version}.tar.gz"; sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02"; }; diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index 4c29cd949ee..f373f594df8 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, ppp }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pptpd"; version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/poptop/${pname}/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/poptop/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1h06gyxj51ba6kbbnf6hyivwjia0i6gsmjz8kyggaany8a58pkcg"; }; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 56bd46427d8..848a99f7771 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ - name = "privoxy-${version}"; + pname = "privoxy"; version = "3.0.28"; src = fetchurl { - url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz"; + url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; sha256 = "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm"; }; diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 36d0150a49b..52ef43838c2 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { - name = "proxychains-${version}"; + pname = "proxychains"; version = "4.2.0"; src = fetchFromGitHub { owner = "haad"; repo = "proxychains"; - rev = name; + rev = "${pname}-${version}"; sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc"; }; diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index 22c35962050..43e465e05b6 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { - name = "pssh-${version}"; + pname = "pssh"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 15ac5bceea3..57cd093e1cd 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -30,7 +30,7 @@ let ''); in buildPythonApplication rec { - name = "pykms-${version}"; + pname = "pykms"; version = "20180208"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix index 581405f63c0..b1d972a733b 100644 --- a/pkgs/tools/networking/qr-filetransfer/default.nix +++ b/pkgs/tools/networking/qr-filetransfer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "qr-filetransfer-unstable-${version}"; + pname = "qr-filetransfer-unstable"; version = "2018-10-22"; goPackagePath = "github.com/claudiodangelis/qr-filetransfer"; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 3d7dc68e357..12e07386516 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libsodium }: stdenv.mkDerivation rec { - name = "quicktun-${version}"; + pname = "quicktun"; version = "2.2.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index 0ed1150159d..a0644061c5f 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "radsecproxy-${version}"; + pname = "radsecproxy"; version = "1.6.9"; src = fetchurl { diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 98466a800a3..30e706d6673 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-${version}"; + pname = "radvd"; version = "2.18"; src = fetchurl { - url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; + url = "http://www.litech.org/radvd/dist/${pname}-${version}.tar.xz"; sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1"; }; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index 5e18ee80f99..cf8c370c522 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ratools-${version}"; + pname = "ratools"; version = "0.6.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index ed48feabb85..864a7fb5e61 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -2,8 +2,8 @@ stdenv.mkDerivation rec { version = "1.4"; - name = "reaver-wps-${version}"; - confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db" + pname = "reaver-wps"; + confdir = "/var/db/${pname}-${version}"; # the sqlite database is at "${confdir}/reaver/reaver.db" src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/reaver-${version}.tar.gz"; diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index e584354952a..2ea5a86a231 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "redir-${version}"; + pname = "redir"; version = "3.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 37f542319da..ae84d9662aa 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "ripmime"; version = "1.4.0.10"; src = fetchurl { - url = "http://www.pldaniels.com/${pname}/${name}.tar.gz"; + url = "http://www.pldaniels.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9"; }; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 3814af60112..d53d60333ba 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "s3gof3r-${version}"; + pname = "s3gof3r"; version = "20151109-${stdenv.lib.strings.substring 0 7 rev}"; rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445"; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 5cb65b78ee8..d8167b8a48f 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "samplicator-${version}"; + pname = "samplicator"; version = "1.3.8rc1"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix index be2bc6a75a1..211758f692b 100644 --- a/pkgs/tools/networking/shncpd/default.nix +++ b/pkgs/tools/networking/shncpd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "shncpd-${version}"; + pname = "shncpd"; version = "2016-06-22"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix index 476e7dc229d..f94e177a858 100644 --- a/pkgs/tools/networking/simpleproxy/default.nix +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "simpleproxy-${version}"; + pname = "simpleproxy"; version = "3.5"; rev = "v.${version}"; diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix index 5b046c6eeab..adab157720c 100644 --- a/pkgs/tools/networking/sipcalc/default.nix +++ b/pkgs/tools/networking/sipcalc/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "sipcalc-${version}"; + pname = "sipcalc"; version = "1.1.6"; src = fetchurl { - url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz"; + url = "http://www.routemeister.net/projects/sipcalc/files/${pname}-${version}.tar.gz"; sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357"; }; meta = { diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 908e4b05009..c1a2451328d 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }: stdenv.mkDerivation rec { - name = "sipsak-${version}"; + pname = "sipsak"; version = "4.1.2.1"; buildInputs = [ diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix index e7214793744..722deaff655 100644 --- a/pkgs/tools/networking/skydive/default.nix +++ b/pkgs/tools/networking/skydive/default.nix @@ -2,7 +2,7 @@ , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: buildGoPackage rec { - name = "skydive-${version}"; + pname = "skydive"; version = "0.17.0"; goPackagePath = "github.com/skydive-project/skydive"; diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 91b868a017f..bdd650494b1 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -8,7 +8,7 @@ { stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }: stdenv.mkDerivation rec { - name = "slack-cli-${version}"; + pname = "slack-cli"; version = "0.18.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 0f7c035b4c0..b64cf5cdd9b 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "slirp4netns-${version}"; + pname = "slirp4netns"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 08b5e6a211b..0c9079240d0 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fping, rrdtool, perlPackages }: stdenv.mkDerivation rec { - name = "smokeping-${version}"; + pname = "smokeping"; version = "2.6.11"; src = fetchurl { url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index cdf14f5af33..ba05ee8e8b5 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "snabb-${version}"; + pname = "snabb"; version = "2018.01.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index ad2d88e4a98..9cc3370c0a1 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, coreutils }: stdenv.mkDerivation rec { - name = "spiped-${version}"; + pname = "spiped"; version = "1.5.0"; src = fetchurl { - url = "https://www.tarsnap.com/spiped/${name}.tgz"; + url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; }; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index faeec8523aa..2b5aa2b7cbf 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -7,10 +7,9 @@ in stdenv.mkDerivation rec { pname = "spoofer"; version = "1.4.5"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz"; + url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; }; diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index 01903171e9c..0264da5c817 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, python }: stdenv.mkDerivation rec { - name = "ssh-ident-${version}"; + pname = "ssh-ident"; version = "2016-04-21"; src = fetchFromGitHub { owner = "ccontavalli"; diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 94221a359c1..3765e6aa08f 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "sshpass-${version}"; + pname = "sshpass"; version = "1.06"; src = fetchurl { diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index adda38c184d..ad8f9830264 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation rec { - name = "ssldump-${version}"; + pname = "ssldump"; version = "0.9b3"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 7bbc872c98e..de65298d648 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: stdenv.mkDerivation rec { - name = "sstp-client-${version}"; + pname = "sstp-client"; version = "1.0.12"; src = fetchurl { diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 1bd864d859c..869e568d369 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "strongswan-${version}"; + pname = "strongswan"; version = "5.8.0"; # Make sure to also update when upgrading! src = fetchurl { - url = "https://download.strongswan.org/${name}.tar.bz2"; + url = "https://download.strongswan.org/${pname}-${version}.tar.bz2"; sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m"; }; diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index 89af381d0d6..9b1ee7a9f79 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "stubby"; - name = "${pname}-${version}"; version = "0.2.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 7ba4a0d8936..9960e6f0030 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "stun"; version = "0.97"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 66a6c28d92a..792e6f68294 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "stunnel-${version}"; + pname = "stunnel"; version = "5.55"; src = fetchurl { - url = "https://www.stunnel.org/downloads/${name}.tar.gz"; + url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 2a4cf3506df..b05ab3eeb88 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "subfinder-git-${version}"; + pname = "subfinder-git"; version = "2018-07-15"; goPackagePath = "github.com/subfinder/subfinder"; diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 4fc456523f7..91f15573914 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "2.3.1"; pname = "swagger-codegen"; - name = "${pname}-${version}"; jarfilename = "${pname}-cli-${version}.jar"; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 2abdab773dd..cfed0ca3728 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "swaks-${version}"; + pname = "swaks"; version = "20181104.0"; src = fetchurl { - url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; + url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz"; sha256 = "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2"; }; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 8a4722aa521..016d8f6a6a6 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, perl }: stdenv.mkDerivation rec { - name = "tcpdump-${version}"; + pname = "tcpdump"; version = "4.9.2"; # leaked embargoed security update diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 53af27b4deb..032adbff74f 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, tcpdump }: stdenv.mkDerivation rec { - name = "tcpreplay-${version}"; + pname = "tcpreplay"; version = "4.3.2"; src = fetchurl { diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index bc97d5d8d6e..edd2abdd13e 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tftp-hpa-${version}"; + pname = "tftp-hpa"; version="5.2"; src = fetchurl { - url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz"; + url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz"; sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; }; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index a17f382557a..cf4a2bad78b 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.35"; - name = "tinc-${version}"; + pname = "tinc"; src = fetchurl { url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index df9eb9bdad2..85cdd19702f 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-${version}"; + pname = "tinc"; version = "1.1pre17"; src = fetchgit { diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index c9a6599708c..84ecc44c183 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -2,7 +2,7 @@ libxslt, docbook_xsl }: stdenv.mkDerivation rec{ - name = "tinyproxy-${version}"; + pname = "tinyproxy"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index c3abdd49e13..4062fc0fd58 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }: stdenv.mkDerivation rec { - name = "tracebox-${version}"; + pname = "tracebox"; version = "0.2"; src = fetchzip { diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 3d3be5d4532..af8f5cafb89 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "traceroute-${version}"; + pname = "traceroute"; version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/traceroute/${name}.tar.gz"; + url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz"; sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; }; diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index 6170718b618..fe75b35eea2 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "twa-${version}"; + pname = "twa"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 0cb8ad5a437..ddd0bab5d61 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "ua-unstable-${version}"; + pname = "ua-unstable"; version = "2017-02-24"; rev = "325dab92c60e0f028e55060f0c288aa70905fb17"; diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index f6afddaba38..42839a8ba2f 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ubridge-${version}"; + pname = "ubridge"; version = "0.9.16"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix index cc93da7f253..68f457c2a63 100644 --- a/pkgs/tools/networking/uget-integrator/default.nix +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, uget, python3Packages }: stdenv.mkDerivation rec { - name = "uget-integrator-${version}"; + pname = "uget-integrator"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index b35c3e8c883..6b9d0bfa5dd 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "uget-${version}"; + pname = "uget"; version = "2.2.2"; src = fetchurl { - url = "mirror://sourceforge/urlget/${name}.tar.gz"; + url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz"; sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw"; }; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 861a61c8f38..c0d358f2c9f 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }: stdenv.mkDerivation rec { - name = "unbound-${version}"; + pname = "unbound"; version = "1.9.2"; src = fetchurl { - url = "https://unbound.net/downloads/${name}.tar.gz"; + url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg"; }; diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index f41aa35df90..f6b5852a675 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -4,7 +4,6 @@ let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "pyunbound"; - name = "${pname}-${version}"; version = "1.9.0"; src = fetchurl { diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix index 0c97f20ee65..b1fb6ae8d90 100644 --- a/pkgs/tools/networking/wbox/default.nix +++ b/pkgs/tools/networking/wbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wbox-${version}"; + pname = "wbox"; version = "5"; installPhase = '' @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.hping.org/wbox/${name}.tar.gz"; + url = "http://www.hping.org/wbox/${pname}-${version}.tar.gz"; sha256 = "06daxwbysppvbh1mwprw8fgsp6mbd3kqj7a978w7ivn8hdgdi28m"; }; diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index 1e93948be68..5615c249de9 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python, libev, wafHook }: stdenv.mkDerivation rec { - name = "weighttp-${version}"; + pname = "weighttp"; version = "0.4"; src = fetchgit { diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 38a24eddc28..b7486ded4c8 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-${version}"; + pname = "wget"; version = "1.20.3"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.lz"; + url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"; }; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index ddac709e577..45e1440c849 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.5.0"; - name = "whois-${version}"; + pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 9f67dd4e2c3..2f95876c2f3 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -5,11 +5,11 @@ let inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; in stdenv.mkDerivation rec { - name = "wicd-${version}"; + pname = "wicd"; version = "1.7.2.4"; src = fetchurl { - url = "https://launchpad.net/wicd/1.7/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index a537e4dfb26..dfda88cb867 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchzip }: buildGoPackage rec { - name = "wireguard-go-${version}"; + pname = "wireguard-go"; version = "0.0.20190517"; goPackagePath = "git.zx2c4.com/wireguard-go"; diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 05bf8d5dd11..555c04a0089 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.4"; - name = "wolfebin-${version}"; + pname = "wolfebin"; src = fetchFromGitHub { owner = "thejoshwolfe"; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 5dd2f3b74fd..9c8f46bef07 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, luajit, openssl, perl }: stdenv.mkDerivation rec { - name = "wrk-${version}"; + pname = "wrk"; version = "4.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index e2e638ad485..7908143bdab 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, luajit, openssl, zlib }: stdenv.mkDerivation rec { - name = "wrk2-${version}"; + pname = "wrk2"; version = "4.0.0-${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index b13e5dee18c..e84a97525f1 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "wuzz-${version}"; + pname = "wuzz"; version = "0.2.0"; rev = "v${version}"; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 7cac5a45570..7afd5e07717 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: stdenv.mkDerivation rec { - name = "zap-${version}"; + pname = "zap"; version = "2.7.0"; src = fetchFromGitHub { owner = "zaproxy"; diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index 3742d22c021..664e55125b5 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -1,7 +1,7 @@ { stdenv, haskellPackages, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nix-script-${version}"; + pname = "nix-script"; version = "2015-09-22"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index bcf96a50d36..f161591c8f1 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "apt-dater-${version}"; + pname = "apt-dater"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 46da85d9748..cbb4ad4591e 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "apt-${version}"; + pname = "apt"; version = "1.4.6"; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index 0f45084f3c0..938a762ba30 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab }: stdenv.mkDerivation rec { - name = "bunny-${version}"; + pname = "bunny"; version = "1.3"; src = fetchFromGitLab { diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index e45906688ad..5354fbb5e5e 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cde-${version}"; + pname = "cde"; version = "0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 158db426c61..60c77db44d8 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.8.1"; - name = "clib-${version}"; + pname = "clib"; src = fetchFromGitHub { rev = version; diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index 0a0cae32dcf..15a64ffd25e 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { - name = "createrepo_c-${version}"; + pname = "createrepo_c"; version = "0.11.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index f13256d33bf..11672e6d456 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "dpkg-${version}"; + pname = "dpkg"; version = "1.19.7"; src = fetchurl { diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 4c03fc35dea..8e8d30e4fcc 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gx-${version}"; + pname = "gx"; version = "0.14.1"; rev = "refs/tags/v${version}"; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 0ae0b8a1983..0a0793130d1 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gx-go-${version}"; + pname = "gx-go"; version = "1.9.0"; rev = "refs/tags/v${version}"; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index ffa9f427dc2..5049a90c7a7 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "home-manager-${version}"; + pname = "home-manager"; version = "2019-06-25"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index c35550597a3..0c53c1bbbc9 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.9.2"; - name = "librepo-${version}"; + pname = "librepo"; src = fetchFromGitHub { owner = "rpm-software-management"; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 51a963497fa..9804c0fa185 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, go-bindata, lib }: buildGoPackage rec { - name = "morph-${version}"; + pname = "morph"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 41471b2c8a7..3f307d38f02 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mynewt-newt-${version}"; + pname = "mynewt-newt"; version = "1.3.0"; goPackagePath = "mynewt.apache.org/newt"; diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index 7c02d2d9a63..cd90e50d70e 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "nix-bundle"; - name = "${pname}-${version}"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index efedb8b67da..f5dfacf319b 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper , runtimeShell }: let self = stdenv.mkDerivation rec { - name = "nix-pin-${version}"; + pname = "nix-pin"; version = "0.4.0"; src = fetchFromGitHub { owner = "timbertson"; diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index 96a283a8ea8..f88820ffad9 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -5,7 +5,6 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "nix-prefetch"; version = "0.1.0"; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index cd3a8507be1..1d2cad2e39e 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -15,7 +15,7 @@ let additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ]; in stdenv.mkDerivation rec { - name = "nix-top-${version}"; + pname = "nix-top"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index ce31de9f65d..f63fe868e01 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: buildGoPackage rec { - name = "nixops-dns-${version}"; + pname = "nixops-dns"; version = "1.0"; goDeps = ./deps.nix; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 804bbbdf8d7..b495577ef66 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -25,7 +25,7 @@ let }; in stdenv.mkDerivation rec { - name = "nixui-${version}"; + pname = "nixui"; inherit version src; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index e02c0a2c66f..05f43cf29b1 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.4.1"; - name = "opkg-${version}"; + pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25"; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 2e9f93177e4..a82f4400891 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -8,7 +8,7 @@ , enableSystemd ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { - name = "packagekit-${version}"; + pname = "packagekit"; version = "1.1.12"; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index f0f05a4c858..987c834f505 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -2,7 +2,7 @@ , qttools, packagekit }: stdenv.mkDerivation rec { - name = "packagekit-qt-${version}"; + pname = "packagekit-qt"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index d756b679bf3..81e8152769b 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -2,7 +2,7 @@ zlib, bzip2, lzma }: stdenv.mkDerivation rec { - name = "pacman-${version}"; + pname = "pacman"; version = "5.1.3"; src = fetchurl { diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 55171e6d38f..ae0259e65fc 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "rpm-${version}"; + pname = "rpm"; version = "4.14.2.1"; src = fetchurl { diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index 68b9194015b..c4ba7b67dc7 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "1.1.0"; - name = "2fa-${version}"; + pname = "2fa"; goPackagePath = "rsc.io/2fa"; diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 246a2c5d991..5a771917311 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.6"; - name = "acsccid-${version}"; + pname = "acsccid"; src = fetchFromGitHub { owner = "acshk"; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index c67c758b933..22fb8848eb9 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "aespipe-${version}"; + pname = "aespipe"; version = "2.4e"; src = fetchurl { diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 2ee0c478212..05866792af6 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -8,11 +8,11 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "qemu-i386" else throw "afl: no support for ${stdenv.hostPlatform.system}!"; afl = stdenv.mkDerivation rec { - name = "afl-${version}"; + pname = "afl"; version = "2.52b"; src = fetchurl { - url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; + url = "http://lcamtuf.coredump.cx/afl/releases/${pname}-${version}.tgz"; sha256 = "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index c5844702ef3..58b25e6d3ee 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = (builtins.parseDrvName afl.name).version; - name = "libdislocator-${version}"; + pname = "libdislocator"; src = afl.src; sourceRoot = "${afl.name}/libdislocator"; diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index 1513ae58a0b..ea14d89c45c 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }: stdenv.mkDerivation rec { - name = "aide-${version}"; + pname = "aide"; version = "0.16.2"; src = fetchurl { - url = "https://github.com/aide/aide/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"; }; diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index ca2ea67e788..19c9acc0a45 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -5,7 +5,7 @@ assert testQR -> zbar != false; stdenv.mkDerivation rec { - name = "asc-key-to-qr-code-gif-${version}"; + pname = "asc-key-to-qr-code-gif"; version = "20180613"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 36b6a5767a1..9067e6a4dbf 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv }: buildGoPackage rec { - name = "aws-okta-${version}"; + pname = "aws-okta"; version = "0.20.1"; goPackagePath = "github.com/segmentio/aws-okta"; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index 16811d8f889..2fa50f91111 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "b2sum-${version}"; + pname = "b2sum"; version = "unstable-2018-06-11"; src = fetchzip { diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index 59be6ed0ec2..c6d2cbd53c9 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }: stdenv.mkDerivation rec { - name = "bash-supergenpass-unstable-${version}"; + pname = "bash-supergenpass-unstable"; version = "2018-04-18"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 9faedf0c7ef..47851fbfa05 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "bmrsa-${version}"; + pname = "bmrsa"; version = "11"; src = fetchurl { diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index 69444d1612e..0c650781bda 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }: stdenv.mkDerivation rec { - name = "bruteforce-luks-${version}"; + pname = "bruteforce-luks"; version = "1.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 6fbcffdae29..dd1772d4931 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.4.30"; - name = "ccid-${version}"; + pname = "ccid"; src = fetchurl { - url = "https://ccid.apdu.fr/files/${name}.tar.bz2"; + url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; sha256 = "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc"; }; diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index a025c69b738..4f48522e613 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -4,7 +4,7 @@ let generic = { patches ? [] }: buildGoPackage rec { version = "1.6.4"; - name = "certmgr-${version}"; + pname = "certmgr"; goPackagePath = "github.com/cloudflare/certmgr/"; diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index e0935f0f760..fb3c00e48f9 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "certstrap-${version}"; + pname = "certstrap"; version = "1.1.1"; goPackagePath = "github.com/square/certstrap"; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 750539b3ace..8d8497f6cb9 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "cfssl-${version}"; + pname = "cfssl"; version = "1.3.2"; goPackagePath = "github.com/cloudflare/cfssl"; diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index 602c0d60a5f..5a037090801 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "chntpw-${version}"; + pname = "chntpw"; version = "140201"; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 2dc9336bb32..5e304f86b4e 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: stdenv.mkDerivation rec { - name = "chrome-token-signing-${version}"; + pname = "chrome-token-signing"; version = "1.0.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix index a4afa772d10..eae5a5256df 100644 --- a/pkgs/tools/security/cipherscan/default.nix +++ b/pkgs/tools/security/cipherscan/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }: stdenv.mkDerivation rec { - name = "cipherscan-${version}"; + pname = "cipherscan"; version = "2016-08-16"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 4d9beb654ec..b5212249547 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "clamav-${version}"; + pname = "clamav"; version = "0.101.2"; src = fetchurl { - url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; + url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; sha256 = "0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha"; }; diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix index c5ace5d2e8c..0fb9ed58997 100644 --- a/pkgs/tools/security/cowpatty/default.nix +++ b/pkgs/tools/security/cowpatty/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cowpatty-${version}"; + pname = "cowpatty"; version = "4.6"; buildInputs = [ openssl libpcap ]; src = fetchurl { - url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${name}.tgz"; + url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz"; sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd"; }; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 2a88e4462b6..04b7b5695b5 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "crackxls-${version}"; + pname = "crackxls"; version = "0.4"; src = fetchgit { diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 3e94d52fc5f..57943a31406 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which }: stdenv.mkDerivation rec { - name = "crunch-${version}"; + pname = "crunch"; version = "3.6"; src = fetchurl { - url = "mirror://sourceforge/crunch-wordlist/${name}.tgz"; + url = "mirror://sourceforge/crunch-wordlist/${pname}-${version}.tgz"; sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va"; }; diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix index 1e061841221..104a615542b 100644 --- a/pkgs/tools/security/ctmg/default.nix +++ b/pkgs/tools/security/ctmg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "ctmg-${version}"; + pname = "ctmg"; version = "1.2"; src = fetchzip { diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/default.nix index c5987d37889..cee198c1b3b 100644 --- a/pkgs/tools/security/default.nix +++ b/pkgs/tools/security/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.0.1"; - name = "ecdsatool-${version}"; + pname = "ecdsatool"; src = pkgs.fetchFromGitHub { owner = "kaniini"; diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 55335927b36..ce8b5825647 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, bison, pam }: stdenv.mkDerivation rec { - name = "doas-${version}"; + pname = "doas"; version = "6.0"; diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 10e2138494e..49ceacadcb7 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, openssl, zlib }: stdenv.mkDerivation rec { - name = "duo-unix-${version}"; + pname = "duo-unix"; version = "1.11.2"; src = fetchurl { diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index 48a713287b8..00dac6e9429 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.0"; - name = "ecdsautils-${version}"; + pname = "ecdsautils"; src = pkgs.fetchFromGitHub { owner = "freifunk-gluon"; diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index d0d01761c24..9fd8c3ac7a2 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -2,7 +2,7 @@ , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { - name = "ecryptfs-${version}"; + pname = "ecryptfs"; version = "111"; src = fetchurl { diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index 40a728f6cb1..4acef56a2c5 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -5,7 +5,6 @@ }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "ecryptfs-helper"; version = "20160722"; diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix index 1d983cb8599..8a64a019fef 100644 --- a/pkgs/tools/security/efitools/default.nix +++ b/pkgs/tools/security/efitools/default.nix @@ -1,7 +1,7 @@ { stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages, help2man, fetchgit }: stdenv.mkDerivation rec { - name = "efitools-${version}"; + pname = "efitools"; version = "1.9.2"; buildInputs = [ diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 155c63c87e1..13ab56aaa9a 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,7 +7,7 @@ , substituteAll }: stdenv.mkDerivation rec { - name = "eid-mw-${version}"; + pname = "eid-mw"; version = "4.4.16"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix index 8d4cc6ec3ca..baada40a6cb 100644 --- a/pkgs/tools/security/enchive/default.nix +++ b/pkgs/tools/security/enchive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "enchive-${version}"; + pname = "enchive"; version = "3.4"; src = fetchFromGitHub { owner = "skeeto"; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 6f79be83be5..01855ee3e5b 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -14,7 +14,7 @@ let else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!"; in stdenv.mkDerivation rec { - name = "encryptr-${version}"; + pname = "encryptr"; version = "2.0.0"; src = fetchurl { diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index c33e433448f..8ba80c46457 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -42,7 +42,7 @@ let package = stdenv.mkDerivation rec { inherit (data) version; - name = "enpass-${version}"; + pname = "enpass"; src = fetchurl { inherit (data) sha256; diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix index d628a28023a..28df3a28442 100644 --- a/pkgs/tools/security/eschalot/default.nix +++ b/pkgs/tools/security/eschalot/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "eschalot"; version = "2018-01-19"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ReclaimYourPrivacy"; diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix index 5d2e515c327..d923e81ae82 100644 --- a/pkgs/tools/security/fcrackzip/default.nix +++ b/pkgs/tools/security/fcrackzip/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "fcrackzip-${version}"; + pname = "fcrackzip"; version = "1.0"; src = fetchurl { - url = "http://oldhome.schmorp.de/marc/data/${name}.tar.gz"; + url = "http://oldhome.schmorp.de/marc/data/${pname}-${version}.tar.gz"; sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a"; }; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 66a50e268a5..b6669358f7f 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fpm2-${version}"; + pname = "fpm2"; version = "0.79"; src = fetchurl { diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 14a4c985d50..59d126c5e2c 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "f-prot-${version}"; + pname = "f-prot"; version = "6.2.1"; src = fetchurl { diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 812c032230c..4579136add2 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -7,7 +7,6 @@ , buildClient ? true }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fwknop"; version = "2.6.10"; diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index ca7793281ef..89900d27bd2 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -1,7 +1,7 @@ { coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: stdenv.mkDerivation rec { - name = "gen-oath-safe-${version}"; + pname = "gen-oath-safe"; version = "0.11.0"; src = fetchFromGitHub { owner = "mcepl"; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 27bdc51c768..63d1bab89d7 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.8.19"; - name = "gnome-encfs-manager-${version}"; + pname = "gnome-encfs-manager"; src = fetchurl { url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz"; diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index 2139b7c84af..940a5b9a053 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, gnulib }: stdenv.mkDerivation rec { - name = "gnu-pw-mgr-${version}"; + pname = "gnu-pw-mgr"; version = "2.4.2"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz"; + url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz"; sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17"; }; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 6ae2bbc436e..6336d319997 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -12,11 +12,11 @@ with stdenv.lib; assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-${version}"; + pname = "gnupg"; version = "2.0.30"; src = fetchurl { - url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3"; }; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 7a8fb5a3244..90bd55f55a2 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -14,12 +14,12 @@ with stdenv.lib; assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-${version}"; + pname = "gnupg"; version = "2.2.17"; src = fetchurl { - url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; sha256 = "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg"; }; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 152ff40e7a2..1ba650f5af7 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -1,7 +1,7 @@ { fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: stdenv.mkDerivation rec { - name = "gorilla-bin-${version}"; + pname = "gorilla-bin"; version = "1.5.3.7"; src = fetchurl { diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index c095b77129c..34e8c7bd679 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, gpgme }: stdenv.mkDerivation rec { - name = "gpgstats-${version}"; + pname = "gpgstats"; version = "0.5"; src = fetchurl { - url = "https://www.vanheusden.com/gpgstats/${name}.tgz"; + url = "https://www.vanheusden.com/gpgstats/${pname}-${version}.tgz"; sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy"; }; diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 385a201d88b..577fe02cb2e 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -4,7 +4,6 @@ let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "hash-slinger"; - name = "${pname}-${version}"; version = "2.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index 0c5691a1e10..9efa7e2afa2 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "hash_extender-${version}"; + pname = "hash_extender"; version = "2017-04-10"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index 81f627179a2..c47331f1bcb 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "haveged-${version}"; + pname = "haveged"; version = "1.9.2"; src = fetchurl { diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index 5731f3ef8bb..8f30b5885e4 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "ifdnfc-${version}"; + pname = "ifdnfc"; version = "2016-03-01"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index d4db02cc9ed..dd3a93be995 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "john-${version}"; + pname = "john"; version = "1.9.0-jumbo-1"; src = fetchurl { - url = "http://www.openwall.com/john/k/${name}.tar.xz"; + url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz"; sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm"; }; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 18e3836c99d..884480b73a5 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "keybase-${version}"; + pname = "keybase"; version = "4.1.0"; goPackagePath = "github.com/keybase/client"; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index afe2d457a7f..56e1daf2043 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "keybase-gui-${version}"; + pname = "keybase-gui"; version = "4.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 350d0e66dc7..8decdd13b0f 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.2"; - name = "kpcli-${version}"; + pname = "kpcli"; src = fetchurl { - url = "mirror://sourceforge/kpcli/${name}.pl"; + url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; sha256 = "11z6zbnsmqgjw73ai4nrq4idr83flrib22d8fqh1637d36p1nnk1"; }; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index d858ed3fd6d..4af6e3de3cf 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.7.11"; - name = "libacr38u-${version}"; + pname = "libacr38u"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2"; diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index b3dc1270fb9..17861ac2da6 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -3,7 +3,7 @@ , curl, geoip, libxml2, lmdb, lua, pcre, yajl }: stdenv.mkDerivation rec { - name = "libmodsecurity-${version}"; + pname = "libmodsecurity"; version = "3.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index 8a73d056b1e..a325c47ca0d 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: stdenv.mkDerivation rec { - name = "logkeys-${version}"; + pname = "logkeys"; version = "2018-01-22"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 7579636cfbf..923c96719fe 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "lynis"; version = "2.7.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index e33681c45e0..94f0a3adfb8 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, libpcap }: stdenv.mkDerivation rec { - name = "masscan-${version}"; + pname = "masscan"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 37796fef174..50341e873fa 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -16,7 +16,7 @@ let gemdir = ./.; }; in stdenv.mkDerivation rec { - name = "metasploit-framework-${version}"; + pname = "metasploit-framework"; version = "4.16.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 3d4bdd2edf1..9098457cec1 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnfc }: stdenv.mkDerivation rec { - name = "mfcuk-${version}"; + pname = "mfcuk"; version = "0.3.8"; src = fetchurl { diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index f5bc7a60839..15ee2446922 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libsodium }: stdenv.mkDerivation rec { - name = "minisign-${version}"; + pname = "minisign"; version = "0.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix index 0c927b7501b..a4aae480ae1 100644 --- a/pkgs/tools/security/mkp224o/default.nix +++ b/pkgs/tools/security/mkp224o/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, libsodium }: stdenv.mkDerivation rec { - name = "mkp224o-${version}"; + pname = "mkp224o"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 6ec90cd15a8..2a9e41ac0fa 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -10,11 +10,11 @@ let luaValue = if luaSupport then lua5 else "no"; in stdenv.mkDerivation rec { - name = "modsecurity-${version}"; + pname = "modsecurity"; version = "2.9.3"; src = fetchurl { - url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz"; + url = "https://www.modsecurity.org/tarball/${version}/${pname}-${version}.tar.gz"; sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1"; }; diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index e1a134ec5d1..b4d5ddb267d 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -13,7 +13,7 @@ let patches = oldAttrs.patches ++ [ ./openssh-nixos-sandbox.patch ]; }); in stdenv.mkDerivation rec { - name = "monkeysphere-${version}"; + pname = "monkeysphere"; version = "0.44"; # The patched OpenSSH binary MUST NOT be used (except in the check phase): diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix index 84b738a2109..d45861cf50e 100644 --- a/pkgs/tools/security/nasty/default.nix +++ b/pkgs/tools/security/nasty/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gpgme }: stdenv.mkDerivation rec { - name = "nasty-${version}"; + pname = "nasty"; version = "0.6"; src = fetchurl { - url = "https://www.vanheusden.com/nasty/${name}.tgz"; + url = "https://www.vanheusden.com/nasty/${pname}-${version}.tgz"; sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn"; }; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 88494e8dbdf..5e26bcf6759 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -11,7 +11,7 @@ , gnutls }: stdenv.mkDerivation rec { - name = "neopg-${version}"; + pname = "neopg"; version = "0.0.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1b18f0e1e11..33a873f73da 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -2,7 +2,7 @@ , qtbase, qttranslations, qtsvg, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "nitrokey-app-${version}"; + pname = "nitrokey-app"; version = "1.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index c0b7a72d18e..f873c475bbf 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -3,7 +3,7 @@ , qtbase, qtscript, qtwebengine }: stdenv.mkDerivation rec { - name = "nmapsi4-${version}"; + pname = "nmapsi4"; version = "0.4.80-20180430"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 221817b004d..17473b63988 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { - name = "notary-${version}"; + pname = "notary"; version = "0.6.1"; gitcommit = "d6e1431f"; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index f88156285ca..3f04d276489 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "nsjail-${version}"; + pname = "nsjail"; version = "2.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index a27ed7bad1a..caaa5eba86a 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.25"; - name = "nwipe-${version}"; + pname = "nwipe"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index 91df7f3fbb0..baea02402d9 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, gdb, zlib }: stdenv.mkDerivation rec { - name = "omapd-${version}"; + pname = "omapd"; version = "0.9.2"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz"; sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; }; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 898bfb599a3..5a9f1012748 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }: pythonPackages.buildPythonApplication rec { - name = "onioncircuits-${version}"; + pname = "onioncircuits"; version = "0.5"; src = fetchgit { diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index eff2211a71c..1d506928a52 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: stdenv.mkDerivation rec { - name = "opencryptoki-${version}"; + pname = "opencryptoki"; version = "3.8.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 769b87fa8d3..e5611f8b267 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "opensc-${version}"; + pname = "opensc"; version = "0.19.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 11e1f14baf9..1e618cdce1a 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, bash }: stdenv.mkDerivation rec { - name = "p0f-${version}"; + pname = "p0f"; version = "3.09b"; src = fetchurl { - url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz"; + url = "http://lcamtuf.coredump.cx/p0f3/releases/${pname}-${version}.tgz"; sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl"; }; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index d7d1f1c40d4..dc3582b7369 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "paperkey-${version}"; + pname = "paperkey"; version = "1.6"; src = fetchurl { - url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; + url = "https://www.jabberwocky.com/software/paperkey/${pname}-${version}.tar.gz"; sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2"; }; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 8ddbd60a38d..2e482dfcffc 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -30,10 +30,10 @@ let generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { version = "1.7.3"; - name = "password-store-${version}"; + pname = "password-store"; src = fetchurl { - url = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz"; sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; }; diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/pkgs/tools/security/pass/extensions/audit.nix index 79dd1fadb01..ca5ca855337 100644 --- a/pkgs/tools/security/pass/extensions/audit.nix +++ b/pkgs/tools/security/pass/extensions/audit.nix @@ -4,7 +4,7 @@ let pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]); in stdenv.mkDerivation rec { - name = "pass-audit-${version}"; + pname = "pass-audit"; version = "0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index ba3f821e88c..c34fae083cd 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pass-genphrase-${version}"; + pname = "pass-genphrase"; version = "0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 0ee775bfbe8..9d9d36fd0d9 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -4,7 +4,7 @@ let pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]); in stdenv.mkDerivation rec { - name = "pass-import-${version}"; + pname = "pass-import"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix index 6d35c4aa837..ab8bc7fe856 100644 --- a/pkgs/tools/security/pass/extensions/otp.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, oathToolkit }: stdenv.mkDerivation rec { - name = "pass-otp-${version}"; + pname = "pass-otp"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index b9f458cd4e1..ccb558c9b85 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tomb }: stdenv.mkDerivation rec { - name = "pass-tomb-${version}"; + pname = "pass-tomb"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index dd145b06972..b712557ab3e 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pass-update-${version}"; + pname = "pass-update"; version = "2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 6140159dcb5..b188b411517 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "rofi-pass-${version}"; + pname = "rofi-pass"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 23a744f8e23..8aadb685aa8 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb, pcsclite }: stdenv.mkDerivation rec { - name = "pcsc-cyberjack-${version}"; + pname = "pcsc-cyberjack"; version = "3.99.5_SP12"; src = with stdenv.lib; let diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index 88ca8a3d1b1..0302fc6fc67 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -6,7 +6,7 @@ let else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { - name = "pcsc-scm-scl-${version}"; + pname = "pcsc-scm-scl"; version = "2.09"; src = fetchurl { diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 5c40ccdef58..eed462ef0d0 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -2,7 +2,7 @@ , IOKit ? null }: stdenv.mkDerivation rec { - name = "pcsclite-${version}"; + pname = "pcsclite"; version = "1.8.25"; outputs = [ "bin" "out" "dev" "doc" "man" ]; diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix index 55d2505ed1c..c235c98b971 100644 --- a/pkgs/tools/security/pdfcrack/default.nix +++ b/pkgs/tools/security/pdfcrack/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "pdfcrack-${version}"; + pname = "pdfcrack"; version = "0.17"; src = fetchurl { diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 9c8f47cd275..8bf440d2b07 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pgpdump-${version}"; + pname = "pgpdump"; version = "0.33"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index b24af50ee7c..2c03183fa96 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -13,7 +13,7 @@ let sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; }; in stdenv.mkDerivation rec { - name = "prey-bash-client-${version}"; + pname = "prey-bash-client"; version = "0.6.0"; src = fetchurl { diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 17bbf982255..7fc6ed20966 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -2,7 +2,7 @@ , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: stdenv.mkDerivation rec { - name = "qdigidoc-${version}"; + pname = "qdigidoc"; version = "4.1.0"; src = fetchgit { diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index f8b110ce221..5ce5672eb25 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2018-08-21"; - name = "qesteidutil-${version}"; + pname = "qesteidutil"; src = fetchFromGitHub { owner = "open-eid"; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 3491feccc45..0227268cf43 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}: stdenv.mkDerivation rec { - name = "rarcrack-${version}"; + pname = "rarcrack"; version = "0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 5e622cf68f3..ad606af9562 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.8"; - name = "rhash-${version}"; + pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 1091b366781..aaac975bb81 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "sbsigntool-${version}"; + pname = "sbsigntool"; version = "0.9.1"; src = fetchgit { diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix index 75ea92a786c..e419232641b 100644 --- a/pkgs/tools/security/scallion/default.nix +++ b/pkgs/tools/security/scallion/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.1"; - name = "scallion-${version}"; + pname = "scallion"; src = fetchFromGitHub { owner = "lachesis"; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 352a81b2727..2ca4c1df18c 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "scrypt-${version}"; + pname = "scrypt"; version = "1.2.1"; src = fetchurl { - url = "https://www.tarsnap.com/scrypt/${name}.tgz"; + url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz"; sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6"; }; diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index a2ec48d4d27..686ef36f863 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { - name = "seccure-${version}"; + pname = "seccure"; version = "0.5"; src = fetchurl { - url = "http://point-at-infinity.org/seccure/${name}.tar.gz"; + url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz"; sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5"; }; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index fd03e6bebab..c9ba2a8ac6d 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -16,7 +16,7 @@ let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { - name = "secp256k1-${version}"; + pname = "secp256k1"; # I can't find any version numbers, so we're just using the date of the # last commit. diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix index 343992a6322..9edd9745326 100644 --- a/pkgs/tools/security/sedutil/default.nix +++ b/pkgs/tools/security/sedutil/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "sedutil-${version}"; + pname = "sedutil"; version = "1.15.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix index 38da1448414..8c6a026a612 100644 --- a/pkgs/tools/security/sha1collisiondetection/default.nix +++ b/pkgs/tools/security/sha1collisiondetection/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtool, which }: stdenv.mkDerivation rec { - name = "sha1collisiondetection-${version}"; + pname = "sha1collisiondetection"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index 3d3bd4eef84..cd93c55001e 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "shc-${version}"; + pname = "shc"; version = "4.0.3"; rev = "${version}"; diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index a642a12b0bd..22604a3f70b 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libbsd, pkgconfig }: stdenv.mkDerivation rec { - name = "signify-${version}"; + pname = "signify"; version = "25"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 8148692327e..ea487fed2a1 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -14,7 +14,6 @@ let in stdenv.mkDerivation rec { pname = "signing-party"; version = "2.10"; - name = "${pname}-${version}"; src = fetchFromGitLab { domain = "salsa.debian.org"; diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix index 96565ec84b5..16056f9a59e 100644 --- a/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }: stdenv.mkDerivation rec { - name = "simple-tpm-pk11-${version}"; + pname = "simple-tpm-pk11"; version = "0.06"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index ec5eea52a6f..94642700c33 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "softhsm-${version}"; + pname = "softhsm"; version = "2.5.0"; src = fetchurl { - url = "https://dist.opendnssec.org/source/${name}.tar.gz"; + url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz"; sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj"; }; diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index a1844668af6..3ece05926cc 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }: stdenv.mkDerivation rec { - name = "spectre-meltdown-checker-${version}"; + pname = "spectre-meltdown-checker"; version = "0.42"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 1ff9c73d8b5..33ab4c373bc 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "ssdeep-${version}"; + pname = "ssdeep"; version = "2.14.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index 18f010ee1ec..a196fe9ca47 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.4.0"; - name = "sshguard-${version}"; + pname = "sshguard"; src = fetchurl { - url = "mirror://sourceforge/sshguard/${name}.tar.gz"; + url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06"; }; diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index d3a8f35d914..15ac376d72a 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "sslscan-${version}"; + pname = "sslscan"; version = "1.11.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index c8be366066b..7a759c3c333 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; version = "0.5.1"; - name = "steghide-${version}"; + pname = "steghide"; src = fetchurl { url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index d28260ffb8b..38fc884de48 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "stoken"; version = "0.92"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "cernekee"; repo = pname; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index ecc34ede556..28c462cbb0a 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "stricat-${version}"; + pname = "stricat"; version = "20140609100300"; src = fetchurl { - url = "http://www.stribob.com/dist/${name}.tgz"; + url = "http://www.stribob.com/dist/${pname}-${version}.tgz"; sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; }; diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/tools/security/su-exec/default.nix index 56e40d514bb..8ff33ee1ec9 100644 --- a/pkgs/tools/security/su-exec/default.nix +++ b/pkgs/tools/security/su-exec/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "su-exec-${version}"; + pname = "su-exec"; version = "0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 15f76741589..97db4a28c45 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }: buildGoPackage rec { - name = "sudolikeaboss-unstable-${version}"; + pname = "sudolikeaboss-unstable"; version = "20161127-${stdenv.lib.strings.substring 0 7 rev}"; rev = "2d9afe19f872c9f433d476e57ee86169781b164c"; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index f159dd27c42..f5184b98562 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, trousers, openssl, zlib }: stdenv.mkDerivation rec { - name = "tboot-${version}"; + pname = "tboot"; version = "1.9.8"; src = fetchurl { - url = "mirror://sourceforge/tboot/${name}.tar.gz"; + url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00"; }; diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 4d0feef72c9..86a65a06028 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "tcpcrypt-${version}"; + pname = "tcpcrypt"; version = "0.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 9a7a245b813..252d73b479b 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -5,7 +5,7 @@ let makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs); in stdenv.mkDerivation rec { - name = "thc-hydra-${version}"; + pname = "thc-hydra"; version = "8.5"; src = fetchurl { diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix index 170d5c4ff7a..896ab50562d 100644 --- a/pkgs/tools/security/tor/tor-arm.nix +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "tor-arm-${version}"; + pname = "tor-arm"; version = "1.4.5.0"; src = fetchurl { diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 686d03b7c3f..8681d80c2ed 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, libcap }: stdenv.mkDerivation rec { - name = "torsocks-${version}"; + pname = "torsocks"; version = "2.3.0"; src = fetchgit { diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 7d0ff797336..1799d5d154a 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: stdenv.mkDerivation rec { - name = "tpm-luks-${version}"; + pname = "tpm-luks"; version = "git-2015-07-11"; src = fetchgit { diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index 1541575aed7..5d54758cc7c 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, trousers, openssl }: stdenv.mkDerivation rec { - name = "tpm-quote-tools-${version}"; + pname = "tpm-quote-tools"; version = "1.0.4"; src = fetchurl { - url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz"; sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h"; }; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 8309390d013..6f7fed20c89 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "trousers-${version}"; + pname = "trousers"; version = "0.3.13"; src = fetchurl { - url = "mirror://sourceforge/trousers/trousers/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz"; sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v"; }; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 3f366a58320..45879ce1f30 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, go, gox, removeReferencesTo }: stdenv.mkDerivation rec { - name = "vault-${version}"; + pname = "vault"; version = "1.1.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index e3b7fb643a2..bc8f1ce52c1 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -2,10 +2,10 @@ pythonPackages.buildPythonApplication rec { version = "2.6"; - name = "volatility-${version}"; + pname = "volatility"; src = fetchurl { - url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip"; + url = "https://downloads.volatilityfoundation.org/releases/${version}/${pname}-${version}.zip"; sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv"; }; diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix index a7c337dc122..25c7921d34c 100644 --- a/pkgs/tools/security/wipe/default.nix +++ b/pkgs/tools/security/wipe/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wipe-${version}"; + pname = "wipe"; version = "2.3.1"; src = fetchurl { - url = "mirror://sourceforge/wipe/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/wipe/${version}/${pname}-${version}.tar.bz2"; sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6"; }; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 7fcb9fc10bd..ccebb2dbab4 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.10.0"; - name = "yara-${version}"; + pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index a31fdd08c60..7e92fc06b2d 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "amtterm-${version}"; + pname = "amtterm"; version = "1.6-1"; buildInputs = with perlPackages; [ perl SOAPLite ]; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { - url = "https://www.kraxel.org/cgit/amtterm/snapshot/${name}.tar.gz"; + url = "https://www.kraxel.org/cgit/amtterm/snapshot/${pname}-${version}.tar.gz"; sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc"; }; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 142d33d359d..fded1da861d 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "at-${version}"; + pname = "at"; version = "3.1.23"; src = fetchurl { diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index a8fca06c361..a99df36beb6 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, readline, libxml2 }: stdenv.mkDerivation rec { - name = "augeas-${version}"; + pname = "augeas"; version = "1.12.0"; src = fetchurl { - url = "http://download.augeas.net/${name}.tar.gz"; + url = "http://download.augeas.net/${pname}-${version}.tar.gz"; sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 9c6f21009ee..8443314cf71 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libcap, acl }: stdenv.mkDerivation rec { - name = "bfs-${version}"; + pname = "bfs"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 9842bd85783..d3f692b70e7 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.14.8"; - name = "bootchart-${version}"; + pname = "bootchart"; src = fetchFromGitHub { owner = "mmeeks"; diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index 6dcaeed325a..6c48d3341ec 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }: stdenv.mkDerivation rec { - name = "chase-${version}"; + pname = "chase"; version = "0.5.2"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix index cb8c4cc7d02..0874aa7410c 100644 --- a/pkgs/tools/system/collectd/data.nix +++ b/pkgs/tools/system/collectd/data.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (collectd) meta version; - name = "collectd-data-${version}"; + pname = "collectd-data"; phases = [ "installPhase" ]; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index d71fa0c4e58..1df73e08d1e 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -42,10 +42,10 @@ }: stdenv.mkDerivation rec { version = "5.8.1"; - name = "collectd-${version}"; + pname = "collectd"; src = fetchurl { - url = "https://collectd.org/files/${name}.tar.bz2"; + url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7"; }; diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index 3dc2a5caeb9..e7a5dc86578 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "confd-${version}"; + pname = "confd"; version = "0.9.0"; rev = "v${version}"; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 35c57dd8ea9..ad120dd6481 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-template-${version}"; + pname = "consul-template"; version = "0.19.4"; rev = "v${version}"; diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix index 1067e524788..205b693dd92 100644 --- a/pkgs/tools/system/daemonize/default.nix +++ b/pkgs/tools/system/daemonize/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "daemonize-${version}"; + pname = "daemonize"; version = "1.7.8"; src = fetchurl { diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index bcea40b1193..c8f7e77b156 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: stdenv.mkDerivation rec { - name = "das_watchdog-${version}"; + pname = "das_watchdog"; version = "git-2015-09-12"; src = fetchgit { diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index ca389a8e1b4..4018801f249 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "datefudge"; version = "1.22"; - name = "${pname}-${version}"; src = fetchgit { url = "https://salsa.debian.org/debian/datefudge.git"; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index e0d11769fd9..9962337de07 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { version = "1.99.8"; - name = "dd_rescue-${version}"; + pname = "dd_rescue"; src = fetchurl { sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh"; - url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; + url="http://www.garloff.de/kurt/linux/ddrescue/${pname}-${version}.tar.bz2"; }; dd_rhelp_src = fetchurl { diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix index f8a6dac8197..54bf6fbaf42 100644 --- a/pkgs/tools/system/ddrutility/default.nix +++ b/pkgs/tools/system/ddrutility/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ddrutility-${version}"; + pname = "ddrutility"; version = "2.8"; src = fetchurl { - url = "mirror://sourceforge/ddrutility/${name}.tar.gz"; + url = "mirror://sourceforge/ddrutility/${pname}-${version}.tar.gz"; sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac"; }; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 9a255c1b0ea..8575d971898 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, gettext}: stdenv.mkDerivation rec { - name = "dfc-${version}"; + pname = "dfc"; version = "3.1.1"; src = fetchurl { - url = "https://projects.gw-computing.net/attachments/download/615/${name}.tar.gz"; + url = "https://projects.gw-computing.net/attachments/download/615/${pname}-${version}.tar.gz"; sha256 = "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n"; }; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 7d366dc9bd7..9d56b8488e5 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "di-${version}"; + pname = "di"; version = "4.47.1"; src = fetchurl { - url = "http://gentoo.com/di/${name}.tar.gz"; + url = "http://gentoo.com/di/${pname}-${version}.tar.gz"; sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f"; }; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 638b018fd41..272809e486c 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }: stdenv.mkDerivation rec { - name = "efibootmgr-${version}"; + pname = "efibootmgr"; version = "17"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 5c9b0292e5c..365cfeab058 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: stdenv.mkDerivation rec { - name = "efivar-${version}"; + pname = "efivar"; version = "37"; outputs = [ "bin" "out" "dev" "man" ]; diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index 5f013157e32..c2f5556cec6 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "envconsul-${version}"; + pname = "envconsul"; version = "0.7.3"; rev = "v${version}"; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 5a902914b37..1ba2b78e860 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "evemu-${version}"; + pname = "evemu"; version = "2.6.0"; # We could have downloaded a release tarball from cgit, but it changes hash diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 38ca06a6f32..6b84f7d69a5 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }: stdenv.mkDerivation rec { - name = "facter-${version}"; + pname = "facter"; version = "3.13.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 1a16a8a34c7..c31e7337dd5 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.23"; - name = "fakeroot-${version}"; + pname = "fakeroot"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ; postUnpack = '' - sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in + sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in ''; meta = { diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 2bcab1c36b2..6ef39a647f7 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -4,11 +4,11 @@ { stdenv, fetchurl, perl, busybox, vim }: stdenv.mkDerivation rec { - name = "fcron-${version}"; + pname = "fcron"; version = "3.3.0"; src = fetchurl { - url = "http://fcron.free.fr/archives/${name}.src.tar.gz"; + url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz"; sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls"; }; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 694a71d8ec1..5a690b28845 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -3,7 +3,7 @@ , withGnuplot ? false, gnuplot ? null }: stdenv.mkDerivation rec { - name = "fio-${version}"; + pname = "fio"; version = "3.15"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index b3048f2fcb7..be33f45ca9d 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "foremost-${version}"; + pname = "foremost"; version = "1.5.7"; src = fetchurl { sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h"; - url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz"; + url = "http://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz"; }; patches = [ ./makefile.patch ]; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 079494bb599..9933a956b99 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.6.3"; - name = "freeipmi-${version}"; + pname = "freeipmi"; src = fetchurl { - url = "mirror://gnu/freeipmi/${name}.tar.gz"; + url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; sha256 = "1sg12ycig2g5yv9l3vx25wsjmz7ybnrsvji0vs51yjmclwsygm5a"; }; diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 9eef3b064a0..c0dd2c89d2f 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gohai-${version}"; + pname = "gohai"; version = "2018-05-23"; rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1"; diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix index d58d19fd6ed..22918f14145 100644 --- a/pkgs/tools/system/goreman/default.nix +++ b/pkgs/tools/system/goreman/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goreman-${version}"; + pname = "goreman"; version = "0.2.1"; goPackagePath = "github.com/mattn/goreman"; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 25d60ffca5d..71f82bfc386 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-${version}"; + pname = "gptfdisk"; version = "1.0.4"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: - url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; + url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn"; }; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 63a72aac79f..a2e342f85b7 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "hardinfo-${version}"; + pname = "hardinfo"; version = "0.5.1"; src = fetchurl { diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index c9a21db7101..187c046875f 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "hardlink-${version}"; + pname = "hardlink"; version = "1.3-4"; src = fetchurl { diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 68c6ef3c3ef..12e54b1b22e 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -2,11 +2,11 @@ IOKit, python }: stdenv.mkDerivation rec { - name = "htop-${version}"; + pname = "htop"; version = "2.2.0"; src = fetchurl { - url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; }; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index eba8c8f41b4..4306f7e9093 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }: stdenv.mkDerivation rec { - name = "hwinfo-${version}"; + pname = "hwinfo"; version = "21.67"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index 03373300a94..9d89e0714c4 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "illum-${version}"; + pname = "illum"; src = fetchgit { url = "https://github.com/jmesmon/illum.git"; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index c869c4b11a5..52d091073c0 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "inxi-${version}"; + pname = "inxi"; version = "3.0.35-1"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 22dd9289bfd..274e65bb41d 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ioping-${version}"; + pname = "ioping"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix index d7c1f89a786..7e6854afe62 100644 --- a/pkgs/tools/system/iops/default.nix +++ b/pkgs/tools/system/iops/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iops-${version}"; + pname = "iops"; version = "0.1"; src = fetchurl { - url = "https://www.vanheusden.com/iops/${name}.tgz"; + url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz"; sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; }; diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 35a00650543..0a04581264e 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -1,7 +1,7 @@ { lib, systemd, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "journalbeat-${version}"; + pname = "journalbeat"; version = "5.6.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 4ec34a68122..064071a5ca4 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lockfileProgs, perlPackages }: stdenv.mkDerivation rec { - name = "logcheck-${version}"; + pname = "logcheck"; version = "1.3.20"; _name = "logcheck_${version}"; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index e01636f2944..cee092f755f 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "logrotate-${version}"; + pname = "logrotate"; version = "3.15.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 0ab8d226f3a..a7adefb74f8 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "lr-${version}"; + pname = "lr"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index d34fb939822..ff6ccb534fb 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "memtester-${version}"; + pname = "memtester"; version = "4.3.0"; preConfigure = '' diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 5455728a10c..dc169ee23b4 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.16.0"; - name = "netdata-${version}"; + pname = "netdata"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 5044e5c9a96..1d8eeff209e 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nq-${version}"; + pname = "nq"; version = "0.3.1"; src = fetchFromGitHub { owner = "chneukirchen"; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 19581c82c78..0e7a5d4a311 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: stdenv.mkDerivation rec { - name = "nvtop-${version}"; + pname = "nvtop"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index b673c0f929a..b5842ad37c3 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "pcstat-unstable-${version}"; + pname = "pcstat-unstable"; version = "2017-05-28"; goPackagePath = "github.com/tobert/pcstat"; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index b3909a79d94..4c011a0b212 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { pname = "plan9port"; version = "2019-02-25"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "9fans"; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 234aacbbfde..83d281642bd 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "psensor-${version}"; + pname = "psensor"; version = "1.2.0"; diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix index 178e08938fe..4d413e60c77 100644 --- a/pkgs/tools/system/psstop/default.nix +++ b/pkgs/tools/system/psstop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "psstop-${version}"; + pname = "psstop"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index ee7626d2712..73c1b488155 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "rofi-systemd-${version}"; + pname = "rofi-systemd"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 4d5de56fbf0..8a1f6c4b885 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "runit-${version}"; + pname = "runit"; version = "2.1.2"; src = fetchurl { - url = "http://smarden.org/runit/${name}.tar.gz"; + url = "http://smarden.org/runit/${pname}-${version}.tar.gz"; sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - sourceRoot = "admin/${name}"; + sourceRoot = "admin/${pname}-${version}"; doCheck = true; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 5d4ed355ba9..063a338f6e8 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,7 +1,6 @@ { stdenv, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "s-tui"; version = "0.8.3"; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index ed4fe7a6848..571f70e0756 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, perl, coreutils }: stdenv.mkDerivation rec { - name = "safe-rm-${version}"; + pname = "safe-rm"; version = "0.12"; src = fetchgit { url = "https://gitorious.org/safe-rm/mainline.git"; - rev = "refs/tags/${name}"; + rev = "refs/tags/${pname}-${version}"; sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq"; }; diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index d6e8f4f1bb9..036e3a83cf2 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "setserial-${version}"; + pname = "setserial"; version = "2.17"; src = fetchurl { - url = "mirror://sourceforge/setserial/${name}.tar.gz"; + url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz"; sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y"; }; diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index d35f56e2519..7c90d41da18 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "4.6.5"; - name = "sleuthkit-${version}"; + pname = "sleuthkit"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c"; }; diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index 15a18a453f0..9f2cc225747 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "socklog-${version}"; + pname = "socklog"; version = "2.1.0"; src = fetchurl { diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index f407be7c585..9697748e056 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "suid-chroot-${version}"; + pname = "suid-chroot"; version = "1.0.2"; src = fetchurl { sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx"; - url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${name}.tar.bz2"; + url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${pname}-${version}.tar.bz2"; }; postPatch = '' diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index 81e3a2b8792..3834b3762f0 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "supervise-${version}"; + pname = "supervise"; version = "1.4.0"; src = fetchzip { diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix index 240ad9de19d..93a6bbf0c75 100644 --- a/pkgs/tools/system/symlinks/default.nix +++ b/pkgs/tools/system/symlinks/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "symlinks-${version}"; + pname = "symlinks"; version = "1.4.3"; src = fetchurl { diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index a57cafb54e2..3c793a05300 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "syslog-ng-incubator-${version}"; + pname = "syslog-ng-incubator"; version = "0.6.2"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; - rev = name; + rev = "${pname}-${version}"; sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s"; }; diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/pkgs/tools/system/testdisk-photorec/default.nix index 5342cf857ac..06f6751213b 100644 --- a/pkgs/tools/system/testdisk-photorec/default.nix +++ b/pkgs/tools/system/testdisk-photorec/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "testdisk-photorec-${version}"; + pname = "testdisk-photorec"; version = "7.0"; src = fetchurl { url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2"; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 818c76712c7..6ef96bdab5c 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -2,7 +2,7 @@ , pkgconfig, dbus, dbus-glib, libxml2 }: stdenv.mkDerivation rec { - name = "thermald-${version}"; + pname = "thermald"; version = "1.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index dc63b97056a..8c803400584 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -2,7 +2,7 @@ , smartSupport ? false, libatasmart }: stdenv.mkDerivation rec { - name = "thinkfan-${version}"; + pname = "thinkfan"; version = "0.9.3"; src = fetchurl { diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 849baa7159a..71a5726759c 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "uptimed-${version}"; + pname = "uptimed"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index 32cf56a1d74..06ae2862662 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pciutils, libx86, zlib }: stdenv.mkDerivation rec { - name = "vbetool-${version}"; + pname = "vbetool"; version = "1.1"; src = fetchurl { - url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/vbetool/download/${pname}-${version}.tar.gz"; sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd"; }; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index b252b74a0bd..85baa3d3f30 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20180311"; checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7"; - name = "vboot_reference-${version}"; + pname = "vboot_reference"; src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index ca35dae5827..da502946781 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -2,7 +2,7 @@ , openssl, openwsman }: stdenv.mkDerivation rec { - name = "wsmancli-${version}"; + pname = "wsmancli"; version = "2.6.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index 519cae03c5a..02d90472440 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "xe-${version}"; + pname = "xe"; version = "0.11"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index 10d3a47cc85..a37531572d7 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "agrep-${version}"; + pname = "agrep"; version = "3.41.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index f53a649cd77..7dc07664fce 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "aha-${version}"; + pname = "aha"; version = "0.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 2ad91a3071e..b9a4f678207 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, boost, lua }: stdenv.mkDerivation rec { - name = "ansifilter-${version}"; + pname = "ansifilter"; version = "2.14"; src = fetchurl { diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index 20777f990e2..b01ce7773e3 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ascii-${version}"; + pname = "ascii"; version = "3.18"; src = fetchurl { - url = "http://www.catb.org/~esr/ascii/${name}.tar.gz"; + url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz"; sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j"; }; diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 8a8eb3117f0..16d5b9995c2 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "catdoc-${version}"; + pname = "catdoc"; version = "0.95"; src = fetchurl { - url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz"; + url = "http://ftp.wagner.pp.ru/pub/catdoc/${pname}-${version}.tar.gz"; sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796"; }; diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 56a8133bd3a..521b4c5b284 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "codesearch-${version}"; + pname = "codesearch"; version = "20150717-${stdenv.lib.strings.substring 0 7 rev}"; rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix index 604097fbe77..9a405674dc7 100644 --- a/pkgs/tools/text/copyright-update/default.nix +++ b/pkgs/tools/text/copyright-update/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "copyright-update-${version}"; + pname = "copyright-update"; version = "2016.1018"; src = fetchFromGitHub { - name = "${name}-src"; + name = "${pname}-${version}-src"; owner = "jaalto"; repo = "project--copyright-update"; rev = "release/${version}"; diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 7404c887a46..5f6b0a8a605 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dadadodo-${version}"; + pname = "dadadodo"; version = "1.04"; src = fetchurl { - url = "https://www.jwz.org/dadadodo/${name}.tar.gz"; + url = "https://www.jwz.org/dadadodo/${pname}-${version}.tar.gz"; sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if"; }; diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix index cfb627d7042..f43cd94a83e 100644 --- a/pkgs/tools/text/diction/default.nix +++ b/pkgs/tools/text/diction/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "diction-${version}"; + pname = "diction"; version = "1.13"; src = fetchurl { - url = "http://www.moria.de/~michael/diction/${name}.tar.gz"; + url = "http://www.moria.de/~michael/diction/${pname}-${version}.tar.gz"; sha256 = "08fi971b8qa4xycxbgb42i6b5ms3qx9zpp5hwpbxy2vypfs0wph9"; }; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dd0d1bbc941..bd72ec94714 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "dos2unix-${version}"; + pname = "dos2unix"; version = "7.4.0"; src = fetchurl { - url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; + url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs"; }; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 098eee7cf72..6cfb4721066 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, recode }: stdenv.mkDerivation rec { - name = "enca-${version}"; + pname = "enca"; version = "1.19"; src = fetchurl { - url = "https://dl.cihar.com/enca/${name}.tar.xz"; + url = "https://dl.cihar.com/enca/${pname}-${version}.tar.xz"; sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s"; }; diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix index b4418e04f03..231a16bdc1b 100644 --- a/pkgs/tools/text/esh/default.nix +++ b/pkgs/tools/text/esh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }: stdenv.mkDerivation rec { - name = "esh-${version}"; + pname = "esh"; version = "0.1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index d61a7d184ea..6e9ff5170f2 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "glogg-${version}"; + pname = "glogg"; version = "1.1.4"; src = fetchurl { - url = "https://glogg.bonnefon.org/files/${name}.tar.gz"; + url = "https://glogg.bonnefon.org/files/${pname}-${version}.tar.gz"; sha256 = "0nwnfk9bcz2k7rf08w2cb6qipzdhwmxznik44jxmn9gwxdrdq78c"; }; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 8a44e434d4c..3d73bfba657 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "gnused-${version}"; + pname = "gnused"; version = "4.7"; src = fetchurl { diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 082c61635ba..a3df9617567 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "groff-${version}"; + pname = "groff"; version = "1.22.3"; src = fetchurl { - url = "mirror://gnu/groff/${name}.tar.gz"; + url = "mirror://gnu/groff/${pname}-${version}.tar.gz"; sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s"; }; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index a04a2c65e7c..58f1768bfa1 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gucci-${version}"; + pname = "gucci"; version = "0.1.0"; goPackagePath = "github.com/noqcks/gucci"; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 46fe9ab1cd7..eb86bc79d5c 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "highlight-${version}"; + pname = "highlight"; version = "3.53"; src = fetchFromGitLab { diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 1974c0aa4f3..e31db437850 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libxslt }: stdenv.mkDerivation rec { - name = "html-tidy-${version}"; + pname = "html-tidy"; version = "5.6.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index aec238cb4cc..dfbe6e7b6dc 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "icdiff-${version}"; + pname = "icdiff"; version = "1.9.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix index 46d290b79ff..18336fcf059 100644 --- a/pkgs/tools/text/jsawk/default.nix +++ b/pkgs/tools/text/jsawk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, spidermonkey }: stdenv.mkDerivation rec { - name = "jsawk-${version}"; + pname = "jsawk"; version = "1.5-pre"; src = fetchFromGitHub { owner = "micha"; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 5eea33d13a4..6be7106f2b9 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, cmake, protobuf }: stdenv.mkDerivation rec { pname = "jumanpp"; - name = "${pname}-${version}"; version = "2.0.0-rc2"; src = fetchurl { - url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; buildInputs = [ cmake protobuf ]; diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index 7254660cb1a..600907311ef 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "kytea-${version}"; + pname = "kytea"; version = "0.4.7"; src = fetchurl { - url = "http://www.phontron.com/kytea/download/${name}.tar.gz"; + url = "http://www.phontron.com/kytea/download/${pname}-${version}.tar.gz"; sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk"; }; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 1ccba80cb3e..f75099e630d 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "LanguageTool-${version}"; + pname = "LanguageTool"; version = "4.6"; src = fetchzip { - url = "https://www.languagetool.org/download/${name}.zip"; + url = "https://www.languagetool.org/download/${pname}-${version}.zip"; sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 32aeed7499f..bca0a5e3857 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "5.6.2"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { - url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; + url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k"; }; diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix index ddc7f96ec26..91c958cf067 100644 --- a/pkgs/tools/text/mb2md/default.nix +++ b/pkgs/tools/text/mb2md/default.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { version = "3.20"; - name = "mb2md-${version}"; + pname = "mb2md"; src = fetchurl { url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${version}.pl.gz"; diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix index 9896b365a6a..991d0735bab 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/tools/text/mecab/ipadic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mecab-nodic }: stdenv.mkDerivation rec { - name = "mecab-ipadic-${version}"; + pname = "mecab-ipadic"; version = "2.7.0-20070801"; src = fetchurl { diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 3e0bee3b9b9..9de7efa3a81 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: stdenv.mkDerivation rec { - name = "miller-${version}"; + pname = "miller"; version = "5.4.0"; diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix index 4e3be9e17e0..0a9b3777783 100644 --- a/pkgs/tools/text/mir-qualia/default.nix +++ b/pkgs/tools/text/mir-qualia/default.nix @@ -1,7 +1,7 @@ { lib, pythonPackages, fetchurl }: pythonPackages.buildPythonApplication rec { - name = "mir.qualia-${version}"; + pname = "mir.qualia"; version = "2.0.0"; doCheck = false; # 2.0.0-released pytests are broken diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 1320f824fdf..415ff0b31b7 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "numdiff-${version}"; + pname = "numdiff"; version = "5.9.0"; src = fetchurl { diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 48abee01830..69277d0412d 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, libiconv }: stdenv.mkDerivation rec { - name = "odt2txt-${version}"; + pname = "odt2txt"; version = "0.5"; src = fetchurl { diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index b51f811644d..9407e68ed16 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "peco-${version}"; + pname = "peco"; version = "0.5.3"; goPackagePath = "github.com/peco/peco"; diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 4b30387f7ac..342377b85ae 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "the_platinum_searcher-${version}"; + pname = "the_platinum_searcher"; version = "2.1.5"; rev = "v${version}"; diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index ccfeabaa73b..efe19a1b5ce 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "podiff-${version}"; + pname = "podiff"; version = "1.1"; src = fetchurl { diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index a5864fbc051..e1ac2248d22 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -3,7 +3,7 @@ nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "poedit-${version}"; + pname = "poedit"; version = "2.2.1"; src = fetchurl { diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index c536cbbaaad..27e9c80bc7d 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonApplication, click, future, six }: buildPythonApplication rec { - name = "proselint-${version}"; + pname = "proselint"; version = "0.10.2"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { - url = "mirror://pypi/p/proselint/${name}.tar.gz"; + url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs"; }; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index e3970c05902..9cf9349badb 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, qt4, perl, pkgconfig }: stdenv.mkDerivation rec { - name = "qshowdiff-${version}"; + pname = "qshowdiff"; version = "1.2"; src = fetchurl { diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 9e3e4d5b41d..25e9c07f351 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { - name = "reckon-${version}"; + pname = "reckon"; version = (import ./gemset.nix).reckon.version; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; gemdir = ./.; }; diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix index bdbc9712443..7ac3790f8a9 100644 --- a/pkgs/tools/text/rpl/default.nix +++ b/pkgs/tools/text/rpl/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "rpl"; version = "1.5.7"; diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 8aadbb0b806..83ac2d4d766 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "rst2html5"; version = "1.9.4"; src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; }; diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 2df6cbb27a2..5df4e90ff1a 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "schema2ldif-${version}"; + pname = "schema2ldif"; version = "1.3"; src = fetchurl { diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 12b57cb82df..6f29cbc18f2 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "shfmt-${version}"; + pname = "shfmt"; version = "2.6.4"; goPackagePath = "mvdan.cc/sh"; diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix index 97c677a7f70..f657df5b780 100644 --- a/pkgs/tools/text/shocco/default.nix +++ b/pkgs/tools/text/shocco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perlPackages, pythonPackages }: stdenv.mkDerivation rec { - name = "shocco-${version}"; + pname = "shocco"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 421715f7c33..c2a4cf22ea6 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "sift-${version}"; + pname = "sift"; version = "0.9.0"; rev = "v${version}"; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 72dfa684160..b37dbbf6836 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}: stdenv.mkDerivation rec { - name = "silver-searcher-${version}"; + pname = "silver-searcher"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 592f9b8f188..100124043ed 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.6"; - name = "txt2tags-${version}"; + pname = "txt2tags"; dontBuild = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://txt2tags.googlecode.com/files/${name}.tgz"; + url = "http://txt2tags.googlecode.com/files/${pname}-${version}.tgz"; sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530"; }; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 361b6782526..93611ec5531 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: stdenv.mkDerivation rec { - name = "unrtf-${version}"; + pname = "unrtf"; version = "0.21.9"; src = fetchurl { - url = "https://www.gnu.org/software/unrtf/${name}.tar.gz"; + url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz"; sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; }; diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index b1671ad38b5..923adf8571d 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "untex-${version}"; + pname = "untex"; version = "1.3"; src = fetchurl { - url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz"; + url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz"; sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv"; }; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 3e436b80be8..583ffd01db9 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vale-${version}"; + pname = "vale"; version = "1.4.3"; goPackagePath = "github.com/errata-ai/vale"; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 20cd5066e80..7b08cffe42d 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.29"; - name = "wgetpaste-${version}"; + pname = "wgetpaste"; src = fetchurl { - url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; + url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2"; sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22"; }; # currently zsh-autocompletion support is not installed diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 66dfa1c6b34..92ad2e00588 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { - name = "xidel-${version}"; + pname = "xidel"; version = "0.9.6"; ## Source archive lacks file (manageUtils.sh), using pre-built package for now. diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 0650270bb6a..c373f068961 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-${version}"; + pname = "basex"; version = "8.6.6"; src = fetchurl { diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 8851b8a2725..ed19e114469 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, libiconv }: stdenv.mkDerivation rec { - name = "html-xml-utils-${version}"; + pname = "html-xml-utils"; version = "7.7"; src = fetchurl { - url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; + url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index f764a2fac07..388dcc6b583 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: stdenv.mkDerivation rec { - name = "jing-trang-${version}"; + pname = "jing-trang"; version = "20151127"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix index fef8b9db2ff..21869cef4ee 100644 --- a/pkgs/tools/text/xml/rnv/default.nix +++ b/pkgs/tools/text/xml/rnv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, expat }: stdenv.mkDerivation rec { - name = "rnv-${version}"; + pname = "rnv"; version = "1.7.11"; src = fetchurl { diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index fc11e210c3c..093f1b0aec7 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl} : stdenv.mkDerivation rec { - name = "rxp-${version}"; + pname = "rxp"; version = "1.5.0"; src = fetchurl { diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix index 5982aa3828e..8dfec26e811 100644 --- a/pkgs/tools/text/xml/xmlformat/default.nix +++ b/pkgs/tools/text/xml/xmlformat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "xmlformat-${version}"; + pname = "xmlformat"; version = "1.04"; src = fetchurl { diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 55619b41632..6e66090d88f 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "2.0.0"; - name = "xurls-${version}"; + pname = "xurls"; src = fetchFromGitHub { owner = "mvdan"; diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index c9a6b7b3d79..27334bf09b4 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { - name = "zimwriterfs-${version}"; + pname = "zimwriterfs"; version = "1.0"; src = fetchFromGitHub { owner = "wikimedia"; repo = "openzim"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19"; }; diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index fd2cf133c0a..cb667e6b121 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "djvu2pdf-${version}"; + pname = "djvu2pdf"; src = fetchurl { url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz"; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 9240926ab5b..a72ca698077 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { - name = "fop-${version}"; + pname = "fop"; version = "2.1"; src = fetchurl { - url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz"; + url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz"; sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5"; }; diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index a255779c08a..c214bd3cac7 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "git-latexdiff-${version}"; + pname = "git-latexdiff"; src = fetchFromGitLab { sha256 = "05fnhr1pqvj8l25vi9hdccwfk4mv2f0pfhn05whbdvf66gyl4fs9"; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index d6c4fedc143..7fca57ab9d2 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -8,7 +8,7 @@ assert stdenv.isDarwin -> SystemConfiguration != null stdenv.mkDerivation rec { version = "1.8.29"; - name = "htmldoc-${version}"; + pname = "htmldoc"; src = fetchurl { url = "https://github.com/michaelrsweet/htmldoc/releases/download" + "/release-${version}/htmldoc-${version}-source.tar.gz"; diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 2b7a6f3ffb4..064e75ecbdc 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mmark-${version}"; + pname = "mmark"; version = "1.3.6"; rev = "v${version}"; diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 3a7d7be006a..cd78f63ef78 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - name = "multimarkdown-${version}"; + pname = "multimarkdown"; version = "4.7.1"; src = fetchgit { diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index c53e8573c90..9f62671a4fa 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { - name = "odpdown-${version}"; + pname = "odpdown"; version = "0.4.1"; src = fetchurl { diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 42f984b8cc6..a6f38ad0bc2 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.13"; - name = "pdf2djvu-${version}"; + pname = "pdf2djvu"; src = fetchurl { - url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0qscmfii1pvnb8g7kbl1rdiqyic6ybfiw4kwvy35qqi967c1daz0"; }; diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 3e40c9caf28..c8e27fb5a6e 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -14,7 +14,7 @@ let ]; in stdenv.mkDerivation rec { - name = "pdf2odt-${version}"; + pname = "pdf2odt"; version = "20170207"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 38382689edc..20da90961dd 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: stdenv.mkDerivation rec { - name = "pdfgrep-${version}"; + pname = "pdfgrep"; version = "2.1.2"; src = fetchurl { - url = "https://pdfgrep.org/download/${name}.tar.gz"; + url = "https://pdfgrep.org/download/${pname}-${version}.tar.gz"; sha256 = "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf"; }; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 0a0f593eaa3..6a2ebb089d2 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -29,7 +29,7 @@ let }); in stdenv.mkDerivation rec { - name = "satysfi-${version}"; + pname = "satysfi"; version = "0.0.3"; src = fetchFromGitHub { owner = "gfngfn"; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index f2a48e5db04..af1e8711f22 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "scdoc-${version}"; + pname = "scdoc"; version = "1.9.6"; src = fetchurl { diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 966d657ae7d..3b6ec809869 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "sile-${version}"; + pname = "sile"; version = "0.9.5.1"; src = fetchurl { - url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0"; }; diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 355d7a055e8..b06b2e25fcc 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "skribilo-${version}"; + pname = "skribilo"; version = "0.9.4"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz"; + url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"; }; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 1cb7b9ce975..e1bd3922ff3 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "sshlatex-${version}"; + pname = "sshlatex"; version = "0.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index b60cbcf22ad..a03432b729a 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "ted"; version = "2.23"; src = fetchurl { - url = "http://ftp.nluug.nl/pub/editors/${pname}/${name}.src.tar.gz"; + url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz"; sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z"; }; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 5444914f7a4..2513d48796e 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,6 @@ let auctex = stdenv.mkDerivation ( rec { version = "12.1"; - name = "${pname}-${version}"; # Make this a valid tex(live-new) package; # the pkgs attribute is provided with a hack below. @@ -13,7 +12,7 @@ let auctex = stdenv.mkDerivation ( rec { outputs = [ "out" "tex" ]; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69"; }; diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 906d9be0f1e..a08f32ce9c2 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }: stdenv.mkDerivation rec { - name = "tikzit-${version}"; + pname = "tikzit"; version = "2.1.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 523a34c0b56..df9a607d4f2 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -2,7 +2,7 @@ , glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: stdenv.mkDerivation rec { - name = "xmlroff-${version}"; + pname = "xmlroff"; version = "0.6.2"; src = fetchurl { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "docs" "" ''; - sourceRoot = "${name}/xmlroff/"; + sourceRoot = "${pname}-${version}/xmlroff/"; patches = [./xmlroff.patch]; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 711a3c00a12..b136e9c5ab7 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, autoreconfHook, zlib, Cocoa }: stdenv.mkDerivation rec { - name = "atomicparsley-${version}"; + pname = "atomicparsley"; version = "0.9.6"; src = fetchhg { diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 4f5a348b144..5594143bfbc 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -2,7 +2,7 @@ , cmake }: stdenv.mkDerivation rec { - name = "bento4-${version}"; + pname = "bento4"; version = "1.5.1-628"; src = fetchFromGitHub { diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 8be02873037..af56ba3e7eb 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -10,7 +10,7 @@ assert opensslSupport -> openssl != null && !gnutlsSupport; with stdenv.lib; stdenv.mkDerivation rec { - name = "rtmpdump-${version}"; + pname = "rtmpdump"; version = "2015-12-30"; src = fetchgit { diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index a50c7539fe0..d75405ab309 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "swftools-${version}"; + pname = "swftools"; version = "0.9.2"; src = fetchurl { - url = "http://www.swftools.org/${name}.tar.gz"; + url = "http://www.swftools.org/${pname}-${version}.tar.gz"; sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z"; }; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index c51c23d62f0..a87015ecf96 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -1,7 +1,7 @@ { stdenv, gcc, libav_12, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "untrunc-${version}"; + pname = "untrunc"; version = "2018.01.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index e995f9e3a4f..8fca318529f 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "yamdi-${version}"; + pname = "yamdi"; version = "1.9"; # Source repo is also available here: diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 6ed545deb67..e7c391806aa 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "amazon-ecs-cli-${version}"; + pname = "amazon-ecs-cli"; version = "1.15.1"; src = fetchurl { diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 37c3248b83e..57a68b86809 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "awless-${version}"; + pname = "awless"; version = "0.1.11"; goPackagePath = "github.com/wallix/awless"; diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 57742671211..1c7613b4893 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -3,8 +3,6 @@ with python2Packages; buildPythonApplication rec { - - name = "${pname}-${version}"; pname = "cloudmonkey"; version = "5.3.3"; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index c79c2e7cb35..a781f3a4424 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -7,7 +7,7 @@ let binPath = stdenv.lib.makeBinPath [ ]; in buildGoPackage rec { - name = "distrobuilder-${version}"; + pname = "distrobuilder"; version = "2019_10_07"; rev = "d686c88c21838f5505c3ec14711b2413604d7f5c"; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 674673f260c..e8172066800 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation rec { - name = "ec2-ami-tools-${version}"; + pname = "ec2-ami-tools"; version = "1.5.7"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip"; + url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; }; diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 7251b418d4e..0daa01f85bb 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "google-compute-engine-oslogin-${version}"; + pname = "google-compute-engine-oslogin"; version = "1.5.3"; # from packages/google-compute-engine-oslogin/packaging/debian/changelog diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 0db43ccfcfd..5abdcc23a74 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -11,7 +11,7 @@ }: buildPythonApplication rec { - name = "google-compute-engine-${version}"; + pname = "google-compute-engine"; version = "20190124"; namePrefix = ""; diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index f2fdbcc670d..0d239547752 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "govc-${version}"; + pname = "govc"; version = "0.20.0"; goPackagePath = "github.com/vmware/govmomi"; diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index 66618e59122..8dbeecc5605 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "marathonctl-unstable-${version}"; + pname = "marathonctl-unstable"; version = "2017-03-06"; goPackagePath = "github.com/shoenig/marathonctl"; diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 2699a7a1f36..79dd4e4551a 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "rootlesskit-${version}"; + pname = "rootlesskit"; version = "0.3.0-alpha.2"; goPackagePath = "github.com/rootless-containers/rootlesskit"; diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index dfb1467b54d..4a81e8fe48b 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation (rec { pname = "xe-guest-utilities"; - name = "${pname}-${version}"; version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 87c9bd3bacf..2d34bdaabc0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -132,7 +132,7 @@ with self; { }; vicious = toLuaModule(stdenv.mkDerivation rec { - name = "vicious-${version}"; + pname = "vicious"; version = "2.3.1"; src = fetchFromGitHub { -- GitLab From 136f528bbb67d69d4c660685236640c344808360 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 15 Aug 2019 22:38:20 -0400 Subject: [PATCH 28/92] perlPackages.FCGI: fix cross build --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9ff9045600b..193becfc634 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6196,6 +6196,9 @@ let url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz; sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa"; }; + postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed -i '/use IO::File/d' Makefile.PL + ''; }; FCGIClient = buildPerlModule { -- GitLab From 082e90d1cc5186b0d6097a1cf7fa6eff0d7c6e0c Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 29 Jul 2019 14:05:08 +0200 Subject: [PATCH 29/92] kdeFrameworks: 5.58 -> 5.60 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 632 +++++++++--------- 2 files changed, 317 insertions(+), 317 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index afab8a4e9a4..1b23a9da6e7 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.60/ ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 17473db9eeb..63819cda658 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz"; - sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a"; - name = "attica-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/attica-5.60.0.tar.xz"; + sha256 = "6658a886950ab87d779991b4c39beeff250f5aff64c71ee98b5c472a219ac6de"; + name = "attica-5.60.0.tar.xz"; }; }; baloo = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz"; - sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227"; - name = "baloo-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/baloo-5.60.0.tar.xz"; + sha256 = "d96a19ff94caf3e3b10e8d5f165e276829a42a1c70fb8451d70cb3764f06671e"; + name = "baloo-5.60.0.tar.xz"; }; }; bluez-qt = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz"; - sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0"; - name = "bluez-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/bluez-qt-5.60.0.tar.xz"; + sha256 = "328aba853ec0c034e777261d9e3ac3202ad941ffde844392e196afaed04be0d4"; + name = "bluez-qt-5.60.0.tar.xz"; }; }; breeze-icons = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz"; - sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491"; - name = "breeze-icons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz"; + sha256 = "99d0cbda6a38766079166633a06493929222c6443e8718c1a2db4aeb5b5f20b7"; + name = "breeze-icons-5.60.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz"; - sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7"; - name = "extra-cmake-modules-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/extra-cmake-modules-5.60.0.tar.xz"; + sha256 = "2bd9da815de98d5908d3371815df963d305c828f90ba1a076f38543876690248"; + name = "extra-cmake-modules-5.60.0.tar.xz"; }; }; frameworkintegration = { - version = "5.58.1"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz"; - sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274"; - name = "frameworkintegration-5.58.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/frameworkintegration-5.60.0.tar.xz"; + sha256 = "c82600be42b1db398acf4059bde92b3449bb6e52fd0180e66b41060e185e4872"; + name = "frameworkintegration-5.60.0.tar.xz"; }; }; kactivities = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz"; - sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b"; - name = "kactivities-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kactivities-5.60.0.tar.xz"; + sha256 = "7703b894c25a576a87c201d41899e793c3c2f89eaa57c1ab71266ae950091883"; + name = "kactivities-5.60.0.tar.xz"; }; }; kactivities-stats = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz"; - sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611"; - name = "kactivities-stats-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kactivities-stats-5.60.0.tar.xz"; + sha256 = "f7374d1d2fe94bae935796193a62e46ee1963a39e11b183cc0a40baedb973788"; + name = "kactivities-stats-5.60.0.tar.xz"; }; }; kapidox = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz"; - sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165"; - name = "kapidox-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kapidox-5.60.0.tar.xz"; + sha256 = "88cb8b8637e1c6e93d908d3384253d8d99efaa28ef7ba9c7a3089544e1f114dc"; + name = "kapidox-5.60.0.tar.xz"; }; }; karchive = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz"; - sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad"; - name = "karchive-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/karchive-5.60.0.tar.xz"; + sha256 = "4e3d2a6ba551c6ada44a6517150e031df92691919119bc3b5eb4efc741ff7564"; + name = "karchive-5.60.0.tar.xz"; }; }; kauth = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz"; - sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f"; - name = "kauth-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kauth-5.60.0.tar.xz"; + sha256 = "50a2a2eb90d7529bb6fc4ddd77e37ef5b25c612b18487cc63d8d086d5ec28916"; + name = "kauth-5.60.0.tar.xz"; }; }; kbookmarks = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz"; - sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02"; - name = "kbookmarks-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kbookmarks-5.60.0.tar.xz"; + sha256 = "a2b77f0b084211badce2eb90c19e00caf078ab59512c326ed1c90f4a58de0d9f"; + name = "kbookmarks-5.60.0.tar.xz"; }; }; kcmutils = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz"; - sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d"; - name = "kcmutils-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kcmutils-5.60.0.tar.xz"; + sha256 = "22226ca10caedc6021b966a26a45096f30837ca9eedcc97479e30f950abc7b8c"; + name = "kcmutils-5.60.0.tar.xz"; }; }; kcodecs = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz"; - sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef"; - name = "kcodecs-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kcodecs-5.60.0.tar.xz"; + sha256 = "cf8d5e5d47cbee31ea45faa1ca4d6043d3f8d9cbff2e5d40ce749a0b2cec50df"; + name = "kcodecs-5.60.0.tar.xz"; }; }; kcompletion = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz"; - sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd"; - name = "kcompletion-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kcompletion-5.60.0.tar.xz"; + sha256 = "d5afb075661dfe2da5e300bd73dee89f92736f39859be711f186310bed245f7c"; + name = "kcompletion-5.60.0.tar.xz"; }; }; kconfig = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz"; - sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e"; - name = "kconfig-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kconfig-5.60.0.tar.xz"; + sha256 = "541acceead9ca516e3562109e7e94351ce378c234bea968c8dfde78f00559233"; + name = "kconfig-5.60.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz"; - sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0"; - name = "kconfigwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kconfigwidgets-5.60.0.tar.xz"; + sha256 = "74ad4cf5b2858955e7966bb27f7b7ec38c6ddc7c95aa10ba356ef5775afeede3"; + name = "kconfigwidgets-5.60.0.tar.xz"; }; }; kcoreaddons = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz"; - sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e"; - name = "kcoreaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kcoreaddons-5.60.0.tar.xz"; + sha256 = "c78e41596e65fec08b1f7b212dd584cb61b5a9fe89c1bb312e06238fac3e137d"; + name = "kcoreaddons-5.60.0.tar.xz"; }; }; kcrash = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz"; - sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44"; - name = "kcrash-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kcrash-5.60.0.tar.xz"; + sha256 = "4f45a5ac0620a0fbf4b983ac3d3e68053a3a0f94bae86076f3bc3ec82ecac299"; + name = "kcrash-5.60.0.tar.xz"; }; }; kdbusaddons = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz"; - sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1"; - name = "kdbusaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kdbusaddons-5.60.0.tar.xz"; + sha256 = "996a9c41d6290e9520dfaa88a97a476f29b2992a135024ab0ad2bc707b0df881"; + name = "kdbusaddons-5.60.0.tar.xz"; }; }; kdeclarative = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz"; - sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec"; - name = "kdeclarative-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kdeclarative-5.60.0.tar.xz"; + sha256 = "bbfd1438752866352e4fc7cb69b616c7413eb0b765f73777aa52d5063e2eefb4"; + name = "kdeclarative-5.60.0.tar.xz"; }; }; kded = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz"; - sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1"; - name = "kded-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kded-5.60.0.tar.xz"; + sha256 = "cd472a852dcb3206b219a46660558ee24b09356d7342ce39b89ab54ea160c388"; + name = "kded-5.60.0.tar.xz"; }; }; kdelibs4support = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz"; - sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a"; - name = "kdelibs4support-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/portingAids/kdelibs4support-5.60.0.tar.xz"; + sha256 = "91b207b3d46c6bc5e97b9b89717db1ef7c4359c65bc4595794143ba78ce92a60"; + name = "kdelibs4support-5.60.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz"; - sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b"; - name = "kdesignerplugin-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kdesignerplugin-5.60.0.tar.xz"; + sha256 = "9472332c5a8f7c27d6c581a4f0f4f837d82e2780c1f9b25f2f034afd1d250607"; + name = "kdesignerplugin-5.60.0.tar.xz"; }; }; kdesu = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz"; - sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b"; - name = "kdesu-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kdesu-5.60.0.tar.xz"; + sha256 = "3a040ae9825738d9b4953086d6c262009dcff877a4ed7e6925e3a34086007687"; + name = "kdesu-5.60.0.tar.xz"; }; }; kdewebkit = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz"; - sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc"; - name = "kdewebkit-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/portingAids/kdewebkit-5.60.0.tar.xz"; + sha256 = "bf16bf33dfdecc5e4e50bacc5ce142774c5c1522639d3d0042779734767f12fb"; + name = "kdewebkit-5.60.0.tar.xz"; }; }; kdnssd = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz"; - sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05"; - name = "kdnssd-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kdnssd-5.60.0.tar.xz"; + sha256 = "8313b1a418559032a110f07b8816afd676770e0897d72d1d8cc353349a281964"; + name = "kdnssd-5.60.0.tar.xz"; }; }; kdoctools = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz"; - sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4"; - name = "kdoctools-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kdoctools-5.60.0.tar.xz"; + sha256 = "b231ea9857c5c1335fbf1a63907311a136651d93af4a4143e0b4caad833ae834"; + name = "kdoctools-5.60.0.tar.xz"; }; }; kemoticons = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz"; - sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd"; - name = "kemoticons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kemoticons-5.60.0.tar.xz"; + sha256 = "60e2f227ed7094a0d4d973f7968d4d70b7c9d176dadb45c540541a3d448a5125"; + name = "kemoticons-5.60.0.tar.xz"; }; }; kfilemetadata = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz"; - sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c"; - name = "kfilemetadata-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kfilemetadata-5.60.0.tar.xz"; + sha256 = "6d2ddfe0b16d73a139573dd02766825b21b958af16f51682c1f4cb816b3929f8"; + name = "kfilemetadata-5.60.0.tar.xz"; }; }; kglobalaccel = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz"; - sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf"; - name = "kglobalaccel-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kglobalaccel-5.60.0.tar.xz"; + sha256 = "660f2b930fd2ea4ad935f37d4e26253a7537ff30cf665ac57a41087dd4c2e805"; + name = "kglobalaccel-5.60.0.tar.xz"; }; }; kguiaddons = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz"; - sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3"; - name = "kguiaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kguiaddons-5.60.0.tar.xz"; + sha256 = "228dc1715a35979072381658ca244795e989ea941e703559de398fdea793c548"; + name = "kguiaddons-5.60.0.tar.xz"; }; }; kholidays = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz"; - sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef"; - name = "kholidays-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kholidays-5.60.0.tar.xz"; + sha256 = "af1954758e946b62e387e2197f128e7ae53b6054717f35bcabc674bec19b2d14"; + name = "kholidays-5.60.0.tar.xz"; }; }; khtml = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz"; - sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff"; - name = "khtml-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/portingAids/khtml-5.60.0.tar.xz"; + sha256 = "c18a5fa51cbf9f9a0a0f104e2fc0581abdb99a5bd36f8426ef129ea848414037"; + name = "khtml-5.60.0.tar.xz"; }; }; ki18n = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz"; - sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977"; - name = "ki18n-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/ki18n-5.60.0.tar.xz"; + sha256 = "b94598e6cb40019c9db403cb392b647d798692899467883f2f9419e1de5782c3"; + name = "ki18n-5.60.0.tar.xz"; }; }; kiconthemes = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz"; - sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480"; - name = "kiconthemes-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kiconthemes-5.60.0.tar.xz"; + sha256 = "054bfdb9129ae8610cad742198e2ad047f3960f810b8153dc28ead76687d9e79"; + name = "kiconthemes-5.60.0.tar.xz"; }; }; kidletime = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz"; - sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90"; - name = "kidletime-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kidletime-5.60.0.tar.xz"; + sha256 = "e7c4ca5ca3e847c37add4c81b3d430f4c4bf0214433a234a32d766c9199adb27"; + name = "kidletime-5.60.0.tar.xz"; }; }; kimageformats = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz"; - sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9"; - name = "kimageformats-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kimageformats-5.60.0.tar.xz"; + sha256 = "4e2fd48a2c5b7ee3af0b82bce9aaa0847e840b881bbb307c049bb8c881302635"; + name = "kimageformats-5.60.0.tar.xz"; }; }; kinit = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz"; - sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53"; - name = "kinit-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kinit-5.60.0.tar.xz"; + sha256 = "c8c109e220e8eb812a09d3474439b0f6f6af4d25861322a9494fc206da51afdc"; + name = "kinit-5.60.0.tar.xz"; }; }; kio = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz"; - sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069"; - name = "kio-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kio-5.60.0.tar.xz"; + sha256 = "be433fcf665679671a2e320556c39b708ed0789271e76ebb6142df058260238d"; + name = "kio-5.60.0.tar.xz"; }; }; kirigami2 = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz"; - sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3"; - name = "kirigami2-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kirigami2-5.60.0.tar.xz"; + sha256 = "f016481d393041513dda11345e9ee84723587fa4be9f17391ed1a5868477e153"; + name = "kirigami2-5.60.0.tar.xz"; }; }; kitemmodels = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz"; - sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491"; - name = "kitemmodels-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kitemmodels-5.60.0.tar.xz"; + sha256 = "364799922efa153d5bd6c326a8c3311d7170356807be1e67eb4d5135ec62f5ff"; + name = "kitemmodels-5.60.0.tar.xz"; }; }; kitemviews = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz"; - sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6"; - name = "kitemviews-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kitemviews-5.60.0.tar.xz"; + sha256 = "e43c1479bd5a8c90ba8e396a34299e0a96143ad6cdfd1edef0be5839fb95437f"; + name = "kitemviews-5.60.0.tar.xz"; }; }; kjobwidgets = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz"; - sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133"; - name = "kjobwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kjobwidgets-5.60.0.tar.xz"; + sha256 = "b9d2a044a17eff6ced2cf6c4bd06661a0d64cbeea2b18248cdac4f969ea69353"; + name = "kjobwidgets-5.60.0.tar.xz"; }; }; kjs = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz"; - sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c"; - name = "kjs-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/portingAids/kjs-5.60.0.tar.xz"; + sha256 = "9f4beaf9d773afbd73de5a9adf1f481c9b95fb02cc7cfe8ec050625c13811355"; + name = "kjs-5.60.0.tar.xz"; }; }; kjsembed = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz"; - sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d"; - name = "kjsembed-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/portingAids/kjsembed-5.60.0.tar.xz"; + sha256 = "91c8767a533ee414cd0b4789270881495a8e06482d68bda988cc5fdeb987c421"; + name = "kjsembed-5.60.0.tar.xz"; }; }; kmediaplayer = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz"; - sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea"; - name = "kmediaplayer-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/portingAids/kmediaplayer-5.60.0.tar.xz"; + sha256 = "c27ab1227276a65b1c98796b5bae5e62f0e5c45a904760d94f5624bd3a46949e"; + name = "kmediaplayer-5.60.0.tar.xz"; }; }; knewstuff = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz"; - sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd"; - name = "knewstuff-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/knewstuff-5.60.0.tar.xz"; + sha256 = "64744c6775c839d9d8216c4a81161df5544e113570b4cee8533b5a9b4c7b36f2"; + name = "knewstuff-5.60.0.tar.xz"; }; }; knotifications = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz"; - sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469"; - name = "knotifications-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/knotifications-5.60.0.tar.xz"; + sha256 = "fbed417c689b8abf08e1f29df5094cab55b193ce03483658dfb8cdbea3f2d928"; + name = "knotifications-5.60.0.tar.xz"; }; }; knotifyconfig = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz"; - sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01"; - name = "knotifyconfig-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/knotifyconfig-5.60.0.tar.xz"; + sha256 = "77e78f15226334ffaaa0469c06052cca60a9c18063140f38b9cd6dbf8de8f099"; + name = "knotifyconfig-5.60.0.tar.xz"; }; }; kpackage = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz"; - sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90"; - name = "kpackage-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kpackage-5.60.0.tar.xz"; + sha256 = "18d951c2ae16cfe2765dfec3ff42ce88f4b716b242294690efe8ff727395406d"; + name = "kpackage-5.60.0.tar.xz"; }; }; kparts = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz"; - sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4"; - name = "kparts-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kparts-5.60.0.tar.xz"; + sha256 = "6df0c2bf4481716e68d57b0e2040e9c2f0ee66e81309ba594d868026ea9f5ac6"; + name = "kparts-5.60.0.tar.xz"; }; }; kpeople = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz"; - sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32"; - name = "kpeople-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kpeople-5.60.0.tar.xz"; + sha256 = "ec72c0a0b8e5ee9541eb3d0dedfffc78aee39d54fec91d78adb33243a8b3bd1d"; + name = "kpeople-5.60.0.tar.xz"; }; }; kplotting = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz"; - sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b"; - name = "kplotting-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kplotting-5.60.0.tar.xz"; + sha256 = "75e8c21c2417a65cb423d11e4abd28a93a9cf9e3b2f01695cdedf9ee4b2fa7a0"; + name = "kplotting-5.60.0.tar.xz"; }; }; kpty = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz"; - sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017"; - name = "kpty-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kpty-5.60.0.tar.xz"; + sha256 = "757daec3b77395cdf390b35419972641b2ca18c986b39b98ccf8fb3384547338"; + name = "kpty-5.60.0.tar.xz"; }; }; kross = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz"; - sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872"; - name = "kross-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/portingAids/kross-5.60.0.tar.xz"; + sha256 = "e83f3388ca8e89057e272b3b98233f294528ed0dcb62a6edb6cf37b7a1891f45"; + name = "kross-5.60.0.tar.xz"; }; }; krunner = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz"; - sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c"; - name = "krunner-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/krunner-5.60.0.tar.xz"; + sha256 = "e0fce95407c52d1769a38a2f95f80637bbedb039b0df702b71c5b191795fdce3"; + name = "krunner-5.60.0.tar.xz"; }; }; kservice = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz"; - sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395"; - name = "kservice-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kservice-5.60.0.tar.xz"; + sha256 = "2d891e2781da5a562515ae09f5fb9ebd85ce397631cb217de11cb998e79516f8"; + name = "kservice-5.60.0.tar.xz"; }; }; ktexteditor = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz"; - sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e"; - name = "ktexteditor-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/ktexteditor-5.60.0.tar.xz"; + sha256 = "7484dfaa4df868c8193e15cc760b3ce7e8e0948daaa4a1b3ca6b96550041385d"; + name = "ktexteditor-5.60.0.tar.xz"; }; }; ktextwidgets = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz"; - sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7"; - name = "ktextwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/ktextwidgets-5.60.0.tar.xz"; + sha256 = "8149a999ca6d2dda523d6047956ca62fd283d71356b84dfd7db6fd1582b5d43e"; + name = "ktextwidgets-5.60.0.tar.xz"; }; }; kunitconversion = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz"; - sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa"; - name = "kunitconversion-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kunitconversion-5.60.0.tar.xz"; + sha256 = "0e377f67b6977787861aba971167aedfaa0e4c023609d505ea2d57357c082a79"; + name = "kunitconversion-5.60.0.tar.xz"; }; }; kwallet = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz"; - sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030"; - name = "kwallet-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kwallet-5.60.0.tar.xz"; + sha256 = "2ac2186dd7d004b6740cb14e7651ddcb7d74390acb382c9d55874f3a03a8111d"; + name = "kwallet-5.60.0.tar.xz"; }; }; kwayland = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz"; - sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1"; - name = "kwayland-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kwayland-5.60.0.tar.xz"; + sha256 = "a0645594c2dc7c121b11eecf1c1d31448d110d13dab200caadddb7e1d836d905"; + name = "kwayland-5.60.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz"; - sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0"; - name = "kwidgetsaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kwidgetsaddons-5.60.0.tar.xz"; + sha256 = "2e74d3897290c43871836a55ce0dbf4e6f3563f97016827d7ffccf0e5342a39d"; + name = "kwidgetsaddons-5.60.0.tar.xz"; }; }; kwindowsystem = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz"; - sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129"; - name = "kwindowsystem-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kwindowsystem-5.60.0.tar.xz"; + sha256 = "3bdce23b75b4b1d1eea69fb2035ff5be94ea2c1b7bb3d4e529a9b1740b106315"; + name = "kwindowsystem-5.60.0.tar.xz"; }; }; kxmlgui = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz"; - sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f"; - name = "kxmlgui-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kxmlgui-5.60.0.tar.xz"; + sha256 = "c81c2794610add13fd8019031fb40b0d002085d40ba358f6406c54f79581c149"; + name = "kxmlgui-5.60.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz"; - sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3"; - name = "kxmlrpcclient-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/kxmlrpcclient-5.60.0.tar.xz"; + sha256 = "e5f3bef626027b3cd84873362a5c6ee26692ee99a394ef9d944741670b1ca322"; + name = "kxmlrpcclient-5.60.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz"; - sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb"; - name = "modemmanager-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/modemmanager-qt-5.60.0.tar.xz"; + sha256 = "461b99099376d1210dad7867627c67b2a64af908a4fca0aeed75fc36059cad4e"; + name = "modemmanager-qt-5.60.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz"; - sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe"; - name = "networkmanager-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/networkmanager-qt-5.60.0.tar.xz"; + sha256 = "fae1d2e36e0c79095cfa3d907c86c47272226a6952ab93139b750f29e9215a65"; + name = "networkmanager-qt-5.60.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz"; - sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7"; - name = "oxygen-icons5-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/oxygen-icons5-5.60.0.tar.xz"; + sha256 = "dca378431ec83106859736938dcc81156435b71ead564ff7ddfda85311b94e5f"; + name = "oxygen-icons5-5.60.0.tar.xz"; }; }; plasma-framework = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz"; - sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad"; - name = "plasma-framework-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/plasma-framework-5.60.0.tar.xz"; + sha256 = "96c93ea54d1ce29f930e707ab4b0eafc9e31d022f9939d2bd42b2d884e450141"; + name = "plasma-framework-5.60.0.tar.xz"; }; }; prison = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz"; - sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d"; - name = "prison-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/prison-5.60.0.tar.xz"; + sha256 = "1b8149b8965c287f7fddfd91fb1d9cf95f150dda5b70b19480452c2e855945b5"; + name = "prison-5.60.0.tar.xz"; }; }; purpose = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz"; - sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df"; - name = "purpose-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/purpose-5.60.0.tar.xz"; + sha256 = "830669315e15a3edbf91130711b604967d1dae2cabb1fa79e0d72866f05b9f0a"; + name = "purpose-5.60.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz"; - sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3"; - name = "qqc2-desktop-style-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/qqc2-desktop-style-5.60.0.tar.xz"; + sha256 = "75e2cf793f1ba6af6592edf910412214a640366e08fea8487f20251a3e535140"; + name = "qqc2-desktop-style-5.60.0.tar.xz"; }; }; solid = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz"; - sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00"; - name = "solid-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/solid-5.60.0.tar.xz"; + sha256 = "bf3dbf22dc63946cf83cd69882f0d5fb8bf938c90252b85c849ef644caebac8a"; + name = "solid-5.60.0.tar.xz"; }; }; sonnet = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz"; - sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823"; - name = "sonnet-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/sonnet-5.60.0.tar.xz"; + sha256 = "f6734ac4a8dcef69f159ce0810a66ebbc2bdb8f67aac58376e8af35eb7c3dfc3"; + name = "sonnet-5.60.0.tar.xz"; }; }; syndication = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz"; - sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643"; - name = "syndication-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/syndication-5.60.0.tar.xz"; + sha256 = "67bf74432d362af7e7d21984f6915b047b596a8a0ac789cbf724ea7c4f8943d9"; + name = "syndication-5.60.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz"; - sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76"; - name = "syntax-highlighting-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/syntax-highlighting-5.60.0.tar.xz"; + sha256 = "45ada4dca20641654a2d076ecb45b9ef78a4aa8032afe54ade33f140cdca504d"; + name = "syntax-highlighting-5.60.0.tar.xz"; }; }; threadweaver = { - version = "5.58.0"; + version = "5.60.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz"; - sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d"; - name = "threadweaver-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.60/threadweaver-5.60.0.tar.xz"; + sha256 = "8bf6520e006dadacc82735242500c73810ff3ed4e3053c8352724c9d45f4a122"; + name = "threadweaver-5.60.0.tar.xz"; }; }; } -- GitLab From e143cbd3d793b6ac43c58b27695ab339a886a1f1 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 29 Jul 2019 14:06:01 +0200 Subject: [PATCH 30/92] kde_applications: 19.04.1 -> 19.04.3 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1720 ++++++++++++++++---------------- 2 files changed, 861 insertions(+), 861 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index bd96cb96693..6659865bc01 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.04.1/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.04.3/ ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 43deb08c39f..a4cd9eb2b09 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-19.04.1.tar.xz"; - sha256 = "b157c4199e3b913c4f684f56ed9d76bef67b3c120c319c88ae24bded6fc927bc"; - name = "akonadi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-19.04.3.tar.xz"; + sha256 = "7ac34dc7c3e2bf8e53ec9eebeecc8d96541c0b663dd71963e6bcd94e7ac41b07"; + name = "akonadi-19.04.3.tar.xz"; }; }; akonadi-calendar = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-19.04.1.tar.xz"; - sha256 = "6ef352dc20998416b8d379b085edfcfba5bcf6a5f448e11a4e51aca6b3241e48"; - name = "akonadi-calendar-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-19.04.3.tar.xz"; + sha256 = "939691e3c31993e3708a74759cbab951a51d0b36239426fe09c9ee9ff9622013"; + name = "akonadi-calendar-19.04.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-tools-19.04.1.tar.xz"; - sha256 = "6a8eb905d0e5a1602ce59d5cf28322d844dc178c4daf98db1cf9e0c95eeb3531"; - name = "akonadi-calendar-tools-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-tools-19.04.3.tar.xz"; + sha256 = "b7bf7c6a8df76f66d13209b3a2d1c47d703f0a3fff7936d2c880c11c2eb33d39"; + name = "akonadi-calendar-tools-19.04.3.tar.xz"; }; }; akonadiconsole = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadiconsole-19.04.1.tar.xz"; - sha256 = "33846348b0308eaf4ca81e8d577ce0eb6c17d49632e034607506413e86531262"; - name = "akonadiconsole-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadiconsole-19.04.3.tar.xz"; + sha256 = "25a302f3e582555cf003b48e28788d289a771e0c29c500afcd5d915e0bb34bda"; + name = "akonadiconsole-19.04.3.tar.xz"; }; }; akonadi-contacts = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-contacts-19.04.1.tar.xz"; - sha256 = "4c58a73db7924250e47fb030657dc768fe44405806ec2d94ee00a264b414febc"; - name = "akonadi-contacts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-contacts-19.04.3.tar.xz"; + sha256 = "9ecae008ccc77ff5982de5152dfc2be62eb1137f24a58aeb74a62291fc2fd93c"; + name = "akonadi-contacts-19.04.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-import-wizard-19.04.1.tar.xz"; - sha256 = "2699ca57ea6a04228875dd795255fd32a1120e2e5c4834290aea3270c43403e7"; - name = "akonadi-import-wizard-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-import-wizard-19.04.3.tar.xz"; + sha256 = "5e4b74790927be8372939237336e3684d7560d0c0652a26b57cc3233109234c4"; + name = "akonadi-import-wizard-19.04.3.tar.xz"; }; }; akonadi-mime = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-mime-19.04.1.tar.xz"; - sha256 = "4572aa7c953cc641a98ae3c2685dcdf259d621dcbbab1ccb7d11e2748c67b1a8"; - name = "akonadi-mime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-mime-19.04.3.tar.xz"; + sha256 = "ec4fbd594fb4fc57f1a7e11763b517721fc5e050ffa7bbc2bdddf5e76694d9f9"; + name = "akonadi-mime-19.04.3.tar.xz"; }; }; akonadi-notes = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-notes-19.04.1.tar.xz"; - sha256 = "e503101e8806485ecf6ef22d1bafd8c299676ca75a388499e5418b8641604277"; - name = "akonadi-notes-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-notes-19.04.3.tar.xz"; + sha256 = "c95f50c9ab0fc3587d3e1e78073038e3a044f3dc116068b354b2d148d6288dbf"; + name = "akonadi-notes-19.04.3.tar.xz"; }; }; akonadi-search = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-search-19.04.1.tar.xz"; - sha256 = "8438876407e9fd8fa08afe6942ab8dd3677202bc2ff1eba4fd7a49dd926f26d6"; - name = "akonadi-search-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akonadi-search-19.04.3.tar.xz"; + sha256 = "c5298a5b903373590e63039777c954720aa0bc46b25ec0c48e6409265b38d4ed"; + name = "akonadi-search-19.04.3.tar.xz"; }; }; akregator = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akregator-19.04.1.tar.xz"; - sha256 = "b2e731a3eac0a68865a90b71f17307c3aea8db304bf6663b551bc95907a490f1"; - name = "akregator-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/akregator-19.04.3.tar.xz"; + sha256 = "5d883061c4a53374ff2351646711d2b6eb047187ffd0d620a038fb6509bb60c0"; + name = "akregator-19.04.3.tar.xz"; }; }; analitza = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/analitza-19.04.1.tar.xz"; - sha256 = "b96da492805a48faff72e93e1b8b211c468b041fe217489eb097d554773d3381"; - name = "analitza-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/analitza-19.04.3.tar.xz"; + sha256 = "771cf26918ea09f1597ee95328bdfc1c65b28617b0b312ca609676a718fc2a9e"; + name = "analitza-19.04.3.tar.xz"; }; }; ark = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ark-19.04.1.tar.xz"; - sha256 = "6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6"; - name = "ark-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ark-19.04.3.tar.xz"; + sha256 = "a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee"; + name = "ark-19.04.3.tar.xz"; }; }; artikulate = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/artikulate-19.04.1.tar.xz"; - sha256 = "11a54ef7abf001bd3debcaf46bc60764af55a2dbda6320c3c220461374f74432"; - name = "artikulate-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/artikulate-19.04.3.tar.xz"; + sha256 = "3f0b811017c59a05260ca43a7e298633a6ac9ef0f9cfb8ec62890da0f3ec1217"; + name = "artikulate-19.04.3.tar.xz"; }; }; audiocd-kio = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/audiocd-kio-19.04.1.tar.xz"; - sha256 = "fad61ea586db7a4ce202fbb16854f69a20e8e16518dd60c27112447a904edb98"; - name = "audiocd-kio-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/audiocd-kio-19.04.3.tar.xz"; + sha256 = "4e684ab03fafd4ee37d7ef7d2c2edb883e76bb5a81e11415173317160997accf"; + name = "audiocd-kio-19.04.3.tar.xz"; }; }; baloo-widgets = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/baloo-widgets-19.04.1.tar.xz"; - sha256 = "7f7f0b3ba1bbdb3a47cdfa85830295b4b91fa5ac6c87b41d1cf29c354d8a4cf6"; - name = "baloo-widgets-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/baloo-widgets-19.04.3.tar.xz"; + sha256 = "ee14c03ac8254a0d0680bce856178a2110f0339b9dd5021927c59ff2df90606f"; + name = "baloo-widgets-19.04.3.tar.xz"; }; }; blinken = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/blinken-19.04.1.tar.xz"; - sha256 = "87fbf14568692885e7a496a8dae0c4f53a2837d1a824f9c7cf1038a7e8c861ca"; - name = "blinken-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/blinken-19.04.3.tar.xz"; + sha256 = "db0cb33ef117ad3c05f7f90a0d931106141431448d7fbb7c49f4832273313001"; + name = "blinken-19.04.3.tar.xz"; }; }; bomber = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/bomber-19.04.1.tar.xz"; - sha256 = "1359ebcaab26acd2dfa738160f9dd7a86e5bfa3d3b2f8a86c656ee187ad6c3fe"; - name = "bomber-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/bomber-19.04.3.tar.xz"; + sha256 = "48214f30503d37343268b817c68b47042cb9855688cc7564bf9c6dd5d2a31dda"; + name = "bomber-19.04.3.tar.xz"; }; }; bovo = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/bovo-19.04.1.tar.xz"; - sha256 = "46b5286349ba7765b81edf92f834c3e8e5c0ecd65466deb5fa593477e76f0763"; - name = "bovo-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/bovo-19.04.3.tar.xz"; + sha256 = "ee4b2480d51ba768e241faf70fcbe955656840c648e9d81c2a269ccc8558ea35"; + name = "bovo-19.04.3.tar.xz"; }; }; calendarsupport = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/calendarsupport-19.04.1.tar.xz"; - sha256 = "9b44e868a24494c3ce595dc71e8981f97a8ce75dc4646e1417ebde973ee5f535"; - name = "calendarsupport-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/calendarsupport-19.04.3.tar.xz"; + sha256 = "789ae6f2cb75baf239079b11742fbe40353c55eac84b0a396f761f010bc9041c"; + name = "calendarsupport-19.04.3.tar.xz"; }; }; cantor = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/cantor-19.04.1.tar.xz"; - sha256 = "95ce049f38182f9c0f7fb749c0940c24a51cc88053d218148ac82e925d9dfbb1"; - name = "cantor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/cantor-19.04.3.tar.xz"; + sha256 = "6ac01cf576d6ee6292d9656bebe2fa6f1216814148f77d0b9971df6a92ff5a47"; + name = "cantor-19.04.3.tar.xz"; }; }; cervisia = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/cervisia-19.04.1.tar.xz"; - sha256 = "fe72361330b055922e4ae66edb2e6958897b7c443ab3066ab7bbef1b8fd9d41b"; - name = "cervisia-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/cervisia-19.04.3.tar.xz"; + sha256 = "e0e04076ef5d43b18a571b5f3f8acb774a5c2fe03a901cd5fbf65621fc5e05eb"; + name = "cervisia-19.04.3.tar.xz"; }; }; dolphin = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/dolphin-19.04.1.tar.xz"; - sha256 = "72cab4d9f49ac05d3e0e8e1ff67cf29c0cacbe2c3a43506eca4c849ea878370a"; - name = "dolphin-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/dolphin-19.04.3.tar.xz"; + sha256 = "67a2b283049591fa0f00304b4da6532e9d59d9dc9067916e0ffe8aa19d93f579"; + name = "dolphin-19.04.3.tar.xz"; }; }; dolphin-plugins = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/dolphin-plugins-19.04.1.tar.xz"; - sha256 = "dc528e93d3f7809b8480da5134ead3886205a172a85b25ffdd5720ec67892105"; - name = "dolphin-plugins-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz"; + sha256 = "a68e15b71fa35acb190952ef49b2611876317e3bb0420d65d5365bc03feb9542"; + name = "dolphin-plugins-19.04.3.tar.xz"; }; }; dragon = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/dragon-19.04.1.tar.xz"; - sha256 = "f8acfc09aeec180850345f8881f963c19a3956cd7e07e42463bbe95ff2227ab8"; - name = "dragon-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/dragon-19.04.3.tar.xz"; + sha256 = "498bbcf3441a32a588568981ee3ad563b6c4fd88b226d1673d83da09901f117a"; + name = "dragon-19.04.3.tar.xz"; }; }; eventviews = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/eventviews-19.04.1.tar.xz"; - sha256 = "1fae8263d17a802393e5b1ece80879b66303f4d5bc8cc040cf142d6d5e8cc763"; - name = "eventviews-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/eventviews-19.04.3.tar.xz"; + sha256 = "3f479f695756cea5d10ea2ab028dd6a954e677223a5c1ff9f7be208742952f22"; + name = "eventviews-19.04.3.tar.xz"; }; }; ffmpegthumbs = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ffmpegthumbs-19.04.1.tar.xz"; - sha256 = "76f912f09c01698ed020bce2109f7cb893a9ca3ca7c014b118c0f97b4b4982ae"; - name = "ffmpegthumbs-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ffmpegthumbs-19.04.3.tar.xz"; + sha256 = "ddd6cb3388c1af96a14d611de9575f6f6c22c6acfe52e63e44b746709ac8024b"; + name = "ffmpegthumbs-19.04.3.tar.xz"; }; }; filelight = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/filelight-19.04.1.tar.xz"; - sha256 = "7595efbff5cbbe59b3fc4f6af69b9557107bc8661f38951577947503ac7883bd"; - name = "filelight-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/filelight-19.04.3.tar.xz"; + sha256 = "4ad45db886f06afdff1e5c580261eea18f2c0cf3bcde92ecdc626583641d6c88"; + name = "filelight-19.04.3.tar.xz"; }; }; granatier = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/granatier-19.04.1.tar.xz"; - sha256 = "372dd577805457425bb9c35b5f434089aa2bb7c1e6f54908b2be60d4dda2cb22"; - name = "granatier-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/granatier-19.04.3.tar.xz"; + sha256 = "996dafafc4a72cf49748c9e7046267980d5c9639b84c26e85266850dd1a9df21"; + name = "granatier-19.04.3.tar.xz"; }; }; grantlee-editor = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/grantlee-editor-19.04.1.tar.xz"; - sha256 = "b07f3c3179010b1d9a9170bc6e2b85517c3dfbd277336316882f4503823e076a"; - name = "grantlee-editor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/grantlee-editor-19.04.3.tar.xz"; + sha256 = "b244eef352ef776cbb0d3d5e51ffaa629d4ca3b6bd7fc86a8fda8d24e5090bca"; + name = "grantlee-editor-19.04.3.tar.xz"; }; }; grantleetheme = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/grantleetheme-19.04.1.tar.xz"; - sha256 = "fdcf77c996123daea0559cc2ac4251b330e2c4388104ee95f814af770fc33d8b"; - name = "grantleetheme-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/grantleetheme-19.04.3.tar.xz"; + sha256 = "c5cf79f1daddde3bc5b9387546b10e1d3ae4512279d50e3545ad38982c7f9aaf"; + name = "grantleetheme-19.04.3.tar.xz"; }; }; gwenview = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/gwenview-19.04.1.tar.xz"; - sha256 = "636498100284be86194d328c40ed70166cc96a5fc7665090e4a1ca9538b2f13c"; - name = "gwenview-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/gwenview-19.04.3.tar.xz"; + sha256 = "1e4c6881674dfcde52a196420eae2fab61dffb05b976125dfbd65c3bf2395035"; + name = "gwenview-19.04.3.tar.xz"; }; }; incidenceeditor = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/incidenceeditor-19.04.1.tar.xz"; - sha256 = "f0f5191e4246068fb941fde10df87b76b5ca1d6f491d864e4b7e4acacebcae58"; - name = "incidenceeditor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/incidenceeditor-19.04.3.tar.xz"; + sha256 = "b3a0ac35b04bc7851a32021552369ba5ac5b2e69969c29121d9cb2adfd5ccf70"; + name = "incidenceeditor-19.04.3.tar.xz"; }; }; juk = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/juk-19.04.1.tar.xz"; - sha256 = "f141c0e33eccd931438a1b1fe37810951ab177b3fe853d6dd387f28f59382e51"; - name = "juk-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/juk-19.04.3.tar.xz"; + sha256 = "f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750"; + name = "juk-19.04.3.tar.xz"; }; }; k3b = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/k3b-19.04.1.tar.xz"; - sha256 = "8de611bec14deee5b5c2b340fa4b32d22a7df93a72b657979118b510396f0942"; - name = "k3b-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/k3b-19.04.3.tar.xz"; + sha256 = "c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61"; + name = "k3b-19.04.3.tar.xz"; }; }; kaccounts-integration = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kaccounts-integration-19.04.1.tar.xz"; - sha256 = "0e37dc9b7b1520ea16afc7209da3cbaab1d43c3909896eba2f0422fb23f15433"; - name = "kaccounts-integration-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kaccounts-integration-19.04.3.tar.xz"; + sha256 = "fea6cc555de2e345079ed576be0c957ff5c7177ff658f31ce3bcb23176174372"; + name = "kaccounts-integration-19.04.3.tar.xz"; }; }; kaccounts-providers = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kaccounts-providers-19.04.1.tar.xz"; - sha256 = "006ccdc20738b8f77155e849b83987b9c9eeb50acf4e88d2fb948060c5f51011"; - name = "kaccounts-providers-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kaccounts-providers-19.04.3.tar.xz"; + sha256 = "483b87dc74913d7ab3b569d64e890d4358d95e2544ec8027cd21232495457636"; + name = "kaccounts-providers-19.04.3.tar.xz"; }; }; kaddressbook = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kaddressbook-19.04.1.tar.xz"; - sha256 = "15e84e6785e20e4f48020c093555e6c28930fcd946aa3421c56956564eba84fd"; - name = "kaddressbook-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kaddressbook-19.04.3.tar.xz"; + sha256 = "dc379c4a2d15a94fe5d7416e692301827377b503ba0880f3b508fe2c812d4349"; + name = "kaddressbook-19.04.3.tar.xz"; }; }; kajongg = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kajongg-19.04.1.tar.xz"; - sha256 = "5139ec428d4951b8e3dca8d30134002bc06b186c5c63c69831b3a98b49198475"; - name = "kajongg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kajongg-19.04.3.tar.xz"; + sha256 = "e367307310102b0f0b171718ae1bc6508e26b8200ba3d484dc0d7608f942ec2b"; + name = "kajongg-19.04.3.tar.xz"; }; }; kalarm = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalarm-19.04.1.tar.xz"; - sha256 = "e8a58584e765c1d98beb4b6bcac0ab835dcb1f1c1bab8cf1c01fa01a2a56bbfd"; - name = "kalarm-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kalarm-19.04.3.tar.xz"; + sha256 = "c686f5b768719e77e913ee616267f2980c9827ea71f3738099f18cb4d4178d84"; + name = "kalarm-19.04.3.tar.xz"; }; }; kalarmcal = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalarmcal-19.04.1.tar.xz"; - sha256 = "69a265ad7e82034974a47c795b81ee8768873dcb76018dc794a9905365111646"; - name = "kalarmcal-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kalarmcal-19.04.3.tar.xz"; + sha256 = "f0965229600ee962be3db85cfb94105e2734c8e066ff316e216c625c70dd25d7"; + name = "kalarmcal-19.04.3.tar.xz"; }; }; kalgebra = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalgebra-19.04.1.tar.xz"; - sha256 = "689d65f1a62623fc67d5de0a551aef03b241d85b105f31e91bd873d3b818c74f"; - name = "kalgebra-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kalgebra-19.04.3.tar.xz"; + sha256 = "b63904f2fc5609d8c62b18ae5e8b0f917785d9eaf46357a1045a9de89aa129ea"; + name = "kalgebra-19.04.3.tar.xz"; }; }; kalzium = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalzium-19.04.1.tar.xz"; - sha256 = "80798b3dca98cdd5ae24bbe7f077ecbe8def6bb96ad02a66ff69cb5312a459f5"; - name = "kalzium-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kalzium-19.04.3.tar.xz"; + sha256 = "2a7bf84021be5013aa1e2b14d0c97e6c80b1b7b9e2c78c8df50c0a94925699d1"; + name = "kalzium-19.04.3.tar.xz"; }; }; kamera = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kamera-19.04.1.tar.xz"; - sha256 = "3d5f97ac4b454c1512762f4039003d5745372aafa4fda4f293bda885ee70984f"; - name = "kamera-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kamera-19.04.3.tar.xz"; + sha256 = "acf5ecf939fa8f4366d607742dc673a307fd72cfa05f4fedb04547f7d336be43"; + name = "kamera-19.04.3.tar.xz"; }; }; kamoso = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kamoso-19.04.1.tar.xz"; - sha256 = "72f31d26319aed86daf200db7cc0bbe1e6ad77d891b644001ffd4c992a68e796"; - name = "kamoso-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kamoso-19.04.3.tar.xz"; + sha256 = "19168e5f45762b04254ebf598dfa7f066858ae243a9b7286d7e3e43385018ec6"; + name = "kamoso-19.04.3.tar.xz"; }; }; kanagram = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kanagram-19.04.1.tar.xz"; - sha256 = "70b0f7b20f2ebd951e3a10097990f9232cd1e3e6c11441d93513d435a7cb7f38"; - name = "kanagram-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kanagram-19.04.3.tar.xz"; + sha256 = "945276e94ccc82d958400583af4377f40d473bdc566d37962f7137f47663a728"; + name = "kanagram-19.04.3.tar.xz"; }; }; kapman = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kapman-19.04.1.tar.xz"; - sha256 = "7714a0cbd8e24f3ce46679d1f16d690c8bc62a988f0b3175095e0f0c23ce1400"; - name = "kapman-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kapman-19.04.3.tar.xz"; + sha256 = "6b1810bf946ff84b34b9fd6e913811d0e0a249cad5cb49b7990d742ec2832ca1"; + name = "kapman-19.04.3.tar.xz"; }; }; kapptemplate = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kapptemplate-19.04.1.tar.xz"; - sha256 = "5985705081aa94d282d173277e5717eede6f923eef4ed2d99182c46fbd1c9fd3"; - name = "kapptemplate-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kapptemplate-19.04.3.tar.xz"; + sha256 = "023273adf6df75d68b3ee52d14924887e403b80dea23eb765a98242fddcd4f37"; + name = "kapptemplate-19.04.3.tar.xz"; }; }; kate = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kate-19.04.1.tar.xz"; - sha256 = "af55513f00af1712a39631352e393dbd2f63ec6bd471831b44853a16d4bfbe8f"; - name = "kate-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kate-19.04.3.tar.xz"; + sha256 = "b1dcd45270c0494e97f32f435a943ca27b0bcb23065a9ad2a1fe37e4a81ad9a6"; + name = "kate-19.04.3.tar.xz"; }; }; katomic = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/katomic-19.04.1.tar.xz"; - sha256 = "2addfb86ec0043ab81046d64862e8fbeb3b4dd3b8d18f618ac8c39d995a05ce5"; - name = "katomic-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/katomic-19.04.3.tar.xz"; + sha256 = "e4edc6a0058ed929204b64bb99af294752bc20b1693e5930c2616af45d0587c3"; + name = "katomic-19.04.3.tar.xz"; }; }; kbackup = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbackup-19.04.1.tar.xz"; - sha256 = "29bed4258ec218edf05702808d0cfbff757016b7f3a80eb99e18610ab398036f"; - name = "kbackup-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kbackup-19.04.3.tar.xz"; + sha256 = "421e05fbc7b6332cfdca08faa65e74def2c5fa40a6211e6623e03cc4ec568019"; + name = "kbackup-19.04.3.tar.xz"; }; }; kblackbox = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kblackbox-19.04.1.tar.xz"; - sha256 = "9b5d57d0058c2458b7e24bd885d164cc1523d0c45827082e55af6ce669992431"; - name = "kblackbox-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kblackbox-19.04.3.tar.xz"; + sha256 = "45b8f5218c8817c38a13269ac5464c5abd2010d1ddb27ec255de1bf43ef2fe91"; + name = "kblackbox-19.04.3.tar.xz"; }; }; kblocks = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kblocks-19.04.1.tar.xz"; - sha256 = "0ae62f1aa9aeaa58f6e5fd62d6281159ef8a2bbee28d84b9d7a2ab207ec95390"; - name = "kblocks-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kblocks-19.04.3.tar.xz"; + sha256 = "10b350f91978c221c224c42e2f50dc8c2e86e187de8e46258b10cf3799fb4b74"; + name = "kblocks-19.04.3.tar.xz"; }; }; kblog = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kblog-19.04.1.tar.xz"; - sha256 = "6c162cd25a67c4fddbdc1063942fdfad1bbb239c714f205ae4f89585c2f65e93"; - name = "kblog-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kblog-19.04.3.tar.xz"; + sha256 = "5890ae54f85057e22807a7f47681004f521c3558c750ef75b90328118363a07d"; + name = "kblog-19.04.3.tar.xz"; }; }; kbounce = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbounce-19.04.1.tar.xz"; - sha256 = "729662f29e1b5b17b775bfa6895088cf3a7ee4ce3d4f2bc3db4f69ab0f07ca12"; - name = "kbounce-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kbounce-19.04.3.tar.xz"; + sha256 = "9a4ee5257becad72b359cc5985412ba2c4a15a81afe89022f812ec9eda7b5356"; + name = "kbounce-19.04.3.tar.xz"; }; }; kbreakout = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbreakout-19.04.1.tar.xz"; - sha256 = "9f40bb1c2d2e29a1098e371ffd0e97595d8e23cc7af2111fd143b67fac1393ad"; - name = "kbreakout-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kbreakout-19.04.3.tar.xz"; + sha256 = "7ef268806451e3b7ee813b921247257ff1a466ebd3c48b20bfc77ebebef10c9e"; + name = "kbreakout-19.04.3.tar.xz"; }; }; kbruch = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbruch-19.04.1.tar.xz"; - sha256 = "ab9033b6b8758803a87f046d05c9f6a5d247d1929bad147628cb6c2e5ba65b00"; - name = "kbruch-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kbruch-19.04.3.tar.xz"; + sha256 = "131455d024ead96cf2396cf6074a23584799c0793464b83eb3ecc2a455c5d355"; + name = "kbruch-19.04.3.tar.xz"; }; }; kcachegrind = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcachegrind-19.04.1.tar.xz"; - sha256 = "4b862becaa415601dc33391814637d8f089f2e2732192111ec029beb89991ac2"; - name = "kcachegrind-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcachegrind-19.04.3.tar.xz"; + sha256 = "856649529f0c19749a2b73125351400f401521664c9044fc33f92a09073d5270"; + name = "kcachegrind-19.04.3.tar.xz"; }; }; kcalc = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcalc-19.04.1.tar.xz"; - sha256 = "46d992a9e746231b57398b9bcdbe3933f6601e3cee7e3932ccc2e312779a4c91"; - name = "kcalc-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcalc-19.04.3.tar.xz"; + sha256 = "42da5439af4f59402d27f2c48d4ee9c68d4a84bfda8d16a5ab9d7ab6bdcc02d5"; + name = "kcalc-19.04.3.tar.xz"; }; }; kcalcore = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcalcore-19.04.1.tar.xz"; - sha256 = "d14bf2f8270c0072e415cf8fe87c0fb8eefad1b95a8713e184bba3e3ae6002f9"; - name = "kcalcore-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcalcore-19.04.3.tar.xz"; + sha256 = "335df0ae376b7abfc8274d46bb5a9956fb8ef438c1065d7f79a57db23005ca45"; + name = "kcalcore-19.04.3.tar.xz"; }; }; kcalutils = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcalutils-19.04.1.tar.xz"; - sha256 = "8856a1e812f81848f1e2adc179182349acfac9e189b55f29afeb020c148909ec"; - name = "kcalutils-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcalutils-19.04.3.tar.xz"; + sha256 = "de08972947008fd74fdeb7b2ddf642a356d84009b853a5aeec2ded98b399290e"; + name = "kcalutils-19.04.3.tar.xz"; }; }; kcharselect = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcharselect-19.04.1.tar.xz"; - sha256 = "c54570a6f968b2ccbe42c0a8dbaecb1f263fbd392f67b2d735ade492553ff9ec"; - name = "kcharselect-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcharselect-19.04.3.tar.xz"; + sha256 = "98ebcf13ec02f490bfeaa1001e46a397163939d75d73cf26cd4707e9aa2a4186"; + name = "kcharselect-19.04.3.tar.xz"; }; }; kcolorchooser = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcolorchooser-19.04.1.tar.xz"; - sha256 = "bfc2cdafd709d8829e19367151f59725152af2f4a80c583df671a9df1378e57a"; - name = "kcolorchooser-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcolorchooser-19.04.3.tar.xz"; + sha256 = "f60ee47baaca59b7df8ce58902ae09d44d2cb5b7f3f5ec7b9a401c7f7e3e5ab4"; + name = "kcolorchooser-19.04.3.tar.xz"; }; }; kcontacts = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcontacts-19.04.1.tar.xz"; - sha256 = "1773a5ddcec46dbf72cef2bbcc8c3143a0ba18ce6fa462ba642011b36b9cc088"; - name = "kcontacts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcontacts-19.04.3.tar.xz"; + sha256 = "28f3c61b99f6f6b1264a8373ab9915e6844f4025c74652cd897b7b560067e241"; + name = "kcontacts-19.04.3.tar.xz"; }; }; kcron = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcron-19.04.1.tar.xz"; - sha256 = "a58e8c99072e10a0b0a6acfecbbadef822c6f2818202bbaccdbee6b2a5b7e951"; - name = "kcron-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kcron-19.04.3.tar.xz"; + sha256 = "24f6f36d058c3e0587a7a70cc2d2df77eb593efa642833cfb17bc671e97c9cd6"; + name = "kcron-19.04.3.tar.xz"; }; }; kdav = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdav-19.04.1.tar.xz"; - sha256 = "356e59f904f075521df60499b7f84d7868dbb78968b04fd15be6d359c154e737"; - name = "kdav-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdav-19.04.3.tar.xz"; + sha256 = "f182a3ad6e23ff9e8165d11c3d4964e470e5d4d3f0183207cbe380f5c111af85"; + name = "kdav-19.04.3.tar.xz"; }; }; kdebugsettings = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdebugsettings-19.04.1.tar.xz"; - sha256 = "f04334f954d48fbd5a7bf41327563081966fb31950c131a943cf0a1a86281aa2"; - name = "kdebugsettings-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdebugsettings-19.04.3.tar.xz"; + sha256 = "0f3f2afafad0cfb312b51b15de6615359ba5ccd7bee6b35ce48a40e3a58368c5"; + name = "kdebugsettings-19.04.3.tar.xz"; }; }; kde-dev-scripts = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kde-dev-scripts-19.04.1.tar.xz"; - sha256 = "aa039d08b0e151703b6be0571d254d3656589d0b8422214110c460bd1f2aa6c2"; - name = "kde-dev-scripts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kde-dev-scripts-19.04.3.tar.xz"; + sha256 = "ef71c4891e9fe8bde99159a12a2539227b3994ad33ad46073a08074d61ec5b61"; + name = "kde-dev-scripts-19.04.3.tar.xz"; }; }; kde-dev-utils = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kde-dev-utils-19.04.1.tar.xz"; - sha256 = "9bca818e44f80ece758c0430aebcaf56252bbdffed6c8f65d04ccb4d019f2d9b"; - name = "kde-dev-utils-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kde-dev-utils-19.04.3.tar.xz"; + sha256 = "b8bde609a66482224d8c581692ecba0665894143ba64e816797a44eea7453a43"; + name = "kde-dev-utils-19.04.3.tar.xz"; }; }; kdeedu-data = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdeedu-data-19.04.1.tar.xz"; - sha256 = "751ec4df18d4ec3e7498a279bb891d6eb9a835fd786c8dd77ee883c9b55a0c30"; - name = "kdeedu-data-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdeedu-data-19.04.3.tar.xz"; + sha256 = "03d8e219a3d7f82f92887f200e017eaeb2fc3f9316f0ea63d4caa271c62f7791"; + name = "kdeedu-data-19.04.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-mobipocket-19.04.1.tar.xz"; - sha256 = "345be42b0fb4f2040ce1430c872c0d20b0abaa266159a19beac1b067b2723821"; - name = "kdegraphics-mobipocket-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-mobipocket-19.04.3.tar.xz"; + sha256 = "c073730b7f3d468f4e710a67bdb90d794b69bf0f2c149f7fac705b44b912fa94"; + name = "kdegraphics-mobipocket-19.04.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-thumbnailers-19.04.1.tar.xz"; - sha256 = "e82515177c1c465c1d499095ff51d71caf286505a0fd3b9bfd2f1cdc1744706e"; - name = "kdegraphics-thumbnailers-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-thumbnailers-19.04.3.tar.xz"; + sha256 = "1cca91081a97e851156d187794037bdcbffe996f607a1eed59a2ea00049a9f78"; + name = "kdegraphics-thumbnailers-19.04.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdenetwork-filesharing-19.04.1.tar.xz"; - sha256 = "5f3ae681f58a9877c7133778ff44c7be2a96cf26afbff10465984dae033251bd"; - name = "kdenetwork-filesharing-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdenetwork-filesharing-19.04.3.tar.xz"; + sha256 = "bc3763ecf49b85e159503928692c9cb68083c6acc49f2dead27f538fca0e8ab5"; + name = "kdenetwork-filesharing-19.04.3.tar.xz"; }; }; kdenlive = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdenlive-19.04.1.tar.xz"; - sha256 = "feb3202ee1aa0f47acc12ad7d6ca78977a4c9af0d705f8792ca2f8e3e6defbe5"; - name = "kdenlive-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdenlive-19.04.3.tar.xz"; + sha256 = "c981954ce9759da2878b4c76d97b9bb7aa92fc1f073a9f759142870e287d2a1e"; + name = "kdenlive-19.04.3.tar.xz"; }; }; kdepim-addons = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdepim-addons-19.04.1.tar.xz"; - sha256 = "d4e36a6d0043ad0ed5e3c427559bfaa29523578f99b613c82c3aaef16b2a7882"; - name = "kdepim-addons-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdepim-addons-19.04.3.tar.xz"; + sha256 = "a748027568ed2f82f9178c24f6eba18f1d5af26f51d1cc1ddedea645e04190a6"; + name = "kdepim-addons-19.04.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdepim-apps-libs-19.04.1.tar.xz"; - sha256 = "c3530a810a1eddfa06a27f24b723f971e7e2e144bbb2dac7ff30e7dec948a15d"; - name = "kdepim-apps-libs-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdepim-apps-libs-19.04.3.tar.xz"; + sha256 = "a3ad12f4b7c58154aef49fc5d0ac388a6e9441972605aaa02e17dd6a0583eeb2"; + name = "kdepim-apps-libs-19.04.3.tar.xz"; }; }; kdepim-runtime = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdepim-runtime-19.04.1.tar.xz"; - sha256 = "1587eca5a206768917443bd5274c03d8cbb2cbc6dcbe60449110c326b1aa0744"; - name = "kdepim-runtime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdepim-runtime-19.04.3.tar.xz"; + sha256 = "720945f803dc9027211eb46f281ef52b35da3fe4d990c1aeed6d57a89a45215a"; + name = "kdepim-runtime-19.04.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdesdk-kioslaves-19.04.1.tar.xz"; - sha256 = "80bbbdc91bc6a2b0c47a47044fdb2e107b89c63dd358b694c1c3f8e7cd1bbb16"; - name = "kdesdk-kioslaves-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdesdk-kioslaves-19.04.3.tar.xz"; + sha256 = "682e13382f41b76306e48ee9d75e993f84a4619be8de08023354653c6b350842"; + name = "kdesdk-kioslaves-19.04.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdesdk-thumbnailers-19.04.1.tar.xz"; - sha256 = "554d291605ac8827a2a4f6513a2230d9f9b0b8fcd6a37b0acd41c4db81fa3442"; - name = "kdesdk-thumbnailers-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdesdk-thumbnailers-19.04.3.tar.xz"; + sha256 = "771052d4f4482e88bb70a00a55b3b1755055088dce998e723948ff3de5c576fe"; + name = "kdesdk-thumbnailers-19.04.3.tar.xz"; }; }; kdf = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdf-19.04.1.tar.xz"; - sha256 = "835881e8f829c3c64ca529019f599ce89b95139d502673d5e6fb560a98eedce5"; - name = "kdf-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdf-19.04.3.tar.xz"; + sha256 = "4d3d3218cee73238e9be73db131062f186ede393bbe0115e4df633c7d21f2572"; + name = "kdf-19.04.3.tar.xz"; }; }; kdialog = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdialog-19.04.1.tar.xz"; - sha256 = "48e77dc4827af2445f8ac583bef319b7fd274f9b84a19635bf673801e96b259a"; - name = "kdialog-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdialog-19.04.3.tar.xz"; + sha256 = "647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823"; + name = "kdialog-19.04.3.tar.xz"; }; }; kdiamond = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdiamond-19.04.1.tar.xz"; - sha256 = "a7588f21e7151c1053787f75a17c1062a9c0b43611b824632ed1b8689f4996f3"; - name = "kdiamond-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kdiamond-19.04.3.tar.xz"; + sha256 = "22a567a63dd2bf9006d970e9aa5aeabff94c2ae9c98004bbd6cc35083a995536"; + name = "kdiamond-19.04.3.tar.xz"; }; }; keditbookmarks = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/keditbookmarks-19.04.1.tar.xz"; - sha256 = "05788d55020f330b52bd8641e47990c90c7585871489993888ce0f40fa1686db"; - name = "keditbookmarks-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/keditbookmarks-19.04.3.tar.xz"; + sha256 = "b255d6f85d34abf635857f922b059c3311fd7859262039bec0c90b6538c5e92e"; + name = "keditbookmarks-19.04.3.tar.xz"; }; }; kfind = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kfind-19.04.1.tar.xz"; - sha256 = "496dd642473bfaa881387d2fb3a3507a9bf8c84b8a6874525221b561a50ef9fd"; - name = "kfind-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kfind-19.04.3.tar.xz"; + sha256 = "2fcb5af039d976161ed09d87cb7c909bd2854647ea15688203b90dbebc54447f"; + name = "kfind-19.04.3.tar.xz"; }; }; kfloppy = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kfloppy-19.04.1.tar.xz"; - sha256 = "bde5c16c679a34aa6c74844caeea5e1746629ac7d35dfac0493e9d8f7d78aa75"; - name = "kfloppy-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kfloppy-19.04.3.tar.xz"; + sha256 = "7f3a206b6f4cd03771d8fba94423bf749a2b8e6bb4dfd01f30502d1ab08f1d8e"; + name = "kfloppy-19.04.3.tar.xz"; }; }; kfourinline = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kfourinline-19.04.1.tar.xz"; - sha256 = "9ba39703ccf64b76a0b9a2705d65b7c6c2067db795cfed298f0e3a2eac48b973"; - name = "kfourinline-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kfourinline-19.04.3.tar.xz"; + sha256 = "62a163f9c2034deba3daa93c4ac07c476895514ec9fefdd9a0792726a61d066f"; + name = "kfourinline-19.04.3.tar.xz"; }; }; kgeography = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kgeography-19.04.1.tar.xz"; - sha256 = "44e7297243a2f5ebd6c8e18e3380b7c66b3d085f64952937abf1683ddcb9d502"; - name = "kgeography-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kgeography-19.04.3.tar.xz"; + sha256 = "a94742602100e989b4dbbfa37c8bde99054710f28a1679ad458ee65de0db8b7e"; + name = "kgeography-19.04.3.tar.xz"; }; }; kget = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kget-19.04.1.tar.xz"; - sha256 = "a7dff0134d0ce6643fbde1ddfb73ce7d3300b927373a0907aec510f29d0d1629"; - name = "kget-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kget-19.04.3.tar.xz"; + sha256 = "9620ca07792e8a8d9bcb2069d36b665f2aa21d2428f109d825a663ccb6c12e25"; + name = "kget-19.04.3.tar.xz"; }; }; kgoldrunner = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kgoldrunner-19.04.1.tar.xz"; - sha256 = "11db3aecf77b7097b7d3d626dba4a3b4bcd3d5ab02a1e04cf7f6932b0b73a760"; - name = "kgoldrunner-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kgoldrunner-19.04.3.tar.xz"; + sha256 = "f1325580ebd91dcac9a79e66f939b372e7ea8264ef8671098471055f297110a8"; + name = "kgoldrunner-19.04.3.tar.xz"; }; }; kgpg = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kgpg-19.04.1.tar.xz"; - sha256 = "2c9c64491592db79397be3769413fae657ca991dd45d02690bbe533c1cba0ceb"; - name = "kgpg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kgpg-19.04.3.tar.xz"; + sha256 = "740ad342cfa1edf1c7cbbe8d15789533d5003dda5bf3899687eb4182b582236d"; + name = "kgpg-19.04.3.tar.xz"; }; }; khangman = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/khangman-19.04.1.tar.xz"; - sha256 = "5d35620bc048ecabd21b20cadfa8df07e72f195bdc5b9ad2c7e86e17d27afe27"; - name = "khangman-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/khangman-19.04.3.tar.xz"; + sha256 = "f2fd0d70c405ebd158f3e11a52cd1e268b1238fdada674b2f59b46324d2610a8"; + name = "khangman-19.04.3.tar.xz"; }; }; khelpcenter = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/khelpcenter-19.04.1.tar.xz"; - sha256 = "3436502f6fae659b930aa63e5ace088e0982804386cf1b24b042328796549114"; - name = "khelpcenter-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/khelpcenter-19.04.3.tar.xz"; + sha256 = "d18e0960859d72d9c2ebf187a9f5b1b65a8c78032e32df0d6eb0cce73921e972"; + name = "khelpcenter-19.04.3.tar.xz"; }; }; kidentitymanagement = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kidentitymanagement-19.04.1.tar.xz"; - sha256 = "5216d26aef0c483f3dff51564e8b1526821b25279d7c5e9c21c87a5d5e20822a"; - name = "kidentitymanagement-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kidentitymanagement-19.04.3.tar.xz"; + sha256 = "4bbe8bffe0624b516d102354197c508ff1a83b6280036f5ab100e7897b99e8da"; + name = "kidentitymanagement-19.04.3.tar.xz"; }; }; kig = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kig-19.04.1.tar.xz"; - sha256 = "37684e2d1893c2f3a412add1edd73047d3ae8ff501b035943a9793b94d468a79"; - name = "kig-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kig-19.04.3.tar.xz"; + sha256 = "05566395ce58c6c049d797f579362d52b612ab1718b111f7a054e9e3ae229459"; + name = "kig-19.04.3.tar.xz"; }; }; kigo = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kigo-19.04.1.tar.xz"; - sha256 = "5b5cae565a79309dc23b26acf2f596d36fd62950af58405094e4fa9a38e5e4ad"; - name = "kigo-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kigo-19.04.3.tar.xz"; + sha256 = "be91e9fa965505515c36733f260120e6c2ca7fe4856622f03bda07d7a0595ef0"; + name = "kigo-19.04.3.tar.xz"; }; }; killbots = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/killbots-19.04.1.tar.xz"; - sha256 = "8829dba8a3af320b03e21cd356e53fef0e70c10831ffeb6a70b722dde9877938"; - name = "killbots-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/killbots-19.04.3.tar.xz"; + sha256 = "4295853c0ee137474a3a8c193d4b038f020504a37a6ab3daf81cf4d43ed5d656"; + name = "killbots-19.04.3.tar.xz"; }; }; kimagemapeditor = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kimagemapeditor-19.04.1.tar.xz"; - sha256 = "d85d2f3d043a29e56f4234ce24dd75545e06c2812d5fe45cafde4c3dbe280533"; - name = "kimagemapeditor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kimagemapeditor-19.04.3.tar.xz"; + sha256 = "a7e5ba3d85c09c446e37baeac1c149395381b542fbbb1ab642645f631b5ab2de"; + name = "kimagemapeditor-19.04.3.tar.xz"; }; }; kimap = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kimap-19.04.1.tar.xz"; - sha256 = "ff933fba7ce8412fd64439e5f4c5a7be3a06fd39c79f520acfc648923819aa1f"; - name = "kimap-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kimap-19.04.3.tar.xz"; + sha256 = "58ed8471dc7e9c43e7bdb61c791e3bb612b2473bf0fb8f67857cb6fa72ddcf35"; + name = "kimap-19.04.3.tar.xz"; }; }; kio-extras = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kio-extras-19.04.1.tar.xz"; - sha256 = "ddf389a50142211566124ba902bb9f6b2988b1b94fefed7620a6ec421e3ff0bd"; - name = "kio-extras-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kio-extras-19.04.3.tar.xz"; + sha256 = "b65cb37a5965782a9eaae80840fdd7e06505aece33cc6774510c65e1fea3f55b"; + name = "kio-extras-19.04.3.tar.xz"; }; }; kirigami-gallery = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kirigami-gallery-19.04.1.tar.xz"; - sha256 = "ed7390a015a77f8285b4db4185533fa327a142a191c27afa7c2ce963ae6ad7e2"; - name = "kirigami-gallery-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kirigami-gallery-19.04.3.tar.xz"; + sha256 = "cd5bba6cf50b820492b5df6606288b9944f640634bba03d2d4e40279d5c4d1a4"; + name = "kirigami-gallery-19.04.3.tar.xz"; }; }; kiriki = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kiriki-19.04.1.tar.xz"; - sha256 = "131c6b5bd8f2b014a28bd5cb9985111f63991974b672dcfbc0266d32f069954b"; - name = "kiriki-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kiriki-19.04.3.tar.xz"; + sha256 = "ccb33616936c879aa61fdbaa87ae130c4f22c34b70cdd9b38b128bace850466e"; + name = "kiriki-19.04.3.tar.xz"; }; }; kiten = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kiten-19.04.1.tar.xz"; - sha256 = "be904abd0386a9ac6d622178f37e55d5a05f5eaa31c6a5cd661959ee4b03d2d4"; - name = "kiten-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kiten-19.04.3.tar.xz"; + sha256 = "c2e7fc12e305eeddc031de02254295427117b3a3910b8d5bcfc6ff97855f8fbc"; + name = "kiten-19.04.3.tar.xz"; }; }; kitinerary = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kitinerary-19.04.1.tar.xz"; - sha256 = "4053e16e847f0e234ffba2bb0533e947eae7b315304677a784279d03f13c0318"; - name = "kitinerary-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kitinerary-19.04.3.tar.xz"; + sha256 = "c2e9d1ae70797968382538da98bc8f9555e0d8d13faeb739bdadb5844c989227"; + name = "kitinerary-19.04.3.tar.xz"; }; }; kjumpingcube = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kjumpingcube-19.04.1.tar.xz"; - sha256 = "13d6a138e09c9088ce38fe9a124bd600386dc097b929f6f85416bc1da0012ab1"; - name = "kjumpingcube-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kjumpingcube-19.04.3.tar.xz"; + sha256 = "03feb2c3e0f46f1ca4f4d24ce8fd350c607bfaf52f715abbf379709d8d0a6818"; + name = "kjumpingcube-19.04.3.tar.xz"; }; }; kldap = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kldap-19.04.1.tar.xz"; - sha256 = "638e62d39fbe935b1df3c03f9617acbe5ade4ad617245bc590ca07b7fd0b723b"; - name = "kldap-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kldap-19.04.3.tar.xz"; + sha256 = "6b4bf8e69e6c372f60f746f2a6c453262283e25643a97192eef3c07c5c8d94df"; + name = "kldap-19.04.3.tar.xz"; }; }; kleopatra = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kleopatra-19.04.1.tar.xz"; - sha256 = "bc8895a506164df0fa0f7fc317fe8b961cb75d8c67f04474e1c12e25be358c67"; - name = "kleopatra-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kleopatra-19.04.3.tar.xz"; + sha256 = "a6265e182d480a146464751bf34e3430804dfbc954c09ff85bac15273aa1c033"; + name = "kleopatra-19.04.3.tar.xz"; }; }; klettres = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/klettres-19.04.1.tar.xz"; - sha256 = "d0db0773513fa35d1224e90cf5b09ac75b7b8f559d1080ee6026ba74df0f0847"; - name = "klettres-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/klettres-19.04.3.tar.xz"; + sha256 = "ba8498a28af8534083b2ea3eab5ada7b57deffe49673ef0e4ef278023e8b96af"; + name = "klettres-19.04.3.tar.xz"; }; }; klickety = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/klickety-19.04.1.tar.xz"; - sha256 = "d4ae4d002f008200a6ce920f2aff6841d9ad58b22c392d7eefac7867b32340af"; - name = "klickety-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/klickety-19.04.3.tar.xz"; + sha256 = "27b05ed8522ff353b4327f79ec069c453fc4545d2a07ca11fc53e53647841fe9"; + name = "klickety-19.04.3.tar.xz"; }; }; klines = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/klines-19.04.1.tar.xz"; - sha256 = "2ca4ad74fefa87bbf3a38ea90b55025ab8554bfdc47d7e4323e0906e9e1c8962"; - name = "klines-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/klines-19.04.3.tar.xz"; + sha256 = "a0d133a9a08e8f3953ae54b7da187c56cfbc518bfeadac4f32b82c9aa4f33c8b"; + name = "klines-19.04.3.tar.xz"; }; }; kmag = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmag-19.04.1.tar.xz"; - sha256 = "aa5ec91dcffc1a2f1037332aeacb096ab55388624c844c7fa311ca38a5e40874"; - name = "kmag-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmag-19.04.3.tar.xz"; + sha256 = "4fad3d4414884fa8fb7dcfb27e7cc4207dfe219819ffda75355de5c1b4981e35"; + name = "kmag-19.04.3.tar.xz"; }; }; kmahjongg = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmahjongg-19.04.1.tar.xz"; - sha256 = "75dbcfb5747530a3b69574fdc87b532067516415f962e7943feef97549237c99"; - name = "kmahjongg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmahjongg-19.04.3.tar.xz"; + sha256 = "41bd533bf8d8b1e04451cb3c9165b08f9135603c0085d8b402d0e8e026b8ed00"; + name = "kmahjongg-19.04.3.tar.xz"; }; }; kmail = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmail-19.04.1.tar.xz"; - sha256 = "62fcd78318d35848e5ae461f7ebd3b6f202c57c51008c71d7e2a1d1c3d58f2c5"; - name = "kmail-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmail-19.04.3.tar.xz"; + sha256 = "8e1d45741a9fab9848a659ab05497f82d79f7ffe3a42f121cb5136b1fcae833f"; + name = "kmail-19.04.3.tar.xz"; }; }; kmail-account-wizard = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmail-account-wizard-19.04.1.tar.xz"; - sha256 = "c6714c425daa3d79dfb47b5d18cff26b10b1b087e4472f627738494f06d04ab8"; - name = "kmail-account-wizard-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmail-account-wizard-19.04.3.tar.xz"; + sha256 = "a8cc19b30198459cb0fd74fb0d789a012354b4a9952a14312508af7079f92291"; + name = "kmail-account-wizard-19.04.3.tar.xz"; }; }; kmailtransport = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmailtransport-19.04.1.tar.xz"; - sha256 = "b8c0cf5cb8f7ad93bb3d1b2adab68fbc2470bc14160650fb45d1c4d40e8549fa"; - name = "kmailtransport-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmailtransport-19.04.3.tar.xz"; + sha256 = "2a3115a81f2c85c42345ee6380ea1c28129be5dd5a518270c6ec1062ea22abc5"; + name = "kmailtransport-19.04.3.tar.xz"; }; }; kmbox = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmbox-19.04.1.tar.xz"; - sha256 = "701eda3a4831ed0daf9bd14a93ff845f42e4f93c6ca16d83ebda958c27021fc0"; - name = "kmbox-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmbox-19.04.3.tar.xz"; + sha256 = "4025f1ef0288f2c30e64d8eb02bde117f1ee482b760bef52aa71faedc500733f"; + name = "kmbox-19.04.3.tar.xz"; }; }; kmime = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmime-19.04.1.tar.xz"; - sha256 = "25ee2e49ea62d32fcd09a710f971c6fcdc5434c6fdf711e93c19fc4baa325775"; - name = "kmime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmime-19.04.3.tar.xz"; + sha256 = "a6fe422eddb15eb52fbacde97b45ec6752b60f46149657a3bb7f48dc899e1c02"; + name = "kmime-19.04.3.tar.xz"; }; }; kmines = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmines-19.04.1.tar.xz"; - sha256 = "98a3860113a51e215a42791e3eb845978cda51fb5001b8e8bb41fe9182765d12"; - name = "kmines-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmines-19.04.3.tar.xz"; + sha256 = "34b23a66121183272a58f2cb38b798cab4f290d9f04546418ddb4b2b20e262a1"; + name = "kmines-19.04.3.tar.xz"; }; }; kmix = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmix-19.04.1.tar.xz"; - sha256 = "ca02ed8db5e4a3a58622b10668efb4c4a828de584b9f57116fee802e136352ea"; - name = "kmix-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmix-19.04.3.tar.xz"; + sha256 = "d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9"; + name = "kmix-19.04.3.tar.xz"; }; }; kmousetool = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmousetool-19.04.1.tar.xz"; - sha256 = "fd0fcebda4d7303a9c6f1117c08e091d96bfddf92a64e1cde2dc6b555daa0624"; - name = "kmousetool-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmousetool-19.04.3.tar.xz"; + sha256 = "15c4e02c02a993d2724320b6625e9a44d5658c47136dd9a9895897893305dbd0"; + name = "kmousetool-19.04.3.tar.xz"; }; }; kmouth = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmouth-19.04.1.tar.xz"; - sha256 = "9a8d0f9b1f09f1363d38b2a942ffe515521ffc410f869ed1a875ff1059ef8068"; - name = "kmouth-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmouth-19.04.3.tar.xz"; + sha256 = "712e21cc8cb45880b02c9cf5aa3a1bb2d54f9a2e09d1bbd2667eb99beded64dc"; + name = "kmouth-19.04.3.tar.xz"; }; }; kmplot = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmplot-19.04.1.tar.xz"; - sha256 = "c2e0855182d1ab0977b96669999976fb84c2f4b2645fcee0cb35b839bc1da206"; - name = "kmplot-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kmplot-19.04.3.tar.xz"; + sha256 = "8c312235076fdad431fc68dc3e8be18ab8317e8a6efb6e6170958cb7495ab479"; + name = "kmplot-19.04.3.tar.xz"; }; }; knavalbattle = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knavalbattle-19.04.1.tar.xz"; - sha256 = "f7b5ad956e4b1c06b04fec2d6f39331e81f2c44c716c2e666ef75b9d786982bc"; - name = "knavalbattle-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/knavalbattle-19.04.3.tar.xz"; + sha256 = "468e3fc16e17d3cbde2e213a46dcb07d1ea030a1522f40ab10b429254b8249af"; + name = "knavalbattle-19.04.3.tar.xz"; }; }; knetwalk = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knetwalk-19.04.1.tar.xz"; - sha256 = "e762415b6891c4098febc090bc80e5698cd3fb9ac2b8f4988aaf096816e3b62b"; - name = "knetwalk-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/knetwalk-19.04.3.tar.xz"; + sha256 = "d211a1bbc3a4f57dbea73da11d4ff351150de2ca6bd06251c2775a4e16601489"; + name = "knetwalk-19.04.3.tar.xz"; }; }; knights = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knights-19.04.1.tar.xz"; - sha256 = "d722fad8e835ea402337ffe1e6b8d1a5bda5a0e1c36ee3a89a6782b666a8534e"; - name = "knights-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/knights-19.04.3.tar.xz"; + sha256 = "ab2e01ee6e309bf5221333168b58cf41c20ad5a5e70beeb31520d4076f6153e5"; + name = "knights-19.04.3.tar.xz"; }; }; knotes = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knotes-19.04.1.tar.xz"; - sha256 = "b5cc805c657622e8cc4ab0ea07f30ea0258e767a87e525bc02fbc7d6ee9d7ec9"; - name = "knotes-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/knotes-19.04.3.tar.xz"; + sha256 = "8c269a5db708d623a7e36799d43204146b44f9de65f6e09a00782b1b62bf41fd"; + name = "knotes-19.04.3.tar.xz"; }; }; kolf = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kolf-19.04.1.tar.xz"; - sha256 = "92a56f5e5602a898537f87e12968e47cfe6f76d10daac6240e9f60e6751d06d7"; - name = "kolf-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kolf-19.04.3.tar.xz"; + sha256 = "c7a352332a2ff8e856bcf09e3bd0bfa8670e140da2e43e894ecf9f022fcef020"; + name = "kolf-19.04.3.tar.xz"; }; }; kollision = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kollision-19.04.1.tar.xz"; - sha256 = "2c243790feb8d7a7760fcadff6b06b21aea930218d0915664b420dccdc1c7de9"; - name = "kollision-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kollision-19.04.3.tar.xz"; + sha256 = "8374313b4bf4590ba051051fb6510774862690468719e8425addcdfd9daeff91"; + name = "kollision-19.04.3.tar.xz"; }; }; kolourpaint = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kolourpaint-19.04.1.tar.xz"; - sha256 = "a2f78f1a2f99fa8176980ecd224ccfd8848ff8357e3434b463d4f83bcc7b5e46"; - name = "kolourpaint-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kolourpaint-19.04.3.tar.xz"; + sha256 = "7ba4089fe55c870b54ff44bd423eebe50303b0324c4b421589115c4d1d349cac"; + name = "kolourpaint-19.04.3.tar.xz"; }; }; kompare = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kompare-19.04.1.tar.xz"; - sha256 = "ca270cde7c77fb44b40779ee22d556f14b9e0720e865ad6e3cf5cebbba4d7261"; - name = "kompare-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kompare-19.04.3.tar.xz"; + sha256 = "4dcb419336826ac1b8d37135ec153da585f8cebfdc9b6574c6abb866c277c8d0"; + name = "kompare-19.04.3.tar.xz"; }; }; konqueror = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/konqueror-19.04.1.tar.xz"; - sha256 = "b5f3c5a005b71886bfa2318bf13f14e6bab8fb84e1db54192409769bc3bf0e92"; - name = "konqueror-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/konqueror-19.04.3.tar.xz"; + sha256 = "257488e521c024fb6c8fdbef71aaccd9315505c8b14c6ffde0ce4060a48579b4"; + name = "konqueror-19.04.3.tar.xz"; }; }; konquest = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/konquest-19.04.1.tar.xz"; - sha256 = "cac10983efbc026d5c8cd3330c94865b43b1a229ff9bb76077ab25d734133aab"; - name = "konquest-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/konquest-19.04.3.tar.xz"; + sha256 = "cdf061ca7f2a3c30fd24b1bada2c9854ed4cb58232fbd5c999cb66602bc3d15b"; + name = "konquest-19.04.3.tar.xz"; }; }; konsole = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/konsole-19.04.1.tar.xz"; - sha256 = "711c67c5d43eb2c02be177e9d1157c142ab99ac5b808f951ab9a70e2397119d8"; - name = "konsole-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/konsole-19.04.3.tar.xz"; + sha256 = "20cadcda75a22ce7b4cb19240a16c9b286fa6ed836f352b8b337fb418e9a3b4c"; + name = "konsole-19.04.3.tar.xz"; }; }; kontact = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kontact-19.04.1.tar.xz"; - sha256 = "d60cc3165460a3e395778e4709ff55cbfbb80cc3536edb43d5d2335c70bd4714"; - name = "kontact-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kontact-19.04.3.tar.xz"; + sha256 = "05fab6c512635b07b6c99b3ee38d9e53060d44124052734381e9a6ddbef06e73"; + name = "kontact-19.04.3.tar.xz"; }; }; kontactinterface = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kontactinterface-19.04.1.tar.xz"; - sha256 = "034dcf0b2740273037a40ce2c1dd0d4eb17aac1eba608eca81f7e905a336cbc2"; - name = "kontactinterface-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kontactinterface-19.04.3.tar.xz"; + sha256 = "d541daab32bddd6727b795d280be668be9da801ef7267159ea030f998b52ca74"; + name = "kontactinterface-19.04.3.tar.xz"; }; }; kopete = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kopete-19.04.1.tar.xz"; - sha256 = "27586d90bd47abe6d8d6eddd7e41dbb6e3b3736984186cd24f84eee216e98b85"; - name = "kopete-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kopete-19.04.3.tar.xz"; + sha256 = "038c6385d6b2b6d1f35c5c337ebd8c492eea3e4a27d6f7236fd2fee219a7f28a"; + name = "kopete-19.04.3.tar.xz"; }; }; korganizer = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/korganizer-19.04.1.tar.xz"; - sha256 = "cb5c06d13f9f6eb4191ef6b86dab72ecde92fe6d9c8b6d9a4396645c94f83b67"; - name = "korganizer-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/korganizer-19.04.3.tar.xz"; + sha256 = "b2bae3a41994794a9c4d9ddfe10695edb0fee103f14ee607c31aec42c9e5d06c"; + name = "korganizer-19.04.3.tar.xz"; }; }; kpat = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kpat-19.04.1.tar.xz"; - sha256 = "2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896"; - name = "kpat-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kpat-19.04.3.tar.xz"; + sha256 = "ca9d53d400a2be3ca421d6d916cafeff3b9dcf220e627a1762f96817e952e8e2"; + name = "kpat-19.04.3.tar.xz"; }; }; kpimtextedit = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kpimtextedit-19.04.1.tar.xz"; - sha256 = "2fb2dc59a016dd70424c0fbad45ca1d750c2578f539e79d89bcace85bafd24d1"; - name = "kpimtextedit-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kpimtextedit-19.04.3.tar.xz"; + sha256 = "e71e0c4dc666db23a1cfcbe202d37cac3b0c5fd966c3edbdd88c85ed2e983f24"; + name = "kpimtextedit-19.04.3.tar.xz"; }; }; kpkpass = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kpkpass-19.04.1.tar.xz"; - sha256 = "fb3554b04d00b326d5f5e14af9c0272c020092d3329808a6177fb0714f6a1cb7"; - name = "kpkpass-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kpkpass-19.04.3.tar.xz"; + sha256 = "ee602c3176f141bf83d20d0ab277d26306a8b13ac105ec5594cfc8835d838a55"; + name = "kpkpass-19.04.3.tar.xz"; }; }; kqtquickcharts = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kqtquickcharts-19.04.1.tar.xz"; - sha256 = "7e05638f534257e901e02b6fa377747efa7881760dd66484b5a882c65e778e72"; - name = "kqtquickcharts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kqtquickcharts-19.04.3.tar.xz"; + sha256 = "18f51bd61d8ab28832355b69082bb63a0efa3cf720918d5e7ff434e2219c17f5"; + name = "kqtquickcharts-19.04.3.tar.xz"; }; }; krdc = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/krdc-19.04.1.tar.xz"; - sha256 = "8238b6969352d896751d28baeef770705feb5a0866e7b950e9eb0b377c098b19"; - name = "krdc-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/krdc-19.04.3.tar.xz"; + sha256 = "2458858d3e4d00ca2a95151ff7433d3a1726518f9a28281d5e1bb90855132426"; + name = "krdc-19.04.3.tar.xz"; }; }; kreversi = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kreversi-19.04.1.tar.xz"; - sha256 = "c8bce72bff0bd8b452335c158900d41a419ce3e62afd996f67a4b77abf38cdc9"; - name = "kreversi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kreversi-19.04.3.tar.xz"; + sha256 = "25325dee759916c803f2c43b8f97152257b0fcb90f9687d4f916c132ae956af4"; + name = "kreversi-19.04.3.tar.xz"; }; }; krfb = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/krfb-19.04.1.tar.xz"; - sha256 = "73dee235940cb0512cd218d88f90e6d2d62f232a6553f327b07e54c114c8480b"; - name = "krfb-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/krfb-19.04.3.tar.xz"; + sha256 = "6f1fd97b294150c017adebf18cb04dd1d554f5ece0d761e11131ecc549ee35b7"; + name = "krfb-19.04.3.tar.xz"; }; }; kross-interpreters = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kross-interpreters-19.04.1.tar.xz"; - sha256 = "d745f844ebe6ecefbf0d234e1e972cc7d7933a9ef75999839a709ba008ec55fe"; - name = "kross-interpreters-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kross-interpreters-19.04.3.tar.xz"; + sha256 = "f72e5418c522122bffcc8c8ae28ef912a34b1444b5c3626b74be3452cf92461f"; + name = "kross-interpreters-19.04.3.tar.xz"; }; }; kruler = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kruler-19.04.1.tar.xz"; - sha256 = "fdbff79128c8f4cb51f39dbb6f173726404d25c743aa68313651bb7a51addb53"; - name = "kruler-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kruler-19.04.3.tar.xz"; + sha256 = "58aa7dc6713647efa4dc0996c28736b614f2b88241f92fb21b60e662c7087a86"; + name = "kruler-19.04.3.tar.xz"; }; }; kshisen = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kshisen-19.04.1.tar.xz"; - sha256 = "a9e0e7324bb1bcad6c9427c0563236e557de85ad9724a52cfc917b43726b1aa6"; - name = "kshisen-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kshisen-19.04.3.tar.xz"; + sha256 = "3109a0bdb8933eebf10b945a75fc8b355aa8c97d5debd28943d8145a80efe2fe"; + name = "kshisen-19.04.3.tar.xz"; }; }; ksirk = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksirk-19.04.1.tar.xz"; - sha256 = "170cc0f9dea3f35e15de5d1090e8e3fa2b2ed16fa1722dfeaef47339667f322e"; - name = "ksirk-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ksirk-19.04.3.tar.xz"; + sha256 = "d91e6c34ac284e7f7e95d07d2f94852cb6ef549dd7e00f404ea40e22a4d2802b"; + name = "ksirk-19.04.3.tar.xz"; }; }; ksmtp = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksmtp-19.04.1.tar.xz"; - sha256 = "965f5f1c44cd64f9899ff5919372fe449e0f8b63e492f566017c9b8d5eb324bb"; - name = "ksmtp-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ksmtp-19.04.3.tar.xz"; + sha256 = "8d5eae342468f128fe1311b4797c9533b6017b9fb0901fb4c0d09bb73e39d02e"; + name = "ksmtp-19.04.3.tar.xz"; }; }; ksnakeduel = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksnakeduel-19.04.1.tar.xz"; - sha256 = "89de9e20e71ac8225e94d406cd3d25f057df35c96d4a3b7d418ffe5e6b0ef046"; - name = "ksnakeduel-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ksnakeduel-19.04.3.tar.xz"; + sha256 = "05b5c7f0f4ed21ac2926bbe9d2b3913ed8b512863837c3b83754c1048fe0cd04"; + name = "ksnakeduel-19.04.3.tar.xz"; }; }; kspaceduel = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kspaceduel-19.04.1.tar.xz"; - sha256 = "388eaf152c996bd7326f0a4cd18fafb2600659513750d0aadd98b780eb6ec8b7"; - name = "kspaceduel-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kspaceduel-19.04.3.tar.xz"; + sha256 = "c6a0e64f6c3149b408d3d11435388b6cd7760c2b1a4ead03a72215ca7fbadae0"; + name = "kspaceduel-19.04.3.tar.xz"; }; }; ksquares = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksquares-19.04.1.tar.xz"; - sha256 = "3c9b0cb0921d1c29c6c451a22b318151010a3321350292d0d5fc26cc16618773"; - name = "ksquares-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ksquares-19.04.3.tar.xz"; + sha256 = "d85c90f883c3ce1559dd0d3ceb20500563704cf6d1824c5fea3ddce0e1ca7563"; + name = "ksquares-19.04.3.tar.xz"; }; }; ksudoku = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksudoku-19.04.1.tar.xz"; - sha256 = "4f95ccd1b162c7fb7cad2b04e08e3a29cfc98ad27b87e6e76e389418d09c0f7b"; - name = "ksudoku-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ksudoku-19.04.3.tar.xz"; + sha256 = "608ffcde2d0bad3e2a19d7842c47b41627d009721a4e3161ccf2736f7777e922"; + name = "ksudoku-19.04.3.tar.xz"; }; }; ksystemlog = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksystemlog-19.04.1.tar.xz"; - sha256 = "c8e6cb81803b8754d394d9365d3a6533706c742c822a5ef9d46bdc2def356db4"; - name = "ksystemlog-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ksystemlog-19.04.3.tar.xz"; + sha256 = "7d155c91d57e253c00f038100e136e4bf6eb4d709549d689608ee0026354a965"; + name = "ksystemlog-19.04.3.tar.xz"; }; }; kteatime = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kteatime-19.04.1.tar.xz"; - sha256 = "68a23aa6a8bc575586966388315f403e464b43e1b2f4b669689f3161db1669f0"; - name = "kteatime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kteatime-19.04.3.tar.xz"; + sha256 = "49a404223896bd3df976e0c155a6907936f52721fc7da14289998b9d1ea372ba"; + name = "kteatime-19.04.3.tar.xz"; }; }; ktimer = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktimer-19.04.1.tar.xz"; - sha256 = "7ec4ebbdb8fc388763d832f8601bc7a32848836edc235f4c877bfb6d1726d809"; - name = "ktimer-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktimer-19.04.3.tar.xz"; + sha256 = "c282a02019f7b1f69eae09b564481ed7526c7c836155b1eed2b22fb01fcaf563"; + name = "ktimer-19.04.3.tar.xz"; }; }; ktnef = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktnef-19.04.1.tar.xz"; - sha256 = "6f9449307d83a7bf0dc30022c36e3d854a06b370af18e44ca6e2eab684b97c93"; - name = "ktnef-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktnef-19.04.3.tar.xz"; + sha256 = "ef0760dc31cad222f73a56d5098ffa9bff0e4c68a26f6f85ad542bb4f8dd3693"; + name = "ktnef-19.04.3.tar.xz"; }; }; ktouch = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktouch-19.04.1.tar.xz"; - sha256 = "09aa2ef862fffcdfc580b4aefff96a0591d99f470055365a90a41b25a3c6dcf2"; - name = "ktouch-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktouch-19.04.3.tar.xz"; + sha256 = "dce3f72204f43ddde109a39fca65f2936e9d9db686e6b3edf8ae04bc9c1c0e55"; + name = "ktouch-19.04.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-accounts-kcm-19.04.1.tar.xz"; - sha256 = "c4ecda8ca35438e45b48b9b86415bea1a44eeb2b2cd9af11ab1739f7ceeff045"; - name = "ktp-accounts-kcm-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-accounts-kcm-19.04.3.tar.xz"; + sha256 = "1c2f411bc161bbf08276bd3a12329f11f233e84e3e04cb632a2096c6e4d03afb"; + name = "ktp-accounts-kcm-19.04.3.tar.xz"; }; }; ktp-approver = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-approver-19.04.1.tar.xz"; - sha256 = "e12421c0e79692532497dbd6db6b09faba010d99c57db1893eae3e59f7df47cd"; - name = "ktp-approver-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-approver-19.04.3.tar.xz"; + sha256 = "40796bfd2644b1d43f6ecd3ce48298240af53967485283fa8d9cd330e8377b74"; + name = "ktp-approver-19.04.3.tar.xz"; }; }; ktp-auth-handler = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-auth-handler-19.04.1.tar.xz"; - sha256 = "8d06e90a7e73b034c6087079b510e0ac1c27728c885e9aa2e8baef463a892d65"; - name = "ktp-auth-handler-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-auth-handler-19.04.3.tar.xz"; + sha256 = "f65ceba1958b846f24894d57e180cf80f94ddad289713965f2abfd1ec8d91292"; + name = "ktp-auth-handler-19.04.3.tar.xz"; }; }; ktp-call-ui = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-call-ui-19.04.1.tar.xz"; - sha256 = "ad2efd84dc45cf55366dbc182d9301816129335ec4dc021dbbcc097c52656a0f"; - name = "ktp-call-ui-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-call-ui-19.04.3.tar.xz"; + sha256 = "e747049eefe80f7fccf4639c2bb1ed294538dc79e17a2ed395003d213a64821c"; + name = "ktp-call-ui-19.04.3.tar.xz"; }; }; ktp-common-internals = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-common-internals-19.04.1.tar.xz"; - sha256 = "041e5971071a060cef24abe68f699b5fcc657ba15a1e77feb227312fb1c13fd1"; - name = "ktp-common-internals-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-common-internals-19.04.3.tar.xz"; + sha256 = "43bcf817c3269251578e16fb9519668683e6efe4e33f453e13f5ef95fd96a9aa"; + name = "ktp-common-internals-19.04.3.tar.xz"; }; }; ktp-contact-list = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-list-19.04.1.tar.xz"; - sha256 = "7d8f7d841142d75036dc9dc4e31aefe8ff8906de6205b0e348b48e57da1400d9"; - name = "ktp-contact-list-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-list-19.04.3.tar.xz"; + sha256 = "c74903c4d099f4a138fa3cb4758460b2fdf49292070439e4da6194c0cc486c2f"; + name = "ktp-contact-list-19.04.3.tar.xz"; }; }; ktp-contact-runner = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-runner-19.04.1.tar.xz"; - sha256 = "68580e429fe0c9472a924af4f71df2da74684c5c11374464c110b9faca28c66f"; - name = "ktp-contact-runner-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-runner-19.04.3.tar.xz"; + sha256 = "30551ec0419e978f43d25f1a9b48d07429a14cde0feba58a08ad452a2f2d3b0e"; + name = "ktp-contact-runner-19.04.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-desktop-applets-19.04.1.tar.xz"; - sha256 = "1114d5bcbc5a20c2d4822b1e2ad07d5d493ceace0a75b77575e978c30dc5fa75"; - name = "ktp-desktop-applets-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-desktop-applets-19.04.3.tar.xz"; + sha256 = "826dd1e28e3fc7f730dbbe465183fc5df3bc1be67c89ccc8615607de783cc91d"; + name = "ktp-desktop-applets-19.04.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-filetransfer-handler-19.04.1.tar.xz"; - sha256 = "3e53fc28f4a1a8dd0dd2cb63b0a287061176a5c6e1db6480d50ebc70e2d8f189"; - name = "ktp-filetransfer-handler-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-filetransfer-handler-19.04.3.tar.xz"; + sha256 = "a2408806c9a3a50a7f04bb9106d27ba62e4b0e670957e6630a7841a191b5ca9c"; + name = "ktp-filetransfer-handler-19.04.3.tar.xz"; }; }; ktp-kded-module = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-kded-module-19.04.1.tar.xz"; - sha256 = "fe5fc292618b28d11dddec435e86a89899c52b074b7c729aefe951b0b7697a66"; - name = "ktp-kded-module-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-kded-module-19.04.3.tar.xz"; + sha256 = "dbbb1876c55e8bef22cde4bb59395ae6d4d01dd851368a5f293c5f7e2aed25e4"; + name = "ktp-kded-module-19.04.3.tar.xz"; }; }; ktp-send-file = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-send-file-19.04.1.tar.xz"; - sha256 = "8d3100de23666e3cb449663db376ed20e38647758371d37d721385af2b0d8d7a"; - name = "ktp-send-file-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-send-file-19.04.3.tar.xz"; + sha256 = "1ef4f7099e571e2a1f5fbaaf802d1002f14f5a644d5054b4b850a292bbb676c6"; + name = "ktp-send-file-19.04.3.tar.xz"; }; }; ktp-text-ui = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-text-ui-19.04.1.tar.xz"; - sha256 = "dfc51070d1a25edde7c0f33d4eb83185738a70e6feb40a8b385403e833cca0b5"; - name = "ktp-text-ui-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktp-text-ui-19.04.3.tar.xz"; + sha256 = "cf21be1ee61e5b4703feacab093f89aa66f126aba248b71111281513ba65661a"; + name = "ktp-text-ui-19.04.3.tar.xz"; }; }; ktuberling = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktuberling-19.04.1.tar.xz"; - sha256 = "f8146ecbe3a1005871a589054b996d059e5ff08b9d7fdeaa06591ae0ab05b8cb"; - name = "ktuberling-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/ktuberling-19.04.3.tar.xz"; + sha256 = "7abc2254d7a5c594e021807172486dfd93cfbda827a1b41583f8b1977a1a4f21"; + name = "ktuberling-19.04.3.tar.xz"; }; }; kturtle = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kturtle-19.04.1.tar.xz"; - sha256 = "f932a56d8f380cc422215e580d8c4d51eabd189f2b4ca3b4205e617d52e6e10d"; - name = "kturtle-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kturtle-19.04.3.tar.xz"; + sha256 = "811df4d31b920a2b3a6a0420df68e97e68b4226defd97d264f0b0b05c775c469"; + name = "kturtle-19.04.3.tar.xz"; }; }; kubrick = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kubrick-19.04.1.tar.xz"; - sha256 = "636080a8cac2f689f5af8de9aacef9e90029eafaaf7f1867b8a53a8a558e94c7"; - name = "kubrick-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kubrick-19.04.3.tar.xz"; + sha256 = "ee2932136e6bb7c9b03d0014c6ec845fb789668035ef22b2235dad23e6a5e4c7"; + name = "kubrick-19.04.3.tar.xz"; }; }; kwalletmanager = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kwalletmanager-19.04.1.tar.xz"; - sha256 = "793a3a335e53b6af36272398d7933ff0cc77918860799db2b5688ee249ce215d"; - name = "kwalletmanager-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kwalletmanager-19.04.3.tar.xz"; + sha256 = "b7eafd7ce252396bba0609d4114f88e0d1956e9f0f7f9703000eadda0cd7cc0e"; + name = "kwalletmanager-19.04.3.tar.xz"; }; }; kwave = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kwave-19.04.1.tar.xz"; - sha256 = "1fd7e256a5d9b77ef691642891b2423357ef4aea7f40ae64304ec922e5930fd6"; - name = "kwave-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kwave-19.04.3.tar.xz"; + sha256 = "dc9ad96a59b4bab1cd8f04401b3d87883cf888711898fdfc20d96113faf92431"; + name = "kwave-19.04.3.tar.xz"; }; }; kwordquiz = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kwordquiz-19.04.1.tar.xz"; - sha256 = "970381004a7382f4f24dad61eda8a386e138735d78c2609c92603e14acbe0158"; - name = "kwordquiz-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/kwordquiz-19.04.3.tar.xz"; + sha256 = "fc1a5a4780f667a805c17bda05d7024702d20d0e6aa552a0b7b6840b6e6cb381"; + name = "kwordquiz-19.04.3.tar.xz"; }; }; libgravatar = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libgravatar-19.04.1.tar.xz"; - sha256 = "7d4af799effc13af4f4b056d21b188bd67cd503d1528a7ff37e19d228619b522"; - name = "libgravatar-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libgravatar-19.04.3.tar.xz"; + sha256 = "23f8d50c5831ec1df995d6d711a590eb4f7de2823971ea5692aea50707c54bea"; + name = "libgravatar-19.04.3.tar.xz"; }; }; libkcddb = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkcddb-19.04.1.tar.xz"; - sha256 = "6773266408c0a68c128b08aca2df594249c210ff9b8fb3553b2bb82c591a2f51"; - name = "libkcddb-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkcddb-19.04.3.tar.xz"; + sha256 = "6471261ffef0e1546317040c4275a6fc11c131fde7229b5d0c9358a40442bec3"; + name = "libkcddb-19.04.3.tar.xz"; }; }; libkcompactdisc = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkcompactdisc-19.04.1.tar.xz"; - sha256 = "146d842741c24a379a0e134b8c0cbef916f5bd94fb8c6102703e5c764bf9b0ee"; - name = "libkcompactdisc-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkcompactdisc-19.04.3.tar.xz"; + sha256 = "9294aa908f158437241e27d57f924a2b7a07aa4203a51b83566de8c9690e86bc"; + name = "libkcompactdisc-19.04.3.tar.xz"; }; }; libkdcraw = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkdcraw-19.04.1.tar.xz"; - sha256 = "54576a803929a0adb3d25e239395b541c0820fecd633f09ea40677882c82e42c"; - name = "libkdcraw-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkdcraw-19.04.3.tar.xz"; + sha256 = "5017a47a76346e183e57617e093d5b61780bf564df55a07d02b1d75e2ff98c2d"; + name = "libkdcraw-19.04.3.tar.xz"; }; }; libkdegames = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkdegames-19.04.1.tar.xz"; - sha256 = "a16baa2818ab6f553d9c2635b252530538812787c50f9fbc0d18781943150e5c"; - name = "libkdegames-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkdegames-19.04.3.tar.xz"; + sha256 = "187aa81539113bc6786d861e1f5302fa17533ae1108299bbd1a86be18accfbc4"; + name = "libkdegames-19.04.3.tar.xz"; }; }; libkdepim = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkdepim-19.04.1.tar.xz"; - sha256 = "28217ce30663955168d39eaa4e0c7efb47a437f59df77971f3e98efea99adc45"; - name = "libkdepim-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkdepim-19.04.3.tar.xz"; + sha256 = "d3719c533df0b0fe8800a7810ee39f108d8408b909e5fb583ee2ab7ed4b4a6e9"; + name = "libkdepim-19.04.3.tar.xz"; }; }; libkeduvocdocument = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkeduvocdocument-19.04.1.tar.xz"; - sha256 = "c0b5e23a677cea13a2e15989a5b2240ddab2948b00be67e6306cf916e7ca2e59"; - name = "libkeduvocdocument-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkeduvocdocument-19.04.3.tar.xz"; + sha256 = "e0e229607c47b5da028588b9a22ffe41cf3e35d7e4f849eb109d9ce6c537277d"; + name = "libkeduvocdocument-19.04.3.tar.xz"; }; }; libkexiv2 = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkexiv2-19.04.1.tar.xz"; - sha256 = "138e1bf75cbbf16c46b6ba35f25e700ad93fa8a2134d0ad4c344174c7701cbae"; - name = "libkexiv2-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkexiv2-19.04.3.tar.xz"; + sha256 = "b0c5da0e23e93a218f7e96f98a753b36e2d608e74ac68c687ae868b6de99d1e6"; + name = "libkexiv2-19.04.3.tar.xz"; }; }; libkgapi = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkgapi-19.04.1.tar.xz"; - sha256 = "a9d499fe1f5371112ceb94b3b03f8e2b1a1faa4ee69722b4c1c9ba28e8f9052e"; - name = "libkgapi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkgapi-19.04.3.tar.xz"; + sha256 = "0fa879280979775523f258c80ec17c58045f812cbc6961b994ab78974a75afac"; + name = "libkgapi-19.04.3.tar.xz"; }; }; libkgeomap = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkgeomap-19.04.1.tar.xz"; - sha256 = "519345f30e46fc95816d145177347547c9c9eb440eab017c5ee928fa0ef8cf5a"; - name = "libkgeomap-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkgeomap-19.04.3.tar.xz"; + sha256 = "9266af7950b4cd73b694d61cf7bc0d03fc27d2bde3015f4c698e6d5d480d17bd"; + name = "libkgeomap-19.04.3.tar.xz"; }; }; libkipi = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkipi-19.04.1.tar.xz"; - sha256 = "1f1a8b881f61c9fc151a2f0b98c6ba07baa0fe1ca8a0f77d7502e81c08a84020"; - name = "libkipi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkipi-19.04.3.tar.xz"; + sha256 = "7da2a62e719b27221a74232375c907087be9a53b90fce0f7d36cbc11d7c13f7c"; + name = "libkipi-19.04.3.tar.xz"; }; }; libkleo = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkleo-19.04.1.tar.xz"; - sha256 = "a75084129e44028ff3f7742cdcb1800df94845d8c6ace38389da317144fa0529"; - name = "libkleo-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkleo-19.04.3.tar.xz"; + sha256 = "6c4ad79234c8a3cbe5cb0b5a6e7a11ccec98c5c5058bd970e44419ccab8663de"; + name = "libkleo-19.04.3.tar.xz"; }; }; libkmahjongg = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkmahjongg-19.04.1.tar.xz"; - sha256 = "7a1df5a03e1da1b801ca4530be3b9008b92cb4872ce8ec0038f2686ac325efbb"; - name = "libkmahjongg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkmahjongg-19.04.3.tar.xz"; + sha256 = "995f10fc62c506dbbb31bdab635fd52cb08e03eb09c859353aaf3423f48c7381"; + name = "libkmahjongg-19.04.3.tar.xz"; }; }; libkomparediff2 = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkomparediff2-19.04.1.tar.xz"; - sha256 = "2ab1a9cb25996bd6fb80bf556ba4b91a07385e62688249e9415b1ead8b3ad1b3"; - name = "libkomparediff2-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libkomparediff2-19.04.3.tar.xz"; + sha256 = "35f45f48c9c6afb32ade11985ca9e886e8f77a7428e2ce6650e119c3f29ce9b7"; + name = "libkomparediff2-19.04.3.tar.xz"; }; }; libksane = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libksane-19.04.1.tar.xz"; - sha256 = "c89039afa641640cbc65b01ae735ee9b70bd3283095d6b034665ddb048d33417"; - name = "libksane-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libksane-19.04.3.tar.xz"; + sha256 = "ec9c0a969806fefcefc0fda2e227bf0908e2b338fdf3377870a910d7f041e1e0"; + name = "libksane-19.04.3.tar.xz"; }; }; libksieve = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libksieve-19.04.1.tar.xz"; - sha256 = "23cca1dfc1d79242f24dd95e8817a9672629276bced3a9ee56067570ef69ccff"; - name = "libksieve-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/libksieve-19.04.3.tar.xz"; + sha256 = "5853f1b3764872a26b21064f8c23dd4ec66e453648c1aefa510f22af780e3289"; + name = "libksieve-19.04.3.tar.xz"; }; }; lokalize = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/lokalize-19.04.1.tar.xz"; - sha256 = "1e68faa5af9079e691e5d207b0397c0250fb6e1209b370e9762bfa949c35dce1"; - name = "lokalize-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/lokalize-19.04.3.tar.xz"; + sha256 = "ec8c552a176d131140273f975958e29f3a476c840cab0c470db072cc850e85c8"; + name = "lokalize-19.04.3.tar.xz"; }; }; lskat = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/lskat-19.04.1.tar.xz"; - sha256 = "f83f9df9e4786a8d6d8d197defb8ac7f40b8bed8e88578673b2660c14c7a4edf"; - name = "lskat-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/lskat-19.04.3.tar.xz"; + sha256 = "4e31cbad9534838c3fe380fd1326f56158dcc2b3a63a1e4c05529dcc9fc9b703"; + name = "lskat-19.04.3.tar.xz"; }; }; mailcommon = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/mailcommon-19.04.1.tar.xz"; - sha256 = "37b06e85e74d6ef1801485b8d99529fde5ca11bb446c231a6f5406e99f9c4d0f"; - name = "mailcommon-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/mailcommon-19.04.3.tar.xz"; + sha256 = "b38a23d2d59fed22dfcabeb9430b962c021fd62fd7e48d12ad3610b4d3a162fa"; + name = "mailcommon-19.04.3.tar.xz"; }; }; mailimporter = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/mailimporter-19.04.1.tar.xz"; - sha256 = "e77c5c43f20f821664a3a559b929eb2f97ba5105e000875b1642516a6f298696"; - name = "mailimporter-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/mailimporter-19.04.3.tar.xz"; + sha256 = "17483bf5d57936179f13abcee347aadadcc17d2cf40c1e2a3b5f2b6d85db87ec"; + name = "mailimporter-19.04.3.tar.xz"; }; }; marble = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/marble-19.04.1.tar.xz"; - sha256 = "acd9c15c4758684f6eff6c2318fc4dd88fd68dd41336de9458cad4d5f6832c61"; - name = "marble-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/marble-19.04.3.tar.xz"; + sha256 = "b2451d338bf433d5a0211c954f48fb5c6c80fecbb8fa69d604276fecb45fe826"; + name = "marble-19.04.3.tar.xz"; }; }; mbox-importer = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/mbox-importer-19.04.1.tar.xz"; - sha256 = "3fcd5c6b3824dea9ff4145dde6bf7b472675e3927ce91258d89cbfe4d0ebb77a"; - name = "mbox-importer-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/mbox-importer-19.04.3.tar.xz"; + sha256 = "68160ddd977c7f8f771b2934e57ec15042508a92461ca9d233312546d8d2c537"; + name = "mbox-importer-19.04.3.tar.xz"; }; }; messagelib = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/messagelib-19.04.1.tar.xz"; - sha256 = "7e4d0e2f2d6dfcb235408af0e4af235ab10dc8a8c4f1e169a672f03b37b180ad"; - name = "messagelib-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/messagelib-19.04.3.tar.xz"; + sha256 = "c97f88152593a031415148daa31384c56964973d4291aa86a892b2776333e223"; + name = "messagelib-19.04.3.tar.xz"; }; }; minuet = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/minuet-19.04.1.tar.xz"; - sha256 = "5f2e3692c0b7ae9496fa7952bfd02045aa87ba5ee10c6ef84fb4557abe83d0f0"; - name = "minuet-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/minuet-19.04.3.tar.xz"; + sha256 = "6d4614b7b42391c8b68627b879f61f59c22942ff1b340a25f75d90e296cdeb33"; + name = "minuet-19.04.3.tar.xz"; }; }; okular = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/okular-19.04.1.tar.xz"; - sha256 = "7145b1eea61c56a5b413e960e5b24038c7af5d3cb583a524deca344dae3a0e0e"; - name = "okular-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/okular-19.04.3.tar.xz"; + sha256 = "87ab5ffd852109d549d021b8fe94b9a4de212b2f164e9cc796b144732ff94282"; + name = "okular-19.04.3.tar.xz"; }; }; palapeli = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/palapeli-19.04.1.tar.xz"; - sha256 = "dc661c88dcf6e3a17b9a2a403cac1ba9bd8f7144ff2c01ff3c286564159f796b"; - name = "palapeli-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/palapeli-19.04.3.tar.xz"; + sha256 = "7cbf7a1666e16a476de9bdab7155f17f2224baa7db9d80cd77c785dead6f2e10"; + name = "palapeli-19.04.3.tar.xz"; }; }; parley = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/parley-19.04.1.tar.xz"; - sha256 = "c52746417d32e31f66c1165fd08ab87696d5ef4b5a020a175fe00e60474bc73f"; - name = "parley-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/parley-19.04.3.tar.xz"; + sha256 = "4c4aeaae4f1dd4193c422c5921d9cf02216fc6670f5077fcd92b4d48378fa720"; + name = "parley-19.04.3.tar.xz"; }; }; picmi = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/picmi-19.04.1.tar.xz"; - sha256 = "10abab6e48f48e1e1308fbd2a687bb4c5051c6ae2a670b737d6974432fdef30c"; - name = "picmi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/picmi-19.04.3.tar.xz"; + sha256 = "1e47527b49f8d94da0a6ea492d23215ae7ff3fcb403116abe43665efb567beab"; + name = "picmi-19.04.3.tar.xz"; }; }; pimcommon = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/pimcommon-19.04.1.tar.xz"; - sha256 = "bc4612711775ea4665c0827c7935397503b5cf82f906bcf22a64b3ab1eaaaa72"; - name = "pimcommon-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/pimcommon-19.04.3.tar.xz"; + sha256 = "b979ba19d0c5c7d4f218992bfe434fdc9b49bd8cfdee0d25e4c44bbddc793fee"; + name = "pimcommon-19.04.3.tar.xz"; }; }; pim-data-exporter = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/pim-data-exporter-19.04.1.tar.xz"; - sha256 = "0fa9e20ef67f64d5a9c967f4ea32a476438b23ab8405774035cd4584e6100ebd"; - name = "pim-data-exporter-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/pim-data-exporter-19.04.3.tar.xz"; + sha256 = "33bc76f798849b4421563d3d7989ae72182ad75573e176469e785d08a867b653"; + name = "pim-data-exporter-19.04.3.tar.xz"; }; }; pim-sieve-editor = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/pim-sieve-editor-19.04.1.tar.xz"; - sha256 = "3a8ce54140233fa7ae618fc05ae9d882cab6e56835e9fdb29e2242885ce50e10"; - name = "pim-sieve-editor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/pim-sieve-editor-19.04.3.tar.xz"; + sha256 = "331eff69a144cb7f71bba2533bd2690f26bfb56adb796dc1adaa9c5f41db4e09"; + name = "pim-sieve-editor-19.04.3.tar.xz"; }; }; poxml = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/poxml-19.04.1.tar.xz"; - sha256 = "d8439996821ded53dea321f84619f3754cc677b5fa08b5fd37aabb09b8dac2f9"; - name = "poxml-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/poxml-19.04.3.tar.xz"; + sha256 = "844ccecc8db4c6da4b84a4829cdd1961603a09fd5ee18dfda73a9def78addefe"; + name = "poxml-19.04.3.tar.xz"; }; }; print-manager = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/print-manager-19.04.1.tar.xz"; - sha256 = "33d553bb048959ecfc5e404f3a1e118b0ed78305d96b3a6042ffd576a164e9fa"; - name = "print-manager-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/print-manager-19.04.3.tar.xz"; + sha256 = "5ab32527d6916c1063bf175a1515a0cebb0dfb93844881c4339b2ee690697907"; + name = "print-manager-19.04.3.tar.xz"; }; }; rocs = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/rocs-19.04.1.tar.xz"; - sha256 = "5c0740d68ed26f7291e114faa811a2ae104ee682181f5ebed381865dd7d8db61"; - name = "rocs-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/rocs-19.04.3.tar.xz"; + sha256 = "eec0f7ab55f81946dafa2e31ee92a2bec5c1727e64bdeb8e7566c61f66e53d01"; + name = "rocs-19.04.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/signon-kwallet-extension-19.04.1.tar.xz"; - sha256 = "658bbae2534896e13a7aced654f38164130ee3c748349d044000d0d7dcaa1c38"; - name = "signon-kwallet-extension-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/signon-kwallet-extension-19.04.3.tar.xz"; + sha256 = "bddf5fe036b95769ad9ff02a9583b7f96280e9a48db4abc92f98e4d163f7daa9"; + name = "signon-kwallet-extension-19.04.3.tar.xz"; }; }; spectacle = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/spectacle-19.04.1.tar.xz"; - sha256 = "6f420fc6a660e25a08449cfb6d2795e07a37f8dca25f1862d857121b43f9262c"; - name = "spectacle-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/spectacle-19.04.3.tar.xz"; + sha256 = "bbf2c17298608dc69139f1f0a07de05b724d83cf57e8fe085a376723d83d15d1"; + name = "spectacle-19.04.3.tar.xz"; }; }; step = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/step-19.04.1.tar.xz"; - sha256 = "4fafff95339473e6449e9a45e273fe15758daf743e8697ff73f16129eb1dca05"; - name = "step-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/step-19.04.3.tar.xz"; + sha256 = "a9b2daff1c9821e9c0fa79d39fc15b96753a3d0c61863d76d07e4e3222b0a4a2"; + name = "step-19.04.3.tar.xz"; }; }; svgpart = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/svgpart-19.04.1.tar.xz"; - sha256 = "3e30eb3b0f95073639697c73f1cc1d4689e53921cc87fe23cd0ec04ef6835624"; - name = "svgpart-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/svgpart-19.04.3.tar.xz"; + sha256 = "5dd870a24f275b6d8e0ec9593da713c29b521234d1eb07415726d57ae3fb8dc5"; + name = "svgpart-19.04.3.tar.xz"; }; }; sweeper = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/sweeper-19.04.1.tar.xz"; - sha256 = "70ccd7a1d8d81ee2a54df724a1ad908157672bb20e80c81aff8db946241b6637"; - name = "sweeper-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/sweeper-19.04.3.tar.xz"; + sha256 = "03b0ed0006da9a9ee02b9e3201e4974444fba00a5a59fc14ca179656eeb86aaf"; + name = "sweeper-19.04.3.tar.xz"; }; }; umbrello = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/umbrello-19.04.1.tar.xz"; - sha256 = "42f9ba60320558439a1d5c68cc4d730c6b17e0b2b8a57b4686031bbecb3ab3c2"; - name = "umbrello-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/umbrello-19.04.3.tar.xz"; + sha256 = "a507f31087c0103873e78004bc47b632d8cd7cdda2734e342a19da48d0c3780c"; + name = "umbrello-19.04.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.04.1"; + version = "19.04.3"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/zeroconf-ioslave-19.04.1.tar.xz"; - sha256 = "e59c8a4b6ff93ead29b322fb40c94a3584d5c463077d58575720fcba2c511d87"; - name = "zeroconf-ioslave-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.04.3/src/zeroconf-ioslave-19.04.3.tar.xz"; + sha256 = "83c6fa651c6601c9b5e4f085e34fa0de5e88dda2420f95e88996ffad11303d7f"; + name = "zeroconf-ioslave-19.04.3.tar.xz"; }; }; } -- GitLab From 6832e843fa522f471da01f14e4b33909ab294d8e Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 29 Jul 2019 14:06:46 +0200 Subject: [PATCH 31/92] plasma-5: 5.15.5 -> 5.16.3 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 034b57ec06a..2ec9fb2bfdf 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.3/ ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index ac0a3494c22..e17d474e3ab 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz"; - sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f"; - name = "bluedevil-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/bluedevil-5.16.3.tar.xz"; + sha256 = "f22234c0561e143c03114943ccfaec962195b3aef55ffbc8a5ba2b8f722cd4bd"; + name = "bluedevil-5.16.3.tar.xz"; }; }; breeze = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz"; - sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4"; - name = "breeze-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/breeze-5.16.3.tar.xz"; + sha256 = "f11b5d0118c7530d244b3455219d86fc40888cb7e7f6a74684464a1d1b7db2e5"; + name = "breeze-5.16.3.tar.xz"; }; }; breeze-grub = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz"; - sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64"; - name = "breeze-grub-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/breeze-grub-5.16.3.tar.xz"; + sha256 = "6a25f456121c17a2f3275220d1fe0af8438484918b2d1678ddd39ed020b99176"; + name = "breeze-grub-5.16.3.tar.xz"; }; }; breeze-gtk = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz"; - sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8"; - name = "breeze-gtk-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/breeze-gtk-5.16.3.tar.xz"; + sha256 = "52cbe5c7757fb395e3e7e35c12918017a80d64d9f13c32ce6cdfacd440ecaa64"; + name = "breeze-gtk-5.16.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz"; - sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8"; - name = "breeze-plymouth-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/breeze-plymouth-5.16.3.tar.xz"; + sha256 = "4fc6ca444449d42874009af1f79ba408c6a37d2c08722c05a97b9a268a447ce6"; + name = "breeze-plymouth-5.16.3.tar.xz"; }; }; discover = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz"; - sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854"; - name = "discover-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/discover-5.16.3.tar.xz"; + sha256 = "1cbceecf8c7489a33a62b6efc5b1acf338f35e53db5d12fc2476e0374a0033cd"; + name = "discover-5.16.3.tar.xz"; }; }; drkonqi = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz"; - sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e"; - name = "drkonqi-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/drkonqi-5.16.3.tar.xz"; + sha256 = "118afd1d85fd78e34faac0bd6aa548edb501f16d733ea9f0a28630c817496fda"; + name = "drkonqi-5.16.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz"; - sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db"; - name = "kactivitymanagerd-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kactivitymanagerd-5.16.3.tar.xz"; + sha256 = "6a8cb887c4ca74d209e38db40ce04b2e0fe1d9e9a625c8490945184dfa41dfc5"; + name = "kactivitymanagerd-5.16.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz"; - sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace"; - name = "kde-cli-tools-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kde-cli-tools-5.16.3.tar.xz"; + sha256 = "ee68a8f958e1ce503252689d66eeb9897bad6b7e44f760c654d49225b3d55cd7"; + name = "kde-cli-tools-5.16.3.tar.xz"; }; }; kdecoration = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz"; - sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f"; - name = "kdecoration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kdecoration-5.16.3.tar.xz"; + sha256 = "31b49d600280d6b2c23d37edc219976d87e38e1c7fd62b5dc9dbc36d365bb5ad"; + name = "kdecoration-5.16.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz"; - sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185"; - name = "kde-gtk-config-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kde-gtk-config-5.16.3.tar.xz"; + sha256 = "0477b3763e85acd2780306e0fd3fe309ee86805a512d0d3b150cab24c5153fd6"; + name = "kde-gtk-config-5.16.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz"; - sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3"; - name = "kdeplasma-addons-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kdeplasma-addons-5.16.3.tar.xz"; + sha256 = "83c6bb1c9a5928de4febc3d9ad4e6be0beb24857efcccb98e967629c28d29831"; + name = "kdeplasma-addons-5.16.3.tar.xz"; }; }; kgamma5 = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz"; - sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7"; - name = "kgamma5-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kgamma5-5.16.3.tar.xz"; + sha256 = "7b609d418e670bdc75d6c2894255088aab6a7a2005afe3ec99348a49d67eb61d"; + name = "kgamma5-5.16.3.tar.xz"; }; }; khotkeys = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz"; - sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127"; - name = "khotkeys-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/khotkeys-5.16.3.tar.xz"; + sha256 = "caa65d8b3b6567dac483acf27f62e9baefc31416aa5f991409b0304920211f4e"; + name = "khotkeys-5.16.3.tar.xz"; }; }; kinfocenter = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz"; - sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8"; - name = "kinfocenter-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kinfocenter-5.16.3.tar.xz"; + sha256 = "b123278ef644fd4c3a5af1fb29f3ab859d4dfb2717e0e5783d58927a69ad7f88"; + name = "kinfocenter-5.16.3.tar.xz"; }; }; kmenuedit = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz"; - sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26"; - name = "kmenuedit-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kmenuedit-5.16.3.tar.xz"; + sha256 = "2ccc8e7feea7b4d3616a7528cf65a62c5299388583afb295d0aa2379945035cd"; + name = "kmenuedit-5.16.3.tar.xz"; }; }; kscreen = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz"; - sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7"; - name = "kscreen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kscreen-5.16.3.tar.xz"; + sha256 = "3c95f590ddc3483e2828585263feb2caa3e32c59f1b92f6aca23309565d4e139"; + name = "kscreen-5.16.3.tar.xz"; }; }; kscreenlocker = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz"; - sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd"; - name = "kscreenlocker-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kscreenlocker-5.16.3.tar.xz"; + sha256 = "41f9a85f0e6a8ae9747b9022961361b44b21b0df0b5e2c1705694b88f371d377"; + name = "kscreenlocker-5.16.3.tar.xz"; }; }; ksshaskpass = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz"; - sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e"; - name = "ksshaskpass-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/ksshaskpass-5.16.3.tar.xz"; + sha256 = "fbf9b535259aebd8e292d9e4db8ae5d8a2fe85658f8e95ab3b88e79f8093ea91"; + name = "ksshaskpass-5.16.3.tar.xz"; }; }; ksysguard = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz"; - sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a"; - name = "ksysguard-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/ksysguard-5.16.3.tar.xz"; + sha256 = "f3bbc8b89bf117deab27e1e29d59f19ea1834be11d606f0be25c4a080c9766a3"; + name = "ksysguard-5.16.3.tar.xz"; }; }; kwallet-pam = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz"; - sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e"; - name = "kwallet-pam-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kwallet-pam-5.16.3.tar.xz"; + sha256 = "e5f2a2e9650008b7d6383a9c71b70d4ec092dc48e8c1409a4570531c56f8985c"; + name = "kwallet-pam-5.16.3.tar.xz"; }; }; kwayland-integration = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz"; - sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17"; - name = "kwayland-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kwayland-integration-5.16.3.tar.xz"; + sha256 = "b0e844375a7c43579311899ffb2fed2b048279b4a59de91be687c99257449670"; + name = "kwayland-integration-5.16.3.tar.xz"; }; }; kwin = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz"; - sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805"; - name = "kwin-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kwin-5.16.3.tar.xz"; + sha256 = "766ae9cec1535ab7a715c20d8ef1b409063be55bb8d8d8f593de9551ee12b01a"; + name = "kwin-5.16.3.tar.xz"; }; }; kwrited = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz"; - sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510"; - name = "kwrited-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/kwrited-5.16.3.tar.xz"; + sha256 = "9c86575d080219a00ad9fa99b7d12acc06b2cd807bd256fc9f4d96cc8d7ab37e"; + name = "kwrited-5.16.3.tar.xz"; }; }; libkscreen = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz"; - sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87"; - name = "libkscreen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/libkscreen-5.16.3.tar.xz"; + sha256 = "09f7dcef33dd23b7987444c25edbc1b5b91f99396c65bdafa1823d77c94b3422"; + name = "libkscreen-5.16.3.tar.xz"; }; }; libksysguard = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz"; - sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0"; - name = "libksysguard-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/libksysguard-5.16.3.tar.xz"; + sha256 = "a668348bf1bb65f991d0862fe55c182d852b02ae37ec2ddc88a70fd1477fcf6c"; + name = "libksysguard-5.16.3.tar.xz"; }; }; milou = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz"; - sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9"; - name = "milou-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/milou-5.16.3.tar.xz"; + sha256 = "9a06e35d1bf613010301979d7ab5fbdb828943a432bc6a76c6b26ad20e5a199a"; + name = "milou-5.16.3.tar.xz"; }; }; oxygen = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz"; - sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c"; - name = "oxygen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/oxygen-5.16.3.tar.xz"; + sha256 = "552b008ec09d08c4704aa3ea66b2d73cf98dc35be290792d34d7962c59f51544"; + name = "oxygen-5.16.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz"; - sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b"; - name = "plasma-browser-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-browser-integration-5.16.3.tar.xz"; + sha256 = "dd3ea46d3339cbd4332c3bff2eda10fea819e316c74a8dd76f43ecb9510681d7"; + name = "plasma-browser-integration-5.16.3.tar.xz"; }; }; plasma-desktop = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz"; - sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741"; - name = "plasma-desktop-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-desktop-5.16.3.tar.xz"; + sha256 = "2c49ce479dacd227324f5cbcb04a0f9903a79740f044eed593c0bf990d124486"; + name = "plasma-desktop-5.16.3.tar.xz"; }; }; plasma-integration = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz"; - sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621"; - name = "plasma-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-integration-5.16.3.tar.xz"; + sha256 = "75d90d09cd32a4a351a43de8d84cce46920acc93519a8d8472ae357e7771c69e"; + name = "plasma-integration-5.16.3.tar.xz"; }; }; plasma-nm = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz"; - sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee"; - name = "plasma-nm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-nm-5.16.3.tar.xz"; + sha256 = "241ba7ee6a902f30748aaa520c556d8624381a36a04c881fc520fd4ff8db2bdb"; + name = "plasma-nm-5.16.3.tar.xz"; }; }; plasma-pa = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz"; - sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92"; - name = "plasma-pa-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-pa-5.16.3.tar.xz"; + sha256 = "e149732abd31b6958d845bb2326f65e344d6440e995d2448c997ddd707a466d6"; + name = "plasma-pa-5.16.3.tar.xz"; }; }; plasma-sdk = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz"; - sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329"; - name = "plasma-sdk-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-sdk-5.16.3.tar.xz"; + sha256 = "53a5d03d83ae974032fc32414003038a1b068766eba01e831ecdb1fd91df5b15"; + name = "plasma-sdk-5.16.3.tar.xz"; }; }; plasma-tests = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz"; - sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827"; - name = "plasma-tests-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-tests-5.16.3.tar.xz"; + sha256 = "8effcd48b7c6393d649f06fc4b33854d9449435a653afb8baa228491a6db25ad"; + name = "plasma-tests-5.16.3.tar.xz"; }; }; plasma-vault = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz"; - sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5"; - name = "plasma-vault-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-vault-5.16.3.tar.xz"; + sha256 = "3e071eba3be70ace60010443b1c91ac9da0d86befa6184923867583231698fc0"; + name = "plasma-vault-5.16.3.tar.xz"; }; }; plasma-workspace = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz"; - sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973"; - name = "plasma-workspace-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-5.16.3.tar.xz"; + sha256 = "ef1dcaff9cea12e764d743b1d0c24a7f0602a0ccaa4b62036b3885429724bd06"; + name = "plasma-workspace-5.16.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz"; - sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945"; - name = "plasma-workspace-wallpapers-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-wallpapers-5.16.3.tar.xz"; + sha256 = "27d7aaf26cf37810d022f9a0f26fea4e517c2380a5f82ef6c1238c7cd7fb5bb7"; + name = "plasma-workspace-wallpapers-5.16.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz"; - sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa"; - name = "plymouth-kcm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/plymouth-kcm-5.16.3.tar.xz"; + sha256 = "3301679e79e9a36c0aa785434e90c3136e4ff9b186532baf98b04f7a1febfd92"; + name = "plymouth-kcm-5.16.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.5"; + version = "1-5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz"; - sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267"; - name = "polkit-kde-agent-1-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/polkit-kde-agent-1-5.16.3.tar.xz"; + sha256 = "571ea645d1c1ca0f3f00406ca5029663a12de7823db7fed86dc9e367c0f4d16a"; + name = "polkit-kde-agent-1-5.16.3.tar.xz"; }; }; powerdevil = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz"; - sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06"; - name = "powerdevil-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/powerdevil-5.16.3.tar.xz"; + sha256 = "75fd2fbf714f3b01a2233be5d2170e175994e38fd4daa47092f588697293a9aa"; + name = "powerdevil-5.16.3.tar.xz"; }; }; sddm-kcm = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz"; - sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b"; - name = "sddm-kcm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/sddm-kcm-5.16.3.tar.xz"; + sha256 = "0fad91b5a7901a42df03113a2277d317ceddf048934f4aa83cd2d735bb9738a3"; + name = "sddm-kcm-5.16.3.tar.xz"; }; }; systemsettings = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz"; - sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a"; - name = "systemsettings-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/systemsettings-5.16.3.tar.xz"; + sha256 = "55a861bb75ea3e50543001bac9505fd5de2733f9b0c234d8b8e3bd7c879ee21e"; + name = "systemsettings-5.16.3.tar.xz"; }; }; user-manager = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz"; - sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431"; - name = "user-manager-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/user-manager-5.16.3.tar.xz"; + sha256 = "9d71980a976e5f37ac9e324d83e9c4de533cd4e77add66f9fdee7c5a0ec9ec0c"; + name = "user-manager-5.16.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.5"; + version = "5.16.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz"; - sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50"; - name = "xdg-desktop-portal-kde-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.3/xdg-desktop-portal-kde-5.16.3.tar.xz"; + sha256 = "919e526a9e4a68c50b0dc4972713196076eecfff90445833d8f5665b0f88f1a0"; + name = "xdg-desktop-portal-kde-5.16.3.tar.xz"; }; }; } -- GitLab From 357ae3c88403770f734cdeb92d0cee2050962463 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 29 Jul 2019 14:08:13 +0200 Subject: [PATCH 32/92] kwallet-pam: add new kwallet dependency --- pkgs/desktops/plasma-5/kwallet-pam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 1cbfb87ea56..b4fd032cf1f 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }: +{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }: mkDerivation { name = "kwallet-pam"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ pam socat libgcrypt qtbase ]; + buildInputs = [ pam socat libgcrypt qtbase kwallet ]; postPatch = '' sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; -- GitLab From ea1131fc39bf314b8615f448fe9bec94f739bc7c Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 29 Jul 2019 16:22:49 +0200 Subject: [PATCH 33/92] kwin: fix xwayland patch The Xwayland code path was moved from ApplicationWayland to a dedicated class https://phabricator.kde.org/D15020 --- pkgs/desktops/plasma-5/kwin/xwayland.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch index 51f15c87d27..9d405b3bbb8 100644 --- a/pkgs/desktops/plasma-5/kwin/xwayland.patch +++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch @@ -1,13 +1,13 @@ -Index: kwin-5.7.3/main_wayland.cpp +Index: kwin-5.15.5/xwl/xwayland.cpp =================================================================== ---- kwin-5.7.3.orig/main_wayland.cpp -+++ kwin-5.7.3/main_wayland.cpp -@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe +--- kwin-5.15.5.orig/xwl/xwayland.cpp ++++ kwin-5.15.5/xwl/xwayland.cpp +@@ -143,7 +143,7 @@ void Xwayland::init() - m_xwaylandProcess = new Process(kwinApp()); + m_xwaylandProcess = new Process(this); m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); - m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); + m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND)); - QProcessEnvironment env = m_environment; + QProcessEnvironment env = m_app->processStartupEnvironment(); env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); - m_xwaylandProcess->setProcessEnvironment(env); + env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM")); -- GitLab From a1d21260c33602a2970ea4191668c18fd77d4d3b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 29 Jul 2019 17:21:35 +0200 Subject: [PATCH 34/92] plasma-workspace: fix patch with new wallpaper path --- .../plasma-5/plasma-workspace/plasma-workspace.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 55a4518021e..5c27eee5010 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -2,12 +2,13 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake index 69d3070..52e9102 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ [General] type=image color=#1d99f3 --background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png -+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png + fontSize=10 +-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt index 6a1a212..f03fd34 100644 --- a/startkde/CMakeLists.txt -- GitLab From ef90b86924dcc304fb51ceb1154c4d39c3eb8c40 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 30 Jul 2019 23:01:54 +0200 Subject: [PATCH 35/92] gwenview: remove obsolete patch --- pkgs/applications/kde/gwenview.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index ceb928acdf2..3d03d1dea3e 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, exiv2, lcms2, baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch + phonon, qtimageformats, qtsvg, qtx11extras, kinit }: mkDerivation { @@ -18,12 +18,4 @@ mkDerivation { qtimageformats qtsvg qtx11extras ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; - - # Fixes build with exiv2-0.27.1. Drop in 19.04.2 - patches = [ - (fetchpatch { - url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch"; - sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq"; - }) - ]; } -- GitLab From 1cfe46034bc8d11483a9e8d15dd475f00acf0e3f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 31 Jul 2019 12:49:01 +0200 Subject: [PATCH 36/92] plasma-5: 5.16.3 -> 5.16.4 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 2ec9fb2bfdf..4efd493a3dd 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.3/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.4/ ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index e17d474e3ab..21dd5c36d78 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/bluedevil-5.16.3.tar.xz"; - sha256 = "f22234c0561e143c03114943ccfaec962195b3aef55ffbc8a5ba2b8f722cd4bd"; - name = "bluedevil-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz"; + sha256 = "36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521"; + name = "bluedevil-5.16.4.tar.xz"; }; }; breeze = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/breeze-5.16.3.tar.xz"; - sha256 = "f11b5d0118c7530d244b3455219d86fc40888cb7e7f6a74684464a1d1b7db2e5"; - name = "breeze-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-5.16.4.tar.xz"; + sha256 = "84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395"; + name = "breeze-5.16.4.tar.xz"; }; }; breeze-grub = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/breeze-grub-5.16.3.tar.xz"; - sha256 = "6a25f456121c17a2f3275220d1fe0af8438484918b2d1678ddd39ed020b99176"; - name = "breeze-grub-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz"; + sha256 = "c36b2183fff7d559ae944881443e0caa03c63bcc81af9f6b21b722109d2e34db"; + name = "breeze-grub-5.16.4.tar.xz"; }; }; breeze-gtk = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/breeze-gtk-5.16.3.tar.xz"; - sha256 = "52cbe5c7757fb395e3e7e35c12918017a80d64d9f13c32ce6cdfacd440ecaa64"; - name = "breeze-gtk-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz"; + sha256 = "8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb"; + name = "breeze-gtk-5.16.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/breeze-plymouth-5.16.3.tar.xz"; - sha256 = "4fc6ca444449d42874009af1f79ba408c6a37d2c08722c05a97b9a268a447ce6"; - name = "breeze-plymouth-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz"; + sha256 = "7556c8f6bff771f3439036f843309b45594c5e903fc11a3275cc2c38346dec9f"; + name = "breeze-plymouth-5.16.4.tar.xz"; }; }; discover = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/discover-5.16.3.tar.xz"; - sha256 = "1cbceecf8c7489a33a62b6efc5b1acf338f35e53db5d12fc2476e0374a0033cd"; - name = "discover-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/discover-5.16.4.tar.xz"; + sha256 = "0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0"; + name = "discover-5.16.4.tar.xz"; }; }; drkonqi = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/drkonqi-5.16.3.tar.xz"; - sha256 = "118afd1d85fd78e34faac0bd6aa548edb501f16d733ea9f0a28630c817496fda"; - name = "drkonqi-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz"; + sha256 = "9d030a59a6d1d732241f8c54a54291ac60584d542ea0b891ca4b2bcb958bd51f"; + name = "drkonqi-5.16.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kactivitymanagerd-5.16.3.tar.xz"; - sha256 = "6a8cb887c4ca74d209e38db40ce04b2e0fe1d9e9a625c8490945184dfa41dfc5"; - name = "kactivitymanagerd-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz"; + sha256 = "a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770"; + name = "kactivitymanagerd-5.16.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kde-cli-tools-5.16.3.tar.xz"; - sha256 = "ee68a8f958e1ce503252689d66eeb9897bad6b7e44f760c654d49225b3d55cd7"; - name = "kde-cli-tools-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz"; + sha256 = "56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d"; + name = "kde-cli-tools-5.16.4.tar.xz"; }; }; kdecoration = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kdecoration-5.16.3.tar.xz"; - sha256 = "31b49d600280d6b2c23d37edc219976d87e38e1c7fd62b5dc9dbc36d365bb5ad"; - name = "kdecoration-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz"; + sha256 = "aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4"; + name = "kdecoration-5.16.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kde-gtk-config-5.16.3.tar.xz"; - sha256 = "0477b3763e85acd2780306e0fd3fe309ee86805a512d0d3b150cab24c5153fd6"; - name = "kde-gtk-config-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz"; + sha256 = "c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c"; + name = "kde-gtk-config-5.16.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kdeplasma-addons-5.16.3.tar.xz"; - sha256 = "83c6bb1c9a5928de4febc3d9ad4e6be0beb24857efcccb98e967629c28d29831"; - name = "kdeplasma-addons-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz"; + sha256 = "4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1"; + name = "kdeplasma-addons-5.16.4.tar.xz"; }; }; kgamma5 = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kgamma5-5.16.3.tar.xz"; - sha256 = "7b609d418e670bdc75d6c2894255088aab6a7a2005afe3ec99348a49d67eb61d"; - name = "kgamma5-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz"; + sha256 = "18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46"; + name = "kgamma5-5.16.4.tar.xz"; }; }; khotkeys = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/khotkeys-5.16.3.tar.xz"; - sha256 = "caa65d8b3b6567dac483acf27f62e9baefc31416aa5f991409b0304920211f4e"; - name = "khotkeys-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz"; + sha256 = "a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d"; + name = "khotkeys-5.16.4.tar.xz"; }; }; kinfocenter = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kinfocenter-5.16.3.tar.xz"; - sha256 = "b123278ef644fd4c3a5af1fb29f3ab859d4dfb2717e0e5783d58927a69ad7f88"; - name = "kinfocenter-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz"; + sha256 = "30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426"; + name = "kinfocenter-5.16.4.tar.xz"; }; }; kmenuedit = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kmenuedit-5.16.3.tar.xz"; - sha256 = "2ccc8e7feea7b4d3616a7528cf65a62c5299388583afb295d0aa2379945035cd"; - name = "kmenuedit-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz"; + sha256 = "f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2"; + name = "kmenuedit-5.16.4.tar.xz"; }; }; kscreen = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kscreen-5.16.3.tar.xz"; - sha256 = "3c95f590ddc3483e2828585263feb2caa3e32c59f1b92f6aca23309565d4e139"; - name = "kscreen-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz"; + sha256 = "40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328"; + name = "kscreen-5.16.4.tar.xz"; }; }; kscreenlocker = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kscreenlocker-5.16.3.tar.xz"; - sha256 = "41f9a85f0e6a8ae9747b9022961361b44b21b0df0b5e2c1705694b88f371d377"; - name = "kscreenlocker-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz"; + sha256 = "92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f"; + name = "kscreenlocker-5.16.4.tar.xz"; }; }; ksshaskpass = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/ksshaskpass-5.16.3.tar.xz"; - sha256 = "fbf9b535259aebd8e292d9e4db8ae5d8a2fe85658f8e95ab3b88e79f8093ea91"; - name = "ksshaskpass-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz"; + sha256 = "e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c"; + name = "ksshaskpass-5.16.4.tar.xz"; }; }; ksysguard = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/ksysguard-5.16.3.tar.xz"; - sha256 = "f3bbc8b89bf117deab27e1e29d59f19ea1834be11d606f0be25c4a080c9766a3"; - name = "ksysguard-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz"; + sha256 = "10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5"; + name = "ksysguard-5.16.4.tar.xz"; }; }; kwallet-pam = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kwallet-pam-5.16.3.tar.xz"; - sha256 = "e5f2a2e9650008b7d6383a9c71b70d4ec092dc48e8c1409a4570531c56f8985c"; - name = "kwallet-pam-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz"; + sha256 = "7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429"; + name = "kwallet-pam-5.16.4.tar.xz"; }; }; kwayland-integration = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kwayland-integration-5.16.3.tar.xz"; - sha256 = "b0e844375a7c43579311899ffb2fed2b048279b4a59de91be687c99257449670"; - name = "kwayland-integration-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz"; + sha256 = "f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace"; + name = "kwayland-integration-5.16.4.tar.xz"; }; }; kwin = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kwin-5.16.3.tar.xz"; - sha256 = "766ae9cec1535ab7a715c20d8ef1b409063be55bb8d8d8f593de9551ee12b01a"; - name = "kwin-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwin-5.16.4.tar.xz"; + sha256 = "71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6"; + name = "kwin-5.16.4.tar.xz"; }; }; kwrited = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/kwrited-5.16.3.tar.xz"; - sha256 = "9c86575d080219a00ad9fa99b7d12acc06b2cd807bd256fc9f4d96cc8d7ab37e"; - name = "kwrited-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz"; + sha256 = "c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f"; + name = "kwrited-5.16.4.tar.xz"; }; }; libkscreen = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/libkscreen-5.16.3.tar.xz"; - sha256 = "09f7dcef33dd23b7987444c25edbc1b5b91f99396c65bdafa1823d77c94b3422"; - name = "libkscreen-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz"; + sha256 = "f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723"; + name = "libkscreen-5.16.4.tar.xz"; }; }; libksysguard = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/libksysguard-5.16.3.tar.xz"; - sha256 = "a668348bf1bb65f991d0862fe55c182d852b02ae37ec2ddc88a70fd1477fcf6c"; - name = "libksysguard-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz"; + sha256 = "b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f"; + name = "libksysguard-5.16.4.tar.xz"; }; }; milou = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/milou-5.16.3.tar.xz"; - sha256 = "9a06e35d1bf613010301979d7ab5fbdb828943a432bc6a76c6b26ad20e5a199a"; - name = "milou-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/milou-5.16.4.tar.xz"; + sha256 = "de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89"; + name = "milou-5.16.4.tar.xz"; }; }; oxygen = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/oxygen-5.16.3.tar.xz"; - sha256 = "552b008ec09d08c4704aa3ea66b2d73cf98dc35be290792d34d7962c59f51544"; - name = "oxygen-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz"; + sha256 = "7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1"; + name = "oxygen-5.16.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-browser-integration-5.16.3.tar.xz"; - sha256 = "dd3ea46d3339cbd4332c3bff2eda10fea819e316c74a8dd76f43ecb9510681d7"; - name = "plasma-browser-integration-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz"; + sha256 = "a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef"; + name = "plasma-browser-integration-5.16.4.tar.xz"; }; }; plasma-desktop = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-desktop-5.16.3.tar.xz"; - sha256 = "2c49ce479dacd227324f5cbcb04a0f9903a79740f044eed593c0bf990d124486"; - name = "plasma-desktop-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz"; + sha256 = "990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344"; + name = "plasma-desktop-5.16.4.tar.xz"; }; }; plasma-integration = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-integration-5.16.3.tar.xz"; - sha256 = "75d90d09cd32a4a351a43de8d84cce46920acc93519a8d8472ae357e7771c69e"; - name = "plasma-integration-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz"; + sha256 = "d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d"; + name = "plasma-integration-5.16.4.tar.xz"; }; }; plasma-nm = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-nm-5.16.3.tar.xz"; - sha256 = "241ba7ee6a902f30748aaa520c556d8624381a36a04c881fc520fd4ff8db2bdb"; - name = "plasma-nm-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz"; + sha256 = "2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09"; + name = "plasma-nm-5.16.4.tar.xz"; }; }; plasma-pa = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-pa-5.16.3.tar.xz"; - sha256 = "e149732abd31b6958d845bb2326f65e344d6440e995d2448c997ddd707a466d6"; - name = "plasma-pa-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz"; + sha256 = "9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4"; + name = "plasma-pa-5.16.4.tar.xz"; }; }; plasma-sdk = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-sdk-5.16.3.tar.xz"; - sha256 = "53a5d03d83ae974032fc32414003038a1b068766eba01e831ecdb1fd91df5b15"; - name = "plasma-sdk-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz"; + sha256 = "ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403"; + name = "plasma-sdk-5.16.4.tar.xz"; }; }; plasma-tests = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-tests-5.16.3.tar.xz"; - sha256 = "8effcd48b7c6393d649f06fc4b33854d9449435a653afb8baa228491a6db25ad"; - name = "plasma-tests-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-tests-5.16.4.tar.xz"; + sha256 = "9e0f8fcef080fc1b0ffae01f6b3caa17eccac27445e312243221fcace56d1097"; + name = "plasma-tests-5.16.4.tar.xz"; }; }; plasma-vault = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-vault-5.16.3.tar.xz"; - sha256 = "3e071eba3be70ace60010443b1c91ac9da0d86befa6184923867583231698fc0"; - name = "plasma-vault-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz"; + sha256 = "8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6"; + name = "plasma-vault-5.16.4.tar.xz"; }; }; plasma-workspace = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-5.16.3.tar.xz"; - sha256 = "ef1dcaff9cea12e764d743b1d0c24a7f0602a0ccaa4b62036b3885429724bd06"; - name = "plasma-workspace-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz"; + sha256 = "5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1"; + name = "plasma-workspace-5.16.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plasma-workspace-wallpapers-5.16.3.tar.xz"; - sha256 = "27d7aaf26cf37810d022f9a0f26fea4e517c2380a5f82ef6c1238c7cd7fb5bb7"; - name = "plasma-workspace-wallpapers-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz"; + sha256 = "052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003"; + name = "plasma-workspace-wallpapers-5.16.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/plymouth-kcm-5.16.3.tar.xz"; - sha256 = "3301679e79e9a36c0aa785434e90c3136e4ff9b186532baf98b04f7a1febfd92"; - name = "plymouth-kcm-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz"; + sha256 = "cf9d3e6f14d012617cc8a5c3381295449e68b1b13209436b561417232d21863f"; + name = "plymouth-kcm-5.16.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.16.3"; + version = "1-5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/polkit-kde-agent-1-5.16.3.tar.xz"; - sha256 = "571ea645d1c1ca0f3f00406ca5029663a12de7823db7fed86dc9e367c0f4d16a"; - name = "polkit-kde-agent-1-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz"; + sha256 = "917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0"; + name = "polkit-kde-agent-1-5.16.4.tar.xz"; }; }; powerdevil = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/powerdevil-5.16.3.tar.xz"; - sha256 = "75fd2fbf714f3b01a2233be5d2170e175994e38fd4daa47092f588697293a9aa"; - name = "powerdevil-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz"; + sha256 = "40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed"; + name = "powerdevil-5.16.4.tar.xz"; }; }; sddm-kcm = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/sddm-kcm-5.16.3.tar.xz"; - sha256 = "0fad91b5a7901a42df03113a2277d317ceddf048934f4aa83cd2d735bb9738a3"; - name = "sddm-kcm-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz"; + sha256 = "340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68"; + name = "sddm-kcm-5.16.4.tar.xz"; }; }; systemsettings = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/systemsettings-5.16.3.tar.xz"; - sha256 = "55a861bb75ea3e50543001bac9505fd5de2733f9b0c234d8b8e3bd7c879ee21e"; - name = "systemsettings-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz"; + sha256 = "73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e"; + name = "systemsettings-5.16.4.tar.xz"; }; }; user-manager = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/user-manager-5.16.3.tar.xz"; - sha256 = "9d71980a976e5f37ac9e324d83e9c4de533cd4e77add66f9fdee7c5a0ec9ec0c"; - name = "user-manager-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz"; + sha256 = "3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745"; + name = "user-manager-5.16.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.16.3/xdg-desktop-portal-kde-5.16.3.tar.xz"; - sha256 = "919e526a9e4a68c50b0dc4972713196076eecfff90445833d8f5665b0f88f1a0"; - name = "xdg-desktop-portal-kde-5.16.3.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz"; + sha256 = "3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052"; + name = "xdg-desktop-portal-kde-5.16.4.tar.xz"; }; }; } -- GitLab From 5ce0480a8cf9c41139f9cd656385de9bbf9b33f4 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 31 Jul 2019 20:06:43 +0200 Subject: [PATCH 37/92] sddm: add missing dependency for breeze theme --- pkgs/applications/display-managers/sddm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index b5d32493003..63f241d9d1c 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs -, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd +, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd }: let @@ -29,7 +29,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ - libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd + libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd ]; cmakeFlags = [ -- GitLab From 444ddcbcc52c05edec5ac8d8176db3504ca3a890 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 11 Aug 2019 19:42:49 +0200 Subject: [PATCH 38/92] kdeFrameworks: 5.60 -> 5.61 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 632 +++++++++--------- 2 files changed, 317 insertions(+), 317 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 1b23a9da6e7..096376ca671 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.60/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.61/ ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 63819cda658..549f99a5588 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/attica-5.60.0.tar.xz"; - sha256 = "6658a886950ab87d779991b4c39beeff250f5aff64c71ee98b5c472a219ac6de"; - name = "attica-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/attica-5.61.0.tar.xz"; + sha256 = "9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde"; + name = "attica-5.61.0.tar.xz"; }; }; baloo = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/baloo-5.60.0.tar.xz"; - sha256 = "d96a19ff94caf3e3b10e8d5f165e276829a42a1c70fb8451d70cb3764f06671e"; - name = "baloo-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/baloo-5.61.0.tar.xz"; + sha256 = "dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1"; + name = "baloo-5.61.0.tar.xz"; }; }; bluez-qt = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/bluez-qt-5.60.0.tar.xz"; - sha256 = "328aba853ec0c034e777261d9e3ac3202ad941ffde844392e196afaed04be0d4"; - name = "bluez-qt-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/bluez-qt-5.61.0.tar.xz"; + sha256 = "0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27"; + name = "bluez-qt-5.61.0.tar.xz"; }; }; breeze-icons = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz"; - sha256 = "99d0cbda6a38766079166633a06493929222c6443e8718c1a2db4aeb5b5f20b7"; - name = "breeze-icons-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/breeze-icons-5.61.0.tar.xz"; + sha256 = "1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30"; + name = "breeze-icons-5.61.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/extra-cmake-modules-5.60.0.tar.xz"; - sha256 = "2bd9da815de98d5908d3371815df963d305c828f90ba1a076f38543876690248"; - name = "extra-cmake-modules-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/extra-cmake-modules-5.61.0.tar.xz"; + sha256 = "a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c"; + name = "extra-cmake-modules-5.61.0.tar.xz"; }; }; frameworkintegration = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/frameworkintegration-5.60.0.tar.xz"; - sha256 = "c82600be42b1db398acf4059bde92b3449bb6e52fd0180e66b41060e185e4872"; - name = "frameworkintegration-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/frameworkintegration-5.61.0.tar.xz"; + sha256 = "a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb"; + name = "frameworkintegration-5.61.0.tar.xz"; }; }; kactivities = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kactivities-5.60.0.tar.xz"; - sha256 = "7703b894c25a576a87c201d41899e793c3c2f89eaa57c1ab71266ae950091883"; - name = "kactivities-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kactivities-5.61.0.tar.xz"; + sha256 = "0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5"; + name = "kactivities-5.61.0.tar.xz"; }; }; kactivities-stats = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kactivities-stats-5.60.0.tar.xz"; - sha256 = "f7374d1d2fe94bae935796193a62e46ee1963a39e11b183cc0a40baedb973788"; - name = "kactivities-stats-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kactivities-stats-5.61.0.tar.xz"; + sha256 = "9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068"; + name = "kactivities-stats-5.61.0.tar.xz"; }; }; kapidox = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kapidox-5.60.0.tar.xz"; - sha256 = "88cb8b8637e1c6e93d908d3384253d8d99efaa28ef7ba9c7a3089544e1f114dc"; - name = "kapidox-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kapidox-5.61.0.tar.xz"; + sha256 = "3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f"; + name = "kapidox-5.61.0.tar.xz"; }; }; karchive = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/karchive-5.60.0.tar.xz"; - sha256 = "4e3d2a6ba551c6ada44a6517150e031df92691919119bc3b5eb4efc741ff7564"; - name = "karchive-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/karchive-5.61.0.tar.xz"; + sha256 = "457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387"; + name = "karchive-5.61.0.tar.xz"; }; }; kauth = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kauth-5.60.0.tar.xz"; - sha256 = "50a2a2eb90d7529bb6fc4ddd77e37ef5b25c612b18487cc63d8d086d5ec28916"; - name = "kauth-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kauth-5.61.0.tar.xz"; + sha256 = "b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1"; + name = "kauth-5.61.0.tar.xz"; }; }; kbookmarks = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kbookmarks-5.60.0.tar.xz"; - sha256 = "a2b77f0b084211badce2eb90c19e00caf078ab59512c326ed1c90f4a58de0d9f"; - name = "kbookmarks-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kbookmarks-5.61.0.tar.xz"; + sha256 = "24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377"; + name = "kbookmarks-5.61.0.tar.xz"; }; }; kcmutils = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kcmutils-5.60.0.tar.xz"; - sha256 = "22226ca10caedc6021b966a26a45096f30837ca9eedcc97479e30f950abc7b8c"; - name = "kcmutils-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcmutils-5.61.0.tar.xz"; + sha256 = "b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7"; + name = "kcmutils-5.61.0.tar.xz"; }; }; kcodecs = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kcodecs-5.60.0.tar.xz"; - sha256 = "cf8d5e5d47cbee31ea45faa1ca4d6043d3f8d9cbff2e5d40ce749a0b2cec50df"; - name = "kcodecs-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcodecs-5.61.0.tar.xz"; + sha256 = "4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee"; + name = "kcodecs-5.61.0.tar.xz"; }; }; kcompletion = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kcompletion-5.60.0.tar.xz"; - sha256 = "d5afb075661dfe2da5e300bd73dee89f92736f39859be711f186310bed245f7c"; - name = "kcompletion-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcompletion-5.61.0.tar.xz"; + sha256 = "68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec"; + name = "kcompletion-5.61.0.tar.xz"; }; }; kconfig = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kconfig-5.60.0.tar.xz"; - sha256 = "541acceead9ca516e3562109e7e94351ce378c234bea968c8dfde78f00559233"; - name = "kconfig-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kconfig-5.61.0.tar.xz"; + sha256 = "94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372"; + name = "kconfig-5.61.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kconfigwidgets-5.60.0.tar.xz"; - sha256 = "74ad4cf5b2858955e7966bb27f7b7ec38c6ddc7c95aa10ba356ef5775afeede3"; - name = "kconfigwidgets-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kconfigwidgets-5.61.0.tar.xz"; + sha256 = "4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165"; + name = "kconfigwidgets-5.61.0.tar.xz"; }; }; kcoreaddons = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kcoreaddons-5.60.0.tar.xz"; - sha256 = "c78e41596e65fec08b1f7b212dd584cb61b5a9fe89c1bb312e06238fac3e137d"; - name = "kcoreaddons-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcoreaddons-5.61.0.tar.xz"; + sha256 = "6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813"; + name = "kcoreaddons-5.61.0.tar.xz"; }; }; kcrash = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kcrash-5.60.0.tar.xz"; - sha256 = "4f45a5ac0620a0fbf4b983ac3d3e68053a3a0f94bae86076f3bc3ec82ecac299"; - name = "kcrash-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcrash-5.61.0.tar.xz"; + sha256 = "83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8"; + name = "kcrash-5.61.0.tar.xz"; }; }; kdbusaddons = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kdbusaddons-5.60.0.tar.xz"; - sha256 = "996a9c41d6290e9520dfaa88a97a476f29b2992a135024ab0ad2bc707b0df881"; - name = "kdbusaddons-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdbusaddons-5.61.0.tar.xz"; + sha256 = "f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d"; + name = "kdbusaddons-5.61.0.tar.xz"; }; }; kdeclarative = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kdeclarative-5.60.0.tar.xz"; - sha256 = "bbfd1438752866352e4fc7cb69b616c7413eb0b765f73777aa52d5063e2eefb4"; - name = "kdeclarative-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdeclarative-5.61.0.tar.xz"; + sha256 = "464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa"; + name = "kdeclarative-5.61.0.tar.xz"; }; }; kded = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kded-5.60.0.tar.xz"; - sha256 = "cd472a852dcb3206b219a46660558ee24b09356d7342ce39b89ab54ea160c388"; - name = "kded-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kded-5.61.0.tar.xz"; + sha256 = "ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc"; + name = "kded-5.61.0.tar.xz"; }; }; kdelibs4support = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/portingAids/kdelibs4support-5.60.0.tar.xz"; - sha256 = "91b207b3d46c6bc5e97b9b89717db1ef7c4359c65bc4595794143ba78ce92a60"; - name = "kdelibs4support-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kdelibs4support-5.61.0.tar.xz"; + sha256 = "ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c"; + name = "kdelibs4support-5.61.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kdesignerplugin-5.60.0.tar.xz"; - sha256 = "9472332c5a8f7c27d6c581a4f0f4f837d82e2780c1f9b25f2f034afd1d250607"; - name = "kdesignerplugin-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdesignerplugin-5.61.0.tar.xz"; + sha256 = "6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33"; + name = "kdesignerplugin-5.61.0.tar.xz"; }; }; kdesu = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kdesu-5.60.0.tar.xz"; - sha256 = "3a040ae9825738d9b4953086d6c262009dcff877a4ed7e6925e3a34086007687"; - name = "kdesu-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdesu-5.61.0.tar.xz"; + sha256 = "398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888"; + name = "kdesu-5.61.0.tar.xz"; }; }; kdewebkit = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/portingAids/kdewebkit-5.60.0.tar.xz"; - sha256 = "bf16bf33dfdecc5e4e50bacc5ce142774c5c1522639d3d0042779734767f12fb"; - name = "kdewebkit-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kdewebkit-5.61.0.tar.xz"; + sha256 = "1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211"; + name = "kdewebkit-5.61.0.tar.xz"; }; }; kdnssd = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kdnssd-5.60.0.tar.xz"; - sha256 = "8313b1a418559032a110f07b8816afd676770e0897d72d1d8cc353349a281964"; - name = "kdnssd-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdnssd-5.61.0.tar.xz"; + sha256 = "02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d"; + name = "kdnssd-5.61.0.tar.xz"; }; }; kdoctools = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kdoctools-5.60.0.tar.xz"; - sha256 = "b231ea9857c5c1335fbf1a63907311a136651d93af4a4143e0b4caad833ae834"; - name = "kdoctools-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdoctools-5.61.0.tar.xz"; + sha256 = "e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f"; + name = "kdoctools-5.61.0.tar.xz"; }; }; kemoticons = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kemoticons-5.60.0.tar.xz"; - sha256 = "60e2f227ed7094a0d4d973f7968d4d70b7c9d176dadb45c540541a3d448a5125"; - name = "kemoticons-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kemoticons-5.61.0.tar.xz"; + sha256 = "cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380"; + name = "kemoticons-5.61.0.tar.xz"; }; }; kfilemetadata = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kfilemetadata-5.60.0.tar.xz"; - sha256 = "6d2ddfe0b16d73a139573dd02766825b21b958af16f51682c1f4cb816b3929f8"; - name = "kfilemetadata-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kfilemetadata-5.61.0.tar.xz"; + sha256 = "15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e"; + name = "kfilemetadata-5.61.0.tar.xz"; }; }; kglobalaccel = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kglobalaccel-5.60.0.tar.xz"; - sha256 = "660f2b930fd2ea4ad935f37d4e26253a7537ff30cf665ac57a41087dd4c2e805"; - name = "kglobalaccel-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kglobalaccel-5.61.0.tar.xz"; + sha256 = "ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e"; + name = "kglobalaccel-5.61.0.tar.xz"; }; }; kguiaddons = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kguiaddons-5.60.0.tar.xz"; - sha256 = "228dc1715a35979072381658ca244795e989ea941e703559de398fdea793c548"; - name = "kguiaddons-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kguiaddons-5.61.0.tar.xz"; + sha256 = "40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520"; + name = "kguiaddons-5.61.0.tar.xz"; }; }; kholidays = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kholidays-5.60.0.tar.xz"; - sha256 = "af1954758e946b62e387e2197f128e7ae53b6054717f35bcabc674bec19b2d14"; - name = "kholidays-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kholidays-5.61.0.tar.xz"; + sha256 = "ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1"; + name = "kholidays-5.61.0.tar.xz"; }; }; khtml = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/portingAids/khtml-5.60.0.tar.xz"; - sha256 = "c18a5fa51cbf9f9a0a0f104e2fc0581abdb99a5bd36f8426ef129ea848414037"; - name = "khtml-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/khtml-5.61.0.tar.xz"; + sha256 = "5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b"; + name = "khtml-5.61.0.tar.xz"; }; }; ki18n = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/ki18n-5.60.0.tar.xz"; - sha256 = "b94598e6cb40019c9db403cb392b647d798692899467883f2f9419e1de5782c3"; - name = "ki18n-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ki18n-5.61.0.tar.xz"; + sha256 = "d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9"; + name = "ki18n-5.61.0.tar.xz"; }; }; kiconthemes = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kiconthemes-5.60.0.tar.xz"; - sha256 = "054bfdb9129ae8610cad742198e2ad047f3960f810b8153dc28ead76687d9e79"; - name = "kiconthemes-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kiconthemes-5.61.0.tar.xz"; + sha256 = "341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7"; + name = "kiconthemes-5.61.0.tar.xz"; }; }; kidletime = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kidletime-5.60.0.tar.xz"; - sha256 = "e7c4ca5ca3e847c37add4c81b3d430f4c4bf0214433a234a32d766c9199adb27"; - name = "kidletime-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kidletime-5.61.0.tar.xz"; + sha256 = "8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2"; + name = "kidletime-5.61.0.tar.xz"; }; }; kimageformats = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kimageformats-5.60.0.tar.xz"; - sha256 = "4e2fd48a2c5b7ee3af0b82bce9aaa0847e840b881bbb307c049bb8c881302635"; - name = "kimageformats-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kimageformats-5.61.0.tar.xz"; + sha256 = "5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207"; + name = "kimageformats-5.61.0.tar.xz"; }; }; kinit = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kinit-5.60.0.tar.xz"; - sha256 = "c8c109e220e8eb812a09d3474439b0f6f6af4d25861322a9494fc206da51afdc"; - name = "kinit-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kinit-5.61.0.tar.xz"; + sha256 = "1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f"; + name = "kinit-5.61.0.tar.xz"; }; }; kio = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kio-5.60.0.tar.xz"; - sha256 = "be433fcf665679671a2e320556c39b708ed0789271e76ebb6142df058260238d"; - name = "kio-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kio-5.61.0.tar.xz"; + sha256 = "1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e"; + name = "kio-5.61.0.tar.xz"; }; }; kirigami2 = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kirigami2-5.60.0.tar.xz"; - sha256 = "f016481d393041513dda11345e9ee84723587fa4be9f17391ed1a5868477e153"; - name = "kirigami2-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kirigami2-5.61.0.tar.xz"; + sha256 = "afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30"; + name = "kirigami2-5.61.0.tar.xz"; }; }; kitemmodels = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kitemmodels-5.60.0.tar.xz"; - sha256 = "364799922efa153d5bd6c326a8c3311d7170356807be1e67eb4d5135ec62f5ff"; - name = "kitemmodels-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kitemmodels-5.61.0.tar.xz"; + sha256 = "47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68"; + name = "kitemmodels-5.61.0.tar.xz"; }; }; kitemviews = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kitemviews-5.60.0.tar.xz"; - sha256 = "e43c1479bd5a8c90ba8e396a34299e0a96143ad6cdfd1edef0be5839fb95437f"; - name = "kitemviews-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kitemviews-5.61.0.tar.xz"; + sha256 = "0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da"; + name = "kitemviews-5.61.0.tar.xz"; }; }; kjobwidgets = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kjobwidgets-5.60.0.tar.xz"; - sha256 = "b9d2a044a17eff6ced2cf6c4bd06661a0d64cbeea2b18248cdac4f969ea69353"; - name = "kjobwidgets-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kjobwidgets-5.61.0.tar.xz"; + sha256 = "5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378"; + name = "kjobwidgets-5.61.0.tar.xz"; }; }; kjs = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/portingAids/kjs-5.60.0.tar.xz"; - sha256 = "9f4beaf9d773afbd73de5a9adf1f481c9b95fb02cc7cfe8ec050625c13811355"; - name = "kjs-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kjs-5.61.0.tar.xz"; + sha256 = "968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17"; + name = "kjs-5.61.0.tar.xz"; }; }; kjsembed = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/portingAids/kjsembed-5.60.0.tar.xz"; - sha256 = "91c8767a533ee414cd0b4789270881495a8e06482d68bda988cc5fdeb987c421"; - name = "kjsembed-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kjsembed-5.61.0.tar.xz"; + sha256 = "d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44"; + name = "kjsembed-5.61.0.tar.xz"; }; }; kmediaplayer = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/portingAids/kmediaplayer-5.60.0.tar.xz"; - sha256 = "c27ab1227276a65b1c98796b5bae5e62f0e5c45a904760d94f5624bd3a46949e"; - name = "kmediaplayer-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kmediaplayer-5.61.0.tar.xz"; + sha256 = "ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181"; + name = "kmediaplayer-5.61.0.tar.xz"; }; }; knewstuff = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/knewstuff-5.60.0.tar.xz"; - sha256 = "64744c6775c839d9d8216c4a81161df5544e113570b4cee8533b5a9b4c7b36f2"; - name = "knewstuff-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knewstuff-5.61.0.tar.xz"; + sha256 = "87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b"; + name = "knewstuff-5.61.0.tar.xz"; }; }; knotifications = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/knotifications-5.60.0.tar.xz"; - sha256 = "fbed417c689b8abf08e1f29df5094cab55b193ce03483658dfb8cdbea3f2d928"; - name = "knotifications-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knotifications-5.61.0.tar.xz"; + sha256 = "f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac"; + name = "knotifications-5.61.0.tar.xz"; }; }; knotifyconfig = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/knotifyconfig-5.60.0.tar.xz"; - sha256 = "77e78f15226334ffaaa0469c06052cca60a9c18063140f38b9cd6dbf8de8f099"; - name = "knotifyconfig-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knotifyconfig-5.61.0.tar.xz"; + sha256 = "bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee"; + name = "knotifyconfig-5.61.0.tar.xz"; }; }; kpackage = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kpackage-5.60.0.tar.xz"; - sha256 = "18d951c2ae16cfe2765dfec3ff42ce88f4b716b242294690efe8ff727395406d"; - name = "kpackage-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpackage-5.61.0.tar.xz"; + sha256 = "8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f"; + name = "kpackage-5.61.0.tar.xz"; }; }; kparts = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kparts-5.60.0.tar.xz"; - sha256 = "6df0c2bf4481716e68d57b0e2040e9c2f0ee66e81309ba594d868026ea9f5ac6"; - name = "kparts-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kparts-5.61.0.tar.xz"; + sha256 = "f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436"; + name = "kparts-5.61.0.tar.xz"; }; }; kpeople = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kpeople-5.60.0.tar.xz"; - sha256 = "ec72c0a0b8e5ee9541eb3d0dedfffc78aee39d54fec91d78adb33243a8b3bd1d"; - name = "kpeople-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpeople-5.61.0.tar.xz"; + sha256 = "549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298"; + name = "kpeople-5.61.0.tar.xz"; }; }; kplotting = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kplotting-5.60.0.tar.xz"; - sha256 = "75e8c21c2417a65cb423d11e4abd28a93a9cf9e3b2f01695cdedf9ee4b2fa7a0"; - name = "kplotting-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kplotting-5.61.0.tar.xz"; + sha256 = "95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba"; + name = "kplotting-5.61.0.tar.xz"; }; }; kpty = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kpty-5.60.0.tar.xz"; - sha256 = "757daec3b77395cdf390b35419972641b2ca18c986b39b98ccf8fb3384547338"; - name = "kpty-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpty-5.61.0.tar.xz"; + sha256 = "b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c"; + name = "kpty-5.61.0.tar.xz"; }; }; kross = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/portingAids/kross-5.60.0.tar.xz"; - sha256 = "e83f3388ca8e89057e272b3b98233f294528ed0dcb62a6edb6cf37b7a1891f45"; - name = "kross-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kross-5.61.0.tar.xz"; + sha256 = "103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e"; + name = "kross-5.61.0.tar.xz"; }; }; krunner = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/krunner-5.60.0.tar.xz"; - sha256 = "e0fce95407c52d1769a38a2f95f80637bbedb039b0df702b71c5b191795fdce3"; - name = "krunner-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/krunner-5.61.0.tar.xz"; + sha256 = "f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be"; + name = "krunner-5.61.0.tar.xz"; }; }; kservice = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kservice-5.60.0.tar.xz"; - sha256 = "2d891e2781da5a562515ae09f5fb9ebd85ce397631cb217de11cb998e79516f8"; - name = "kservice-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kservice-5.61.0.tar.xz"; + sha256 = "4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9"; + name = "kservice-5.61.0.tar.xz"; }; }; ktexteditor = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/ktexteditor-5.60.0.tar.xz"; - sha256 = "7484dfaa4df868c8193e15cc760b3ce7e8e0948daaa4a1b3ca6b96550041385d"; - name = "ktexteditor-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ktexteditor-5.61.0.tar.xz"; + sha256 = "ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb"; + name = "ktexteditor-5.61.0.tar.xz"; }; }; ktextwidgets = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/ktextwidgets-5.60.0.tar.xz"; - sha256 = "8149a999ca6d2dda523d6047956ca62fd283d71356b84dfd7db6fd1582b5d43e"; - name = "ktextwidgets-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ktextwidgets-5.61.0.tar.xz"; + sha256 = "a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a"; + name = "ktextwidgets-5.61.0.tar.xz"; }; }; kunitconversion = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kunitconversion-5.60.0.tar.xz"; - sha256 = "0e377f67b6977787861aba971167aedfaa0e4c023609d505ea2d57357c082a79"; - name = "kunitconversion-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kunitconversion-5.61.0.tar.xz"; + sha256 = "e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24"; + name = "kunitconversion-5.61.0.tar.xz"; }; }; kwallet = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kwallet-5.60.0.tar.xz"; - sha256 = "2ac2186dd7d004b6740cb14e7651ddcb7d74390acb382c9d55874f3a03a8111d"; - name = "kwallet-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwallet-5.61.0.tar.xz"; + sha256 = "628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8"; + name = "kwallet-5.61.0.tar.xz"; }; }; kwayland = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kwayland-5.60.0.tar.xz"; - sha256 = "a0645594c2dc7c121b11eecf1c1d31448d110d13dab200caadddb7e1d836d905"; - name = "kwayland-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwayland-5.61.0.tar.xz"; + sha256 = "42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07"; + name = "kwayland-5.61.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kwidgetsaddons-5.60.0.tar.xz"; - sha256 = "2e74d3897290c43871836a55ce0dbf4e6f3563f97016827d7ffccf0e5342a39d"; - name = "kwidgetsaddons-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwidgetsaddons-5.61.0.tar.xz"; + sha256 = "5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891"; + name = "kwidgetsaddons-5.61.0.tar.xz"; }; }; kwindowsystem = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kwindowsystem-5.60.0.tar.xz"; - sha256 = "3bdce23b75b4b1d1eea69fb2035ff5be94ea2c1b7bb3d4e529a9b1740b106315"; - name = "kwindowsystem-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwindowsystem-5.61.0.tar.xz"; + sha256 = "17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984"; + name = "kwindowsystem-5.61.0.tar.xz"; }; }; kxmlgui = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kxmlgui-5.60.0.tar.xz"; - sha256 = "c81c2794610add13fd8019031fb40b0d002085d40ba358f6406c54f79581c149"; - name = "kxmlgui-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kxmlgui-5.61.0.tar.xz"; + sha256 = "867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b"; + name = "kxmlgui-5.61.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/kxmlrpcclient-5.60.0.tar.xz"; - sha256 = "e5f3bef626027b3cd84873362a5c6ee26692ee99a394ef9d944741670b1ca322"; - name = "kxmlrpcclient-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kxmlrpcclient-5.61.0.tar.xz"; + sha256 = "382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a"; + name = "kxmlrpcclient-5.61.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/modemmanager-qt-5.60.0.tar.xz"; - sha256 = "461b99099376d1210dad7867627c67b2a64af908a4fca0aeed75fc36059cad4e"; - name = "modemmanager-qt-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/modemmanager-qt-5.61.0.tar.xz"; + sha256 = "c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a"; + name = "modemmanager-qt-5.61.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/networkmanager-qt-5.60.0.tar.xz"; - sha256 = "fae1d2e36e0c79095cfa3d907c86c47272226a6952ab93139b750f29e9215a65"; - name = "networkmanager-qt-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/networkmanager-qt-5.61.0.tar.xz"; + sha256 = "1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3"; + name = "networkmanager-qt-5.61.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/oxygen-icons5-5.60.0.tar.xz"; - sha256 = "dca378431ec83106859736938dcc81156435b71ead564ff7ddfda85311b94e5f"; - name = "oxygen-icons5-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/oxygen-icons5-5.61.0.tar.xz"; + sha256 = "1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26"; + name = "oxygen-icons5-5.61.0.tar.xz"; }; }; plasma-framework = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/plasma-framework-5.60.0.tar.xz"; - sha256 = "96c93ea54d1ce29f930e707ab4b0eafc9e31d022f9939d2bd42b2d884e450141"; - name = "plasma-framework-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/plasma-framework-5.61.0.tar.xz"; + sha256 = "873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe"; + name = "plasma-framework-5.61.0.tar.xz"; }; }; prison = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/prison-5.60.0.tar.xz"; - sha256 = "1b8149b8965c287f7fddfd91fb1d9cf95f150dda5b70b19480452c2e855945b5"; - name = "prison-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/prison-5.61.0.tar.xz"; + sha256 = "9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab"; + name = "prison-5.61.0.tar.xz"; }; }; purpose = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/purpose-5.60.0.tar.xz"; - sha256 = "830669315e15a3edbf91130711b604967d1dae2cabb1fa79e0d72866f05b9f0a"; - name = "purpose-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/purpose-5.61.0.tar.xz"; + sha256 = "810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08"; + name = "purpose-5.61.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/qqc2-desktop-style-5.60.0.tar.xz"; - sha256 = "75e2cf793f1ba6af6592edf910412214a640366e08fea8487f20251a3e535140"; - name = "qqc2-desktop-style-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/qqc2-desktop-style-5.61.0.tar.xz"; + sha256 = "26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4"; + name = "qqc2-desktop-style-5.61.0.tar.xz"; }; }; solid = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/solid-5.60.0.tar.xz"; - sha256 = "bf3dbf22dc63946cf83cd69882f0d5fb8bf938c90252b85c849ef644caebac8a"; - name = "solid-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/solid-5.61.0.tar.xz"; + sha256 = "c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf"; + name = "solid-5.61.0.tar.xz"; }; }; sonnet = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/sonnet-5.60.0.tar.xz"; - sha256 = "f6734ac4a8dcef69f159ce0810a66ebbc2bdb8f67aac58376e8af35eb7c3dfc3"; - name = "sonnet-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/sonnet-5.61.0.tar.xz"; + sha256 = "4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29"; + name = "sonnet-5.61.0.tar.xz"; }; }; syndication = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/syndication-5.60.0.tar.xz"; - sha256 = "67bf74432d362af7e7d21984f6915b047b596a8a0ac789cbf724ea7c4f8943d9"; - name = "syndication-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/syndication-5.61.0.tar.xz"; + sha256 = "2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576"; + name = "syndication-5.61.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/syntax-highlighting-5.60.0.tar.xz"; - sha256 = "45ada4dca20641654a2d076ecb45b9ef78a4aa8032afe54ade33f140cdca504d"; - name = "syntax-highlighting-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/syntax-highlighting-5.61.0.tar.xz"; + sha256 = "475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721"; + name = "syntax-highlighting-5.61.0.tar.xz"; }; }; threadweaver = { - version = "5.60.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.60/threadweaver-5.60.0.tar.xz"; - sha256 = "8bf6520e006dadacc82735242500c73810ff3ed4e3053c8352724c9d45f4a122"; - name = "threadweaver-5.60.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/threadweaver-5.61.0.tar.xz"; + sha256 = "e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843"; + name = "threadweaver-5.61.0.tar.xz"; }; }; } -- GitLab From 2b22167ad7c3dbee95498fe67deb8cd78b721497 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 11 Aug 2019 20:36:09 +0200 Subject: [PATCH 39/92] kwayland: add missing dependency --- pkgs/development/libraries/kde-frameworks/kwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index ee19b39bd15..c19836ed7a7 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, propagateBin, extra-cmake-modules, - qtbase, wayland + qtbase, wayland, wayland-protocols }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ wayland ]; + buildInputs = [ wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; setupHook = propagateBin; # XDG_CONFIG_DIRS } -- GitLab From 3085451655907817283ecfbc9b035f64fb4ef4f3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 12 Aug 2019 01:16:40 +0200 Subject: [PATCH 40/92] konversation: add patch "Fix build with Qt 5.13" --- .../applications/networking/irc/konversation/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 27297b01dce..6a58241b89a 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , kdoctools , kbookmarks @@ -38,6 +39,14 @@ in mkDerivation rec { sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0"; }; + patches = [ + # Delete this patch for konversation > 1.7.5 + (fetchpatch { + url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53"; + sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y"; + }) + ]; + buildInputs = [ kbookmarks karchive -- GitLab From 022db304738c2cb65d63f44f1de0a35ebc937260 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 13 Aug 2019 01:08:28 +0200 Subject: [PATCH 41/92] kinit: fix kdeinit-extra_libs.patch --- .../libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch index 75e632d4129..89145e3e1dd 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch @@ -2,15 +2,13 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp =================================================================== --- kinit-5.32.0.orig/src/kdeinit/kinit.cpp +++ kinit-5.32.0/src/kdeinit/kinit.cpp -@@ -96,11 +96,9 @@ static const char *extra_libs[] = { +@@ -96,9 +96,9 @@ static const char *extra_libs[] = { "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" #else - "libKF5KIOCore.so.5", - "libKF5Parts.so.5", --//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see. - "libKF5Plasma.so.5" --//#endif + NIXPKGS_KF5_KIOCORE, + NIXPKGS_KF5_PARTS, + NIXPKGS_KF5_PLASMA -- GitLab From 5268987144ba690e907d04a22906b985ef7c0b04 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 13 Aug 2019 19:47:21 +0200 Subject: [PATCH 42/92] ark: add patch "missing QVector include" --- pkgs/applications/kde/ark/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 6015cb69d77..96332cc9168 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, config, + mkDerivation, lib, config, fetchpatch, extra-cmake-modules, kdoctools, @@ -27,6 +27,14 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # This patch should be backported in 19.04.4 KDE applications + (fetchpatch { + url = "https://cgit.kde.org/ark.git/patch/?id=7065c5390c78c2b18807721490f19c62761220e5"; + sha256 = "0sipw5z60gk6l025rk4xsbc10n3bvv9743f4cbvf6hyy4mbm4p1m"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libarchive libzip ] ++ extraTools; -- GitLab From 9825b2ac46b2dc4de7f6c81551c980e3ec76db5c Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 13 Aug 2019 20:24:55 +0200 Subject: [PATCH 43/92] kate: add patch "add missing header" --- pkgs/applications/kde/kate.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index e6b4f6b6bdd..7051bac404b 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, @@ -13,6 +13,15 @@ mkDerivation { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; + + patches = [ + # This patch should be backported in 19.04.4 KDE applications + (fetchpatch { + url = "https://cgit.kde.org/kate.git/patch/?id=76ec8b55a86a29a90125b2ff3f512df007789cb1"; + sha256 = "1q0bkb6vl4xvh4aba1rlqii4a75pvl7vbcs4plny8lalzslnbzhj"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 ]; propagatedBuildInputs = [ -- GitLab From 766c8f106e8b487a095f682318f84254051c8e2d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 13 Aug 2019 21:21:08 +0200 Subject: [PATCH 44/92] kmail: add patch "fix build by including QMap" --- pkgs/applications/kde/kmail.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index a58b3b8c45d..b08444f18bb 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim, @@ -26,5 +26,13 @@ mkDerivation { libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; - patches = [ ./kmail.patch ]; + patches = [ + ./kmail.patch + + # This patch should be backported in 19.04.4 KDE applications + (fetchpatch { + url = "https://cgit.kde.org/kmail.git/patch/?id=28a8cf907b3cd903aef0b963314df219afc6b66a"; + sha256 = "1gr94zmxnyhhyqjhcmm8aykvmf15pmn751cvdh4ll59rzbra8h0n"; + }) + ]; } -- GitLab From 505f0c2232b9b09b259e2c3279fd3c0d5a67cbfb Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 14 Aug 2019 00:29:41 +0200 Subject: [PATCH 45/92] ksysguard: replace qtwebkit by qtwebengine https://github.com/KDE/libksysguard/commit/c9747e37c53101c8228f9571c9367ce4193d3b51 --- pkgs/desktops/plasma-5/ksysguard.nix | 4 ++-- pkgs/desktops/plasma-5/libksysguard/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 150b97be50d..01e740f74c4 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, - knewstuff, libksysguard, qtwebkit + knewstuff, libksysguard }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n lm_sensors qtwebkit + kdelibs4support ki18n lm_sensors ]; } diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 0f9fe40d73c..96d113e11fb 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, + kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine, qtx11extras }: @@ -15,7 +15,7 @@ mkDerivation { buildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebkit + qtwebengine ]; outputs = [ "bin" "dev" "out" ]; } -- GitLab From 7489145b3000f4b5fbf24c2f0f5729ebaa6dc9ec Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 10:11:52 +0200 Subject: [PATCH 46/92] kde_applications: 19.04.3 -> 19.08.0 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1736 ++++++++++++++++---------------- 2 files changed, 877 insertions(+), 861 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 6659865bc01..5c72e78c582 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.04.3/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index a4cd9eb2b09..fb0581cb341 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1739 @@ { akonadi = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-19.04.3.tar.xz"; - sha256 = "7ac34dc7c3e2bf8e53ec9eebeecc8d96541c0b663dd71963e6bcd94e7ac41b07"; - name = "akonadi-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-19.08.0.tar.xz"; + sha256 = "ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831"; + name = "akonadi-19.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-19.04.3.tar.xz"; - sha256 = "939691e3c31993e3708a74759cbab951a51d0b36239426fe09c9ee9ff9622013"; - name = "akonadi-calendar-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-19.08.0.tar.xz"; + sha256 = "74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b"; + name = "akonadi-calendar-19.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-calendar-tools-19.04.3.tar.xz"; - sha256 = "b7bf7c6a8df76f66d13209b3a2d1c47d703f0a3fff7936d2c880c11c2eb33d39"; - name = "akonadi-calendar-tools-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-tools-19.08.0.tar.xz"; + sha256 = "9620a4418245a74334c6f57db4ba5558825879440aee5903f5614db08f61e976"; + name = "akonadi-calendar-tools-19.08.0.tar.xz"; }; }; akonadiconsole = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadiconsole-19.04.3.tar.xz"; - sha256 = "25a302f3e582555cf003b48e28788d289a771e0c29c500afcd5d915e0bb34bda"; - name = "akonadiconsole-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadiconsole-19.08.0.tar.xz"; + sha256 = "a683b184109cddbc4d66c55ee3efa2c69092a72e2cd9e78903c4dcf7f442c055"; + name = "akonadiconsole-19.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-contacts-19.04.3.tar.xz"; - sha256 = "9ecae008ccc77ff5982de5152dfc2be62eb1137f24a58aeb74a62291fc2fd93c"; - name = "akonadi-contacts-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-contacts-19.08.0.tar.xz"; + sha256 = "912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4"; + name = "akonadi-contacts-19.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-import-wizard-19.04.3.tar.xz"; - sha256 = "5e4b74790927be8372939237336e3684d7560d0c0652a26b57cc3233109234c4"; - name = "akonadi-import-wizard-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-import-wizard-19.08.0.tar.xz"; + sha256 = "e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915"; + name = "akonadi-import-wizard-19.08.0.tar.xz"; }; }; akonadi-mime = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-mime-19.04.3.tar.xz"; - sha256 = "ec4fbd594fb4fc57f1a7e11763b517721fc5e050ffa7bbc2bdddf5e76694d9f9"; - name = "akonadi-mime-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-mime-19.08.0.tar.xz"; + sha256 = "32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4"; + name = "akonadi-mime-19.08.0.tar.xz"; }; }; akonadi-notes = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-notes-19.04.3.tar.xz"; - sha256 = "c95f50c9ab0fc3587d3e1e78073038e3a044f3dc116068b354b2d148d6288dbf"; - name = "akonadi-notes-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-notes-19.08.0.tar.xz"; + sha256 = "26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3"; + name = "akonadi-notes-19.08.0.tar.xz"; }; }; akonadi-search = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akonadi-search-19.04.3.tar.xz"; - sha256 = "c5298a5b903373590e63039777c954720aa0bc46b25ec0c48e6409265b38d4ed"; - name = "akonadi-search-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-search-19.08.0.tar.xz"; + sha256 = "fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0"; + name = "akonadi-search-19.08.0.tar.xz"; }; }; akregator = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/akregator-19.04.3.tar.xz"; - sha256 = "5d883061c4a53374ff2351646711d2b6eb047187ffd0d620a038fb6509bb60c0"; - name = "akregator-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akregator-19.08.0.tar.xz"; + sha256 = "d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820"; + name = "akregator-19.08.0.tar.xz"; }; }; analitza = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/analitza-19.04.3.tar.xz"; - sha256 = "771cf26918ea09f1597ee95328bdfc1c65b28617b0b312ca609676a718fc2a9e"; - name = "analitza-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/analitza-19.08.0.tar.xz"; + sha256 = "516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003"; + name = "analitza-19.08.0.tar.xz"; }; }; ark = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ark-19.04.3.tar.xz"; - sha256 = "a06cc2937aa4ed41bab0a38344164f367b993a80bcd74011e4ab72643bfee8ee"; - name = "ark-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ark-19.08.0.tar.xz"; + sha256 = "0685285486ca933e3467f35c3d5d4e8633ae80f1e5529f8a4d8257d0b53d9512"; + name = "ark-19.08.0.tar.xz"; }; }; artikulate = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/artikulate-19.04.3.tar.xz"; - sha256 = "3f0b811017c59a05260ca43a7e298633a6ac9ef0f9cfb8ec62890da0f3ec1217"; - name = "artikulate-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/artikulate-19.08.0.tar.xz"; + sha256 = "40f1ecb2e6d0d2e8bb1c86d64935c9f2411e0e72781e3211ed0014a02acd72ba"; + name = "artikulate-19.08.0.tar.xz"; }; }; audiocd-kio = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/audiocd-kio-19.04.3.tar.xz"; - sha256 = "4e684ab03fafd4ee37d7ef7d2c2edb883e76bb5a81e11415173317160997accf"; - name = "audiocd-kio-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/audiocd-kio-19.08.0.tar.xz"; + sha256 = "46013e95fa358004083c185d43afe48b96bd18acba1a33e5706f75b128a3e954"; + name = "audiocd-kio-19.08.0.tar.xz"; }; }; baloo-widgets = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/baloo-widgets-19.04.3.tar.xz"; - sha256 = "ee14c03ac8254a0d0680bce856178a2110f0339b9dd5021927c59ff2df90606f"; - name = "baloo-widgets-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/baloo-widgets-19.08.0.tar.xz"; + sha256 = "3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008"; + name = "baloo-widgets-19.08.0.tar.xz"; }; }; blinken = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/blinken-19.04.3.tar.xz"; - sha256 = "db0cb33ef117ad3c05f7f90a0d931106141431448d7fbb7c49f4832273313001"; - name = "blinken-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/blinken-19.08.0.tar.xz"; + sha256 = "9b993586d8ddab3821b1b4f805cd8b6603822faca93402d42775bea2eb346971"; + name = "blinken-19.08.0.tar.xz"; }; }; bomber = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/bomber-19.04.3.tar.xz"; - sha256 = "48214f30503d37343268b817c68b47042cb9855688cc7564bf9c6dd5d2a31dda"; - name = "bomber-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/bomber-19.08.0.tar.xz"; + sha256 = "5274f8ef6cd94fcbd887220d6c7b08c1f71050c601d14cf53d847f41f254e043"; + name = "bomber-19.08.0.tar.xz"; }; }; bovo = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/bovo-19.04.3.tar.xz"; - sha256 = "ee4b2480d51ba768e241faf70fcbe955656840c648e9d81c2a269ccc8558ea35"; - name = "bovo-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/bovo-19.08.0.tar.xz"; + sha256 = "829ecfe3a46bc1c009fea14c5860aa17ea18f36ed33fdc9296c499992aeed466"; + name = "bovo-19.08.0.tar.xz"; }; }; calendarsupport = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/calendarsupport-19.04.3.tar.xz"; - sha256 = "789ae6f2cb75baf239079b11742fbe40353c55eac84b0a396f761f010bc9041c"; - name = "calendarsupport-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/calendarsupport-19.08.0.tar.xz"; + sha256 = "af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4"; + name = "calendarsupport-19.08.0.tar.xz"; }; }; cantor = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/cantor-19.04.3.tar.xz"; - sha256 = "6ac01cf576d6ee6292d9656bebe2fa6f1216814148f77d0b9971df6a92ff5a47"; - name = "cantor-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/cantor-19.08.0.tar.xz"; + sha256 = "b1d1a735e83ca03d51b79f1fc59612153e94b274d716d65ff3fa94ffdd2f3adc"; + name = "cantor-19.08.0.tar.xz"; }; }; cervisia = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/cervisia-19.04.3.tar.xz"; - sha256 = "e0e04076ef5d43b18a571b5f3f8acb774a5c2fe03a901cd5fbf65621fc5e05eb"; - name = "cervisia-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/cervisia-19.08.0.tar.xz"; + sha256 = "a72c3a7bad3b30a466d6793318248329d7ddb1a0e00c832744b628a9eb8b8257"; + name = "cervisia-19.08.0.tar.xz"; }; }; dolphin = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/dolphin-19.04.3.tar.xz"; - sha256 = "67a2b283049591fa0f00304b4da6532e9d59d9dc9067916e0ffe8aa19d93f579"; - name = "dolphin-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/dolphin-19.08.0.tar.xz"; + sha256 = "fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0"; + name = "dolphin-19.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz"; - sha256 = "a68e15b71fa35acb190952ef49b2611876317e3bb0420d65d5365bc03feb9542"; - name = "dolphin-plugins-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/dolphin-plugins-19.08.0.tar.xz"; + sha256 = "f074aa7151f4b4d9202d90257952638652a1bf09d02699762f346d85b61c5f54"; + name = "dolphin-plugins-19.08.0.tar.xz"; }; }; dragon = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/dragon-19.04.3.tar.xz"; - sha256 = "498bbcf3441a32a588568981ee3ad563b6c4fd88b226d1673d83da09901f117a"; - name = "dragon-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/dragon-19.08.0.tar.xz"; + sha256 = "3d792f6dfd4a5d8ad7726fa942840ebed2b2bb6f25ec6f68883b83859c21cacc"; + name = "dragon-19.08.0.tar.xz"; }; }; eventviews = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/eventviews-19.04.3.tar.xz"; - sha256 = "3f479f695756cea5d10ea2ab028dd6a954e677223a5c1ff9f7be208742952f22"; - name = "eventviews-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/eventviews-19.08.0.tar.xz"; + sha256 = "2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295"; + name = "eventviews-19.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ffmpegthumbs-19.04.3.tar.xz"; - sha256 = "ddd6cb3388c1af96a14d611de9575f6f6c22c6acfe52e63e44b746709ac8024b"; - name = "ffmpegthumbs-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ffmpegthumbs-19.08.0.tar.xz"; + sha256 = "13f5f8b40c0f6146cdd4d1d9e6a7b7dd19cda9650fe08f9731c050e58f11efee"; + name = "ffmpegthumbs-19.08.0.tar.xz"; }; }; filelight = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/filelight-19.04.3.tar.xz"; - sha256 = "4ad45db886f06afdff1e5c580261eea18f2c0cf3bcde92ecdc626583641d6c88"; - name = "filelight-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/filelight-19.08.0.tar.xz"; + sha256 = "bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6"; + name = "filelight-19.08.0.tar.xz"; }; }; granatier = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/granatier-19.04.3.tar.xz"; - sha256 = "996dafafc4a72cf49748c9e7046267980d5c9639b84c26e85266850dd1a9df21"; - name = "granatier-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/granatier-19.08.0.tar.xz"; + sha256 = "b61bf45df63dc3fb324e1a74ec84ae4f2d58371af88ccd28593b0716673dc00a"; + name = "granatier-19.08.0.tar.xz"; }; }; grantlee-editor = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/grantlee-editor-19.04.3.tar.xz"; - sha256 = "b244eef352ef776cbb0d3d5e51ffaa629d4ca3b6bd7fc86a8fda8d24e5090bca"; - name = "grantlee-editor-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/grantlee-editor-19.08.0.tar.xz"; + sha256 = "00a7d07aeffc35ac6e3dd39434194ba35c855a603cdc6eca0ece5b00ae1e0e30"; + name = "grantlee-editor-19.08.0.tar.xz"; }; }; grantleetheme = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/grantleetheme-19.04.3.tar.xz"; - sha256 = "c5cf79f1daddde3bc5b9387546b10e1d3ae4512279d50e3545ad38982c7f9aaf"; - name = "grantleetheme-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/grantleetheme-19.08.0.tar.xz"; + sha256 = "c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543"; + name = "grantleetheme-19.08.0.tar.xz"; }; }; gwenview = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/gwenview-19.04.3.tar.xz"; - sha256 = "1e4c6881674dfcde52a196420eae2fab61dffb05b976125dfbd65c3bf2395035"; - name = "gwenview-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/gwenview-19.08.0.tar.xz"; + sha256 = "1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3"; + name = "gwenview-19.08.0.tar.xz"; }; }; incidenceeditor = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/incidenceeditor-19.04.3.tar.xz"; - sha256 = "b3a0ac35b04bc7851a32021552369ba5ac5b2e69969c29121d9cb2adfd5ccf70"; - name = "incidenceeditor-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/incidenceeditor-19.08.0.tar.xz"; + sha256 = "43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea"; + name = "incidenceeditor-19.08.0.tar.xz"; }; }; juk = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/juk-19.04.3.tar.xz"; - sha256 = "f4a272aa677ac7b5eb8c3f30234dea129e41863c5c78d812b27d30dde0f5d750"; - name = "juk-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/juk-19.08.0.tar.xz"; + sha256 = "d2549c709f8934a5306a16e3a1e2b9e057ead54dc85efe17009e7aacd395edd0"; + name = "juk-19.08.0.tar.xz"; }; }; k3b = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/k3b-19.04.3.tar.xz"; - sha256 = "c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61"; - name = "k3b-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/k3b-19.08.0.tar.xz"; + sha256 = "6a740724945496395cea1b5850ea9567a9aa9cc8a28c5366c9709b4226dc4b10"; + name = "k3b-19.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kaccounts-integration-19.04.3.tar.xz"; - sha256 = "fea6cc555de2e345079ed576be0c957ff5c7177ff658f31ce3bcb23176174372"; - name = "kaccounts-integration-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kaccounts-integration-19.08.0.tar.xz"; + sha256 = "b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a"; + name = "kaccounts-integration-19.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kaccounts-providers-19.04.3.tar.xz"; - sha256 = "483b87dc74913d7ab3b569d64e890d4358d95e2544ec8027cd21232495457636"; - name = "kaccounts-providers-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kaccounts-providers-19.08.0.tar.xz"; + sha256 = "9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3"; + name = "kaccounts-providers-19.08.0.tar.xz"; }; }; kaddressbook = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kaddressbook-19.04.3.tar.xz"; - sha256 = "dc379c4a2d15a94fe5d7416e692301827377b503ba0880f3b508fe2c812d4349"; - name = "kaddressbook-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kaddressbook-19.08.0.tar.xz"; + sha256 = "9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf"; + name = "kaddressbook-19.08.0.tar.xz"; }; }; kajongg = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kajongg-19.04.3.tar.xz"; - sha256 = "e367307310102b0f0b171718ae1bc6508e26b8200ba3d484dc0d7608f942ec2b"; - name = "kajongg-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kajongg-19.08.0.tar.xz"; + sha256 = "0f522477939de09d4d56d2947fb02b0f20ca0cbac4d21326a9477e11fc173244"; + name = "kajongg-19.08.0.tar.xz"; }; }; kalarm = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kalarm-19.04.3.tar.xz"; - sha256 = "c686f5b768719e77e913ee616267f2980c9827ea71f3738099f18cb4d4178d84"; - name = "kalarm-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalarm-19.08.0.tar.xz"; + sha256 = "e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84"; + name = "kalarm-19.08.0.tar.xz"; }; }; kalarmcal = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kalarmcal-19.04.3.tar.xz"; - sha256 = "f0965229600ee962be3db85cfb94105e2734c8e066ff316e216c625c70dd25d7"; - name = "kalarmcal-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalarmcal-19.08.0.tar.xz"; + sha256 = "5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419"; + name = "kalarmcal-19.08.0.tar.xz"; }; }; kalgebra = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kalgebra-19.04.3.tar.xz"; - sha256 = "b63904f2fc5609d8c62b18ae5e8b0f917785d9eaf46357a1045a9de89aa129ea"; - name = "kalgebra-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalgebra-19.08.0.tar.xz"; + sha256 = "b875b2bfe985e5c595f60fbb146fb4545c34321bb86f7fc04164a23f0bb3e9eb"; + name = "kalgebra-19.08.0.tar.xz"; }; }; kalzium = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kalzium-19.04.3.tar.xz"; - sha256 = "2a7bf84021be5013aa1e2b14d0c97e6c80b1b7b9e2c78c8df50c0a94925699d1"; - name = "kalzium-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalzium-19.08.0.tar.xz"; + sha256 = "0dac199871b8d01890b8959cd5c4776eb2f938f7fb4a558b23364f9dd8e15111"; + name = "kalzium-19.08.0.tar.xz"; }; }; kamera = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kamera-19.04.3.tar.xz"; - sha256 = "acf5ecf939fa8f4366d607742dc673a307fd72cfa05f4fedb04547f7d336be43"; - name = "kamera-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kamera-19.08.0.tar.xz"; + sha256 = "f287f1db119946d2e62d4ccd52a66671343042563cc87da246f2692fa1b775c6"; + name = "kamera-19.08.0.tar.xz"; }; }; kamoso = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kamoso-19.04.3.tar.xz"; - sha256 = "19168e5f45762b04254ebf598dfa7f066858ae243a9b7286d7e3e43385018ec6"; - name = "kamoso-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kamoso-19.08.0.tar.xz"; + sha256 = "2aa8765f71109e813836dced26994a953973ef6f4d517ab224691f2342d64129"; + name = "kamoso-19.08.0.tar.xz"; }; }; kanagram = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kanagram-19.04.3.tar.xz"; - sha256 = "945276e94ccc82d958400583af4377f40d473bdc566d37962f7137f47663a728"; - name = "kanagram-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kanagram-19.08.0.tar.xz"; + sha256 = "4f4ccf9cf48711d8fe9a5966294ba16b43092b8df3fdb03b5c236d22157d275c"; + name = "kanagram-19.08.0.tar.xz"; }; }; kapman = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kapman-19.04.3.tar.xz"; - sha256 = "6b1810bf946ff84b34b9fd6e913811d0e0a249cad5cb49b7990d742ec2832ca1"; - name = "kapman-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kapman-19.08.0.tar.xz"; + sha256 = "e0e53e60e7af1f0002343969b2ce0ce47e0cd3d7318b44d2827478291c2a9cd4"; + name = "kapman-19.08.0.tar.xz"; }; }; kapptemplate = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kapptemplate-19.04.3.tar.xz"; - sha256 = "023273adf6df75d68b3ee52d14924887e403b80dea23eb765a98242fddcd4f37"; - name = "kapptemplate-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kapptemplate-19.08.0.tar.xz"; + sha256 = "a25170f3527e85bea9509fe5cb991544c0a1dab8f7025c71fd5b0d4c82d9e169"; + name = "kapptemplate-19.08.0.tar.xz"; }; }; kate = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kate-19.04.3.tar.xz"; - sha256 = "b1dcd45270c0494e97f32f435a943ca27b0bcb23065a9ad2a1fe37e4a81ad9a6"; - name = "kate-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kate-19.08.0.tar.xz"; + sha256 = "6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878"; + name = "kate-19.08.0.tar.xz"; }; }; katomic = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/katomic-19.04.3.tar.xz"; - sha256 = "e4edc6a0058ed929204b64bb99af294752bc20b1693e5930c2616af45d0587c3"; - name = "katomic-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/katomic-19.08.0.tar.xz"; + sha256 = "12b2a0e703312159a8a217ddb5e19c9a9bea1825d668dd4377fe8e52101f3c90"; + name = "katomic-19.08.0.tar.xz"; }; }; kbackup = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kbackup-19.04.3.tar.xz"; - sha256 = "421e05fbc7b6332cfdca08faa65e74def2c5fa40a6211e6623e03cc4ec568019"; - name = "kbackup-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbackup-19.08.0.tar.xz"; + sha256 = "2cd447ef7d53e7ee55868086e7a894f550fd81515cf5d87d0561520f45145127"; + name = "kbackup-19.08.0.tar.xz"; }; }; kblackbox = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kblackbox-19.04.3.tar.xz"; - sha256 = "45b8f5218c8817c38a13269ac5464c5abd2010d1ddb27ec255de1bf43ef2fe91"; - name = "kblackbox-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kblackbox-19.08.0.tar.xz"; + sha256 = "44907aed2a2a24f57cb5ae0046a857645788d8d7aeb9383187b516c9f519a72c"; + name = "kblackbox-19.08.0.tar.xz"; }; }; kblocks = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kblocks-19.04.3.tar.xz"; - sha256 = "10b350f91978c221c224c42e2f50dc8c2e86e187de8e46258b10cf3799fb4b74"; - name = "kblocks-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kblocks-19.08.0.tar.xz"; + sha256 = "3337c6fb57fdb8439e6e6edc0186fec76641196714daa955465e009923573b84"; + name = "kblocks-19.08.0.tar.xz"; }; }; kblog = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kblog-19.04.3.tar.xz"; - sha256 = "5890ae54f85057e22807a7f47681004f521c3558c750ef75b90328118363a07d"; - name = "kblog-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kblog-19.08.0.tar.xz"; + sha256 = "15abd5dfd0499633703273823ceddc8e64b52b0217b04bea3d86cb9ac54da189"; + name = "kblog-19.08.0.tar.xz"; }; }; kbounce = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kbounce-19.04.3.tar.xz"; - sha256 = "9a4ee5257becad72b359cc5985412ba2c4a15a81afe89022f812ec9eda7b5356"; - name = "kbounce-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbounce-19.08.0.tar.xz"; + sha256 = "3df779542c1d74d63e66a4db86210d75e37939f8f29947851b9c76c347856025"; + name = "kbounce-19.08.0.tar.xz"; }; }; kbreakout = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kbreakout-19.04.3.tar.xz"; - sha256 = "7ef268806451e3b7ee813b921247257ff1a466ebd3c48b20bfc77ebebef10c9e"; - name = "kbreakout-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbreakout-19.08.0.tar.xz"; + sha256 = "87748c5bda9b7563531e0b0701ec4a745cd95121b9bd426448e5ed476292fdd4"; + name = "kbreakout-19.08.0.tar.xz"; }; }; kbruch = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kbruch-19.04.3.tar.xz"; - sha256 = "131455d024ead96cf2396cf6074a23584799c0793464b83eb3ecc2a455c5d355"; - name = "kbruch-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbruch-19.08.0.tar.xz"; + sha256 = "29c83039af494703e9d665eca2acde30bb4b94666b3dfe9092833e35f83a9541"; + name = "kbruch-19.08.0.tar.xz"; }; }; kcachegrind = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcachegrind-19.04.3.tar.xz"; - sha256 = "856649529f0c19749a2b73125351400f401521664c9044fc33f92a09073d5270"; - name = "kcachegrind-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcachegrind-19.08.0.tar.xz"; + sha256 = "676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b"; + name = "kcachegrind-19.08.0.tar.xz"; }; }; kcalc = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcalc-19.04.3.tar.xz"; - sha256 = "42da5439af4f59402d27f2c48d4ee9c68d4a84bfda8d16a5ab9d7ab6bdcc02d5"; - name = "kcalc-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcalc-19.08.0.tar.xz"; + sha256 = "58c26a9698bfc9e0d3a5614ab26c53878e87fc601688ad6c5848fbdbc21c4103"; + name = "kcalc-19.08.0.tar.xz"; }; }; kcalcore = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcalcore-19.04.3.tar.xz"; - sha256 = "335df0ae376b7abfc8274d46bb5a9956fb8ef438c1065d7f79a57db23005ca45"; - name = "kcalcore-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcalcore-19.08.0.tar.xz"; + sha256 = "7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85"; + name = "kcalcore-19.08.0.tar.xz"; }; }; kcalutils = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcalutils-19.04.3.tar.xz"; - sha256 = "de08972947008fd74fdeb7b2ddf642a356d84009b853a5aeec2ded98b399290e"; - name = "kcalutils-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcalutils-19.08.0.tar.xz"; + sha256 = "ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e"; + name = "kcalutils-19.08.0.tar.xz"; }; }; kcharselect = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcharselect-19.04.3.tar.xz"; - sha256 = "98ebcf13ec02f490bfeaa1001e46a397163939d75d73cf26cd4707e9aa2a4186"; - name = "kcharselect-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcharselect-19.08.0.tar.xz"; + sha256 = "31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020"; + name = "kcharselect-19.08.0.tar.xz"; }; }; kcolorchooser = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcolorchooser-19.04.3.tar.xz"; - sha256 = "f60ee47baaca59b7df8ce58902ae09d44d2cb5b7f3f5ec7b9a401c7f7e3e5ab4"; - name = "kcolorchooser-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcolorchooser-19.08.0.tar.xz"; + sha256 = "bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb"; + name = "kcolorchooser-19.08.0.tar.xz"; }; }; kcontacts = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcontacts-19.04.3.tar.xz"; - sha256 = "28f3c61b99f6f6b1264a8373ab9915e6844f4025c74652cd897b7b560067e241"; - name = "kcontacts-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcontacts-19.08.0.tar.xz"; + sha256 = "b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e"; + name = "kcontacts-19.08.0.tar.xz"; }; }; kcron = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kcron-19.04.3.tar.xz"; - sha256 = "24f6f36d058c3e0587a7a70cc2d2df77eb593efa642833cfb17bc671e97c9cd6"; - name = "kcron-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcron-19.08.0.tar.xz"; + sha256 = "1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c"; + name = "kcron-19.08.0.tar.xz"; }; }; kdav = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdav-19.04.3.tar.xz"; - sha256 = "f182a3ad6e23ff9e8165d11c3d4964e470e5d4d3f0183207cbe380f5c111af85"; - name = "kdav-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdav-19.08.0.tar.xz"; + sha256 = "8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6"; + name = "kdav-19.08.0.tar.xz"; }; }; kdebugsettings = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdebugsettings-19.04.3.tar.xz"; - sha256 = "0f3f2afafad0cfb312b51b15de6615359ba5ccd7bee6b35ce48a40e3a58368c5"; - name = "kdebugsettings-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdebugsettings-19.08.0.tar.xz"; + sha256 = "b47987cabffe464c21c96b31991643efafc24f77d31b768ed9dff075567aa361"; + name = "kdebugsettings-19.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kde-dev-scripts-19.04.3.tar.xz"; - sha256 = "ef71c4891e9fe8bde99159a12a2539227b3994ad33ad46073a08074d61ec5b61"; - name = "kde-dev-scripts-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kde-dev-scripts-19.08.0.tar.xz"; + sha256 = "8028d1f5390f608974235123a7c14342fb0c247456e6088d4f16797875efdf18"; + name = "kde-dev-scripts-19.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kde-dev-utils-19.04.3.tar.xz"; - sha256 = "b8bde609a66482224d8c581692ecba0665894143ba64e816797a44eea7453a43"; - name = "kde-dev-utils-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kde-dev-utils-19.08.0.tar.xz"; + sha256 = "fc95211b92fa76e53558111d5cd64227f194df15fb13f2d81c809facd796f2c5"; + name = "kde-dev-utils-19.08.0.tar.xz"; }; }; kdeedu-data = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdeedu-data-19.04.3.tar.xz"; - sha256 = "03d8e219a3d7f82f92887f200e017eaeb2fc3f9316f0ea63d4caa271c62f7791"; - name = "kdeedu-data-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdeedu-data-19.08.0.tar.xz"; + sha256 = "658063227b9d4d7e4e238038ffa9c76e5c5f3015c923967477f514b063940eb0"; + name = "kdeedu-data-19.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-mobipocket-19.04.3.tar.xz"; - sha256 = "c073730b7f3d468f4e710a67bdb90d794b69bf0f2c149f7fac705b44b912fa94"; - name = "kdegraphics-mobipocket-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-mobipocket-19.08.0.tar.xz"; + sha256 = "28c6566f32855a43d10829070cc47d0f4c879ca89eb3228ea6274d0f32fa90fe"; + name = "kdegraphics-mobipocket-19.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdegraphics-thumbnailers-19.04.3.tar.xz"; - sha256 = "1cca91081a97e851156d187794037bdcbffe996f607a1eed59a2ea00049a9f78"; - name = "kdegraphics-thumbnailers-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-thumbnailers-19.08.0.tar.xz"; + sha256 = "127a99fffdaee3772b03a6c197357311ec56047caccce967f0d74b5489722ddf"; + name = "kdegraphics-thumbnailers-19.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdenetwork-filesharing-19.04.3.tar.xz"; - sha256 = "bc3763ecf49b85e159503928692c9cb68083c6acc49f2dead27f538fca0e8ab5"; - name = "kdenetwork-filesharing-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdenetwork-filesharing-19.08.0.tar.xz"; + sha256 = "a7e2e7d79c7e6486e2d2efe8f85e2be2f6231ca5e4e49e2bd332befb9d6d4288"; + name = "kdenetwork-filesharing-19.08.0.tar.xz"; }; }; kdenlive = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdenlive-19.04.3.tar.xz"; - sha256 = "c981954ce9759da2878b4c76d97b9bb7aa92fc1f073a9f759142870e287d2a1e"; - name = "kdenlive-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdenlive-19.08.0.tar.xz"; + sha256 = "01b60bf58f6818a5ca9aa6e7a79111965700e6948da0bc0edd1184c26fd872e4"; + name = "kdenlive-19.08.0.tar.xz"; }; }; kdepim-addons = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdepim-addons-19.04.3.tar.xz"; - sha256 = "a748027568ed2f82f9178c24f6eba18f1d5af26f51d1cc1ddedea645e04190a6"; - name = "kdepim-addons-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdepim-addons-19.08.0.tar.xz"; + sha256 = "8eb692f9dcb86fec2ec207f719c774492df222fceab2ccc2bdf530cb57aa1c3e"; + name = "kdepim-addons-19.08.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdepim-apps-libs-19.04.3.tar.xz"; - sha256 = "a3ad12f4b7c58154aef49fc5d0ac388a6e9441972605aaa02e17dd6a0583eeb2"; - name = "kdepim-apps-libs-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdepim-apps-libs-19.08.0.tar.xz"; + sha256 = "2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e"; + name = "kdepim-apps-libs-19.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdepim-runtime-19.04.3.tar.xz"; - sha256 = "720945f803dc9027211eb46f281ef52b35da3fe4d990c1aeed6d57a89a45215a"; - name = "kdepim-runtime-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdepim-runtime-19.08.0.tar.xz"; + sha256 = "634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef"; + name = "kdepim-runtime-19.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdesdk-kioslaves-19.04.3.tar.xz"; - sha256 = "682e13382f41b76306e48ee9d75e993f84a4619be8de08023354653c6b350842"; - name = "kdesdk-kioslaves-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdesdk-kioslaves-19.08.0.tar.xz"; + sha256 = "cb49f23038d6841ea3a08f840328372aaee53dd915ab5a923753a4a899199ae0"; + name = "kdesdk-kioslaves-19.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdesdk-thumbnailers-19.04.3.tar.xz"; - sha256 = "771052d4f4482e88bb70a00a55b3b1755055088dce998e723948ff3de5c576fe"; - name = "kdesdk-thumbnailers-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdesdk-thumbnailers-19.08.0.tar.xz"; + sha256 = "e640f1a484482f6dd4ba4ebda92832a027a20e64e1e12d2306bd7dd618b36356"; + name = "kdesdk-thumbnailers-19.08.0.tar.xz"; }; }; kdf = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdf-19.04.3.tar.xz"; - sha256 = "4d3d3218cee73238e9be73db131062f186ede393bbe0115e4df633c7d21f2572"; - name = "kdf-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdf-19.08.0.tar.xz"; + sha256 = "e6effd6aaf08c9bfa649b194313e7719b65a9d53f00570e14d2752ce68d13bfe"; + name = "kdf-19.08.0.tar.xz"; }; }; kdialog = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdialog-19.04.3.tar.xz"; - sha256 = "647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823"; - name = "kdialog-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdialog-19.08.0.tar.xz"; + sha256 = "dc60f9ea0c59435b0da37f4bc50716d43ebfb9b9d0b05955c96393e6d06ea687"; + name = "kdialog-19.08.0.tar.xz"; }; }; kdiamond = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kdiamond-19.04.3.tar.xz"; - sha256 = "22a567a63dd2bf9006d970e9aa5aeabff94c2ae9c98004bbd6cc35083a995536"; - name = "kdiamond-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdiamond-19.08.0.tar.xz"; + sha256 = "f37d526610fa0579d5be9de19325ed82e14763c997d9ea026dfcf1068bf2428a"; + name = "kdiamond-19.08.0.tar.xz"; }; }; keditbookmarks = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/keditbookmarks-19.04.3.tar.xz"; - sha256 = "b255d6f85d34abf635857f922b059c3311fd7859262039bec0c90b6538c5e92e"; - name = "keditbookmarks-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/keditbookmarks-19.08.0.tar.xz"; + sha256 = "98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac"; + name = "keditbookmarks-19.08.0.tar.xz"; }; }; kfind = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kfind-19.04.3.tar.xz"; - sha256 = "2fcb5af039d976161ed09d87cb7c909bd2854647ea15688203b90dbebc54447f"; - name = "kfind-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kfind-19.08.0.tar.xz"; + sha256 = "25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff"; + name = "kfind-19.08.0.tar.xz"; }; }; kfloppy = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kfloppy-19.04.3.tar.xz"; - sha256 = "7f3a206b6f4cd03771d8fba94423bf749a2b8e6bb4dfd01f30502d1ab08f1d8e"; - name = "kfloppy-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kfloppy-19.08.0.tar.xz"; + sha256 = "312345286fa1dba2cac782523d95c1e4ed0d7ef272c93c5d7bf2f9d8f635fa82"; + name = "kfloppy-19.08.0.tar.xz"; }; }; kfourinline = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kfourinline-19.04.3.tar.xz"; - sha256 = "62a163f9c2034deba3daa93c4ac07c476895514ec9fefdd9a0792726a61d066f"; - name = "kfourinline-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kfourinline-19.08.0.tar.xz"; + sha256 = "f84ad6a3e0b2ecbb8c8ab7f451e9534f47627d9d90ff21f188df23dfd23ce22e"; + name = "kfourinline-19.08.0.tar.xz"; }; }; kgeography = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kgeography-19.04.3.tar.xz"; - sha256 = "a94742602100e989b4dbbfa37c8bde99054710f28a1679ad458ee65de0db8b7e"; - name = "kgeography-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kgeography-19.08.0.tar.xz"; + sha256 = "83eb429851360d848e3e028ef2748a9d66470b8f3dc3bf66fbbfd08b534a7a75"; + name = "kgeography-19.08.0.tar.xz"; }; }; kget = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kget-19.04.3.tar.xz"; - sha256 = "9620ca07792e8a8d9bcb2069d36b665f2aa21d2428f109d825a663ccb6c12e25"; - name = "kget-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kget-19.08.0.tar.xz"; + sha256 = "4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b"; + name = "kget-19.08.0.tar.xz"; }; }; kgoldrunner = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kgoldrunner-19.04.3.tar.xz"; - sha256 = "f1325580ebd91dcac9a79e66f939b372e7ea8264ef8671098471055f297110a8"; - name = "kgoldrunner-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kgoldrunner-19.08.0.tar.xz"; + sha256 = "db203add309e10902a0e2b770929bf002b22ab78668ea432ecbf4497dfdc06b6"; + name = "kgoldrunner-19.08.0.tar.xz"; }; }; kgpg = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kgpg-19.04.3.tar.xz"; - sha256 = "740ad342cfa1edf1c7cbbe8d15789533d5003dda5bf3899687eb4182b582236d"; - name = "kgpg-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kgpg-19.08.0.tar.xz"; + sha256 = "3aa31f524c7f8ab50a86d83066590b98cd4ffbeb94b5a6fb7dadec9fe3072845"; + name = "kgpg-19.08.0.tar.xz"; }; }; khangman = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/khangman-19.04.3.tar.xz"; - sha256 = "f2fd0d70c405ebd158f3e11a52cd1e268b1238fdada674b2f59b46324d2610a8"; - name = "khangman-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/khangman-19.08.0.tar.xz"; + sha256 = "ff14cefbd78f047b6250ec3cf4d11e13484f30cc5610616c0a9270008b36f1a1"; + name = "khangman-19.08.0.tar.xz"; }; }; khelpcenter = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/khelpcenter-19.04.3.tar.xz"; - sha256 = "d18e0960859d72d9c2ebf187a9f5b1b65a8c78032e32df0d6eb0cce73921e972"; - name = "khelpcenter-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/khelpcenter-19.08.0.tar.xz"; + sha256 = "36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f"; + name = "khelpcenter-19.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kidentitymanagement-19.04.3.tar.xz"; - sha256 = "4bbe8bffe0624b516d102354197c508ff1a83b6280036f5ab100e7897b99e8da"; - name = "kidentitymanagement-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kidentitymanagement-19.08.0.tar.xz"; + sha256 = "9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d"; + name = "kidentitymanagement-19.08.0.tar.xz"; }; }; kig = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kig-19.04.3.tar.xz"; - sha256 = "05566395ce58c6c049d797f579362d52b612ab1718b111f7a054e9e3ae229459"; - name = "kig-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kig-19.08.0.tar.xz"; + sha256 = "ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee"; + name = "kig-19.08.0.tar.xz"; }; }; kigo = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kigo-19.04.3.tar.xz"; - sha256 = "be91e9fa965505515c36733f260120e6c2ca7fe4856622f03bda07d7a0595ef0"; - name = "kigo-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kigo-19.08.0.tar.xz"; + sha256 = "0100195b3289b88b9813e453fc7ec6229a648718a6525bb3e6d0e0c0ead97595"; + name = "kigo-19.08.0.tar.xz"; }; }; killbots = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/killbots-19.04.3.tar.xz"; - sha256 = "4295853c0ee137474a3a8c193d4b038f020504a37a6ab3daf81cf4d43ed5d656"; - name = "killbots-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/killbots-19.08.0.tar.xz"; + sha256 = "909ce7808251a5d0537e2d35fae944b932973c36035f1c08f3143227e2d5cf4f"; + name = "killbots-19.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kimagemapeditor-19.04.3.tar.xz"; - sha256 = "a7e5ba3d85c09c446e37baeac1c149395381b542fbbb1ab642645f631b5ab2de"; - name = "kimagemapeditor-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kimagemapeditor-19.08.0.tar.xz"; + sha256 = "e2c0b75b65176a9ccbdccbae57be90ee8084593a64bee10b133787077affbde9"; + name = "kimagemapeditor-19.08.0.tar.xz"; }; }; kimap = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kimap-19.04.3.tar.xz"; - sha256 = "58ed8471dc7e9c43e7bdb61c791e3bb612b2473bf0fb8f67857cb6fa72ddcf35"; - name = "kimap-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kimap-19.08.0.tar.xz"; + sha256 = "d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060"; + name = "kimap-19.08.0.tar.xz"; }; }; kio-extras = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kio-extras-19.04.3.tar.xz"; - sha256 = "b65cb37a5965782a9eaae80840fdd7e06505aece33cc6774510c65e1fea3f55b"; - name = "kio-extras-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kio-extras-19.08.0.tar.xz"; + sha256 = "792a6a6d1ea2457dda10aedc6cefd3518064c8f47c62f9c3c4a508442b83d3cd"; + name = "kio-extras-19.08.0.tar.xz"; + }; + }; + kipi-plugins = { + version = "19.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/19.08.0/src/kipi-plugins-19.08.0.tar.xz"; + sha256 = "21fb6b997aeeeb462fd83ff90a36597b5c74b5711a837959f1e6cdc9a300c4e9"; + name = "kipi-plugins-19.08.0.tar.xz"; }; }; kirigami-gallery = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kirigami-gallery-19.04.3.tar.xz"; - sha256 = "cd5bba6cf50b820492b5df6606288b9944f640634bba03d2d4e40279d5c4d1a4"; - name = "kirigami-gallery-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kirigami-gallery-19.08.0.tar.xz"; + sha256 = "e32f596c188911336060838c071f7856aba02438b335f107bf057644948cf9d6"; + name = "kirigami-gallery-19.08.0.tar.xz"; }; }; kiriki = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kiriki-19.04.3.tar.xz"; - sha256 = "ccb33616936c879aa61fdbaa87ae130c4f22c34b70cdd9b38b128bace850466e"; - name = "kiriki-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kiriki-19.08.0.tar.xz"; + sha256 = "42f69734c0268f4c3c4ed0b915318d9570d599c6a0fd8a2a02597f1e31cd50d7"; + name = "kiriki-19.08.0.tar.xz"; }; }; kiten = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kiten-19.04.3.tar.xz"; - sha256 = "c2e7fc12e305eeddc031de02254295427117b3a3910b8d5bcfc6ff97855f8fbc"; - name = "kiten-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kiten-19.08.0.tar.xz"; + sha256 = "891ccf6c610099c63045aedccee4d1ac87c5189066fd2763e0743a40b2538b53"; + name = "kiten-19.08.0.tar.xz"; }; }; kitinerary = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kitinerary-19.04.3.tar.xz"; - sha256 = "c2e9d1ae70797968382538da98bc8f9555e0d8d13faeb739bdadb5844c989227"; - name = "kitinerary-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kitinerary-19.08.0.tar.xz"; + sha256 = "76db853705b87015a934334985c216d11b48e853a3dd31429abb3bc6bd7f52e6"; + name = "kitinerary-19.08.0.tar.xz"; }; }; kjumpingcube = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kjumpingcube-19.04.3.tar.xz"; - sha256 = "03feb2c3e0f46f1ca4f4d24ce8fd350c607bfaf52f715abbf379709d8d0a6818"; - name = "kjumpingcube-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kjumpingcube-19.08.0.tar.xz"; + sha256 = "d72c1164777f27b7711a0b74575ba38a9e34fca45c22915e10e7e792f7c00b33"; + name = "kjumpingcube-19.08.0.tar.xz"; }; }; kldap = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kldap-19.04.3.tar.xz"; - sha256 = "6b4bf8e69e6c372f60f746f2a6c453262283e25643a97192eef3c07c5c8d94df"; - name = "kldap-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kldap-19.08.0.tar.xz"; + sha256 = "4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16"; + name = "kldap-19.08.0.tar.xz"; }; }; kleopatra = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kleopatra-19.04.3.tar.xz"; - sha256 = "a6265e182d480a146464751bf34e3430804dfbc954c09ff85bac15273aa1c033"; - name = "kleopatra-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kleopatra-19.08.0.tar.xz"; + sha256 = "161e6f7cf39aadfc856446642bf4c95c97b21647ba90698b17ab557e9c9e70ef"; + name = "kleopatra-19.08.0.tar.xz"; }; }; klettres = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/klettres-19.04.3.tar.xz"; - sha256 = "ba8498a28af8534083b2ea3eab5ada7b57deffe49673ef0e4ef278023e8b96af"; - name = "klettres-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/klettres-19.08.0.tar.xz"; + sha256 = "0a680ff0c2c3868a2478da0e2a5eb8db8579e5ba9165743c8a2c20704c062be4"; + name = "klettres-19.08.0.tar.xz"; }; }; klickety = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/klickety-19.04.3.tar.xz"; - sha256 = "27b05ed8522ff353b4327f79ec069c453fc4545d2a07ca11fc53e53647841fe9"; - name = "klickety-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/klickety-19.08.0.tar.xz"; + sha256 = "aad8c7b9e4c07ca8bd64beae71330e51d45dcaa9929a9ce56b7c675fc9e583f0"; + name = "klickety-19.08.0.tar.xz"; }; }; klines = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/klines-19.04.3.tar.xz"; - sha256 = "a0d133a9a08e8f3953ae54b7da187c56cfbc518bfeadac4f32b82c9aa4f33c8b"; - name = "klines-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/klines-19.08.0.tar.xz"; + sha256 = "c49ff3c4bb1612d5699c4a3b0613c6599cf23c0baa79806b8616dbea757d48f8"; + name = "klines-19.08.0.tar.xz"; }; }; kmag = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmag-19.04.3.tar.xz"; - sha256 = "4fad3d4414884fa8fb7dcfb27e7cc4207dfe219819ffda75355de5c1b4981e35"; - name = "kmag-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmag-19.08.0.tar.xz"; + sha256 = "7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4"; + name = "kmag-19.08.0.tar.xz"; }; }; kmahjongg = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmahjongg-19.04.3.tar.xz"; - sha256 = "41bd533bf8d8b1e04451cb3c9165b08f9135603c0085d8b402d0e8e026b8ed00"; - name = "kmahjongg-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmahjongg-19.08.0.tar.xz"; + sha256 = "f601963d0670639a11c4100ed1f53a0e308f79ddf98e1b4fc6a0a4674e117f22"; + name = "kmahjongg-19.08.0.tar.xz"; }; }; kmail = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmail-19.04.3.tar.xz"; - sha256 = "8e1d45741a9fab9848a659ab05497f82d79f7ffe3a42f121cb5136b1fcae833f"; - name = "kmail-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmail-19.08.0.tar.xz"; + sha256 = "052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28"; + name = "kmail-19.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmail-account-wizard-19.04.3.tar.xz"; - sha256 = "a8cc19b30198459cb0fd74fb0d789a012354b4a9952a14312508af7079f92291"; - name = "kmail-account-wizard-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmail-account-wizard-19.08.0.tar.xz"; + sha256 = "5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622"; + name = "kmail-account-wizard-19.08.0.tar.xz"; }; }; kmailtransport = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmailtransport-19.04.3.tar.xz"; - sha256 = "2a3115a81f2c85c42345ee6380ea1c28129be5dd5a518270c6ec1062ea22abc5"; - name = "kmailtransport-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmailtransport-19.08.0.tar.xz"; + sha256 = "cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd"; + name = "kmailtransport-19.08.0.tar.xz"; }; }; kmbox = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmbox-19.04.3.tar.xz"; - sha256 = "4025f1ef0288f2c30e64d8eb02bde117f1ee482b760bef52aa71faedc500733f"; - name = "kmbox-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmbox-19.08.0.tar.xz"; + sha256 = "6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228"; + name = "kmbox-19.08.0.tar.xz"; }; }; kmime = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmime-19.04.3.tar.xz"; - sha256 = "a6fe422eddb15eb52fbacde97b45ec6752b60f46149657a3bb7f48dc899e1c02"; - name = "kmime-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmime-19.08.0.tar.xz"; + sha256 = "1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75"; + name = "kmime-19.08.0.tar.xz"; }; }; kmines = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmines-19.04.3.tar.xz"; - sha256 = "34b23a66121183272a58f2cb38b798cab4f290d9f04546418ddb4b2b20e262a1"; - name = "kmines-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmines-19.08.0.tar.xz"; + sha256 = "290efbc208d2fa6ad5552fe8c0679fd0669f4abf6dc31fafd267bd9444add981"; + name = "kmines-19.08.0.tar.xz"; }; }; kmix = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmix-19.04.3.tar.xz"; - sha256 = "d08a0d40fb9a7a3f032f8995dbd9260777119b249669323447fa2575e44e3bf9"; - name = "kmix-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmix-19.08.0.tar.xz"; + sha256 = "3d9cf6dcb35ded0091d16f5e9f4cb384ae21ea4065547b52d5f13f199d3d7b08"; + name = "kmix-19.08.0.tar.xz"; }; }; kmousetool = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmousetool-19.04.3.tar.xz"; - sha256 = "15c4e02c02a993d2724320b6625e9a44d5658c47136dd9a9895897893305dbd0"; - name = "kmousetool-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmousetool-19.08.0.tar.xz"; + sha256 = "3b2f5a4fcc3231c249923431059285e3f8371f7c8d53fcaea76dec3945a13b09"; + name = "kmousetool-19.08.0.tar.xz"; }; }; kmouth = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmouth-19.04.3.tar.xz"; - sha256 = "712e21cc8cb45880b02c9cf5aa3a1bb2d54f9a2e09d1bbd2667eb99beded64dc"; - name = "kmouth-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmouth-19.08.0.tar.xz"; + sha256 = "608479db4b2a98ecd17bdc1b1ef20203f492647b43311e903fb10338a59e0098"; + name = "kmouth-19.08.0.tar.xz"; }; }; kmplot = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kmplot-19.04.3.tar.xz"; - sha256 = "8c312235076fdad431fc68dc3e8be18ab8317e8a6efb6e6170958cb7495ab479"; - name = "kmplot-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmplot-19.08.0.tar.xz"; + sha256 = "66384c96ba1e82b32427a873f944d5efa915bb2bf7d9ee886c94f368bd1f5e94"; + name = "kmplot-19.08.0.tar.xz"; }; }; knavalbattle = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/knavalbattle-19.04.3.tar.xz"; - sha256 = "468e3fc16e17d3cbde2e213a46dcb07d1ea030a1522f40ab10b429254b8249af"; - name = "knavalbattle-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knavalbattle-19.08.0.tar.xz"; + sha256 = "7fbf132662e12f785390dbef7086dad5372ebaea8f8c3f55c24fe37bf17df35e"; + name = "knavalbattle-19.08.0.tar.xz"; }; }; knetwalk = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/knetwalk-19.04.3.tar.xz"; - sha256 = "d211a1bbc3a4f57dbea73da11d4ff351150de2ca6bd06251c2775a4e16601489"; - name = "knetwalk-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knetwalk-19.08.0.tar.xz"; + sha256 = "135e8c3b0d46eda0eda2429c6fa89226cba184fb7357b86a3d3101797a7a8c96"; + name = "knetwalk-19.08.0.tar.xz"; }; }; knights = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/knights-19.04.3.tar.xz"; - sha256 = "ab2e01ee6e309bf5221333168b58cf41c20ad5a5e70beeb31520d4076f6153e5"; - name = "knights-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knights-19.08.0.tar.xz"; + sha256 = "1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c"; + name = "knights-19.08.0.tar.xz"; }; }; knotes = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/knotes-19.04.3.tar.xz"; - sha256 = "8c269a5db708d623a7e36799d43204146b44f9de65f6e09a00782b1b62bf41fd"; - name = "knotes-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knotes-19.08.0.tar.xz"; + sha256 = "578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030"; + name = "knotes-19.08.0.tar.xz"; }; }; kolf = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kolf-19.04.3.tar.xz"; - sha256 = "c7a352332a2ff8e856bcf09e3bd0bfa8670e140da2e43e894ecf9f022fcef020"; - name = "kolf-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kolf-19.08.0.tar.xz"; + sha256 = "1a2a7e9809fd6551518d1393dcfd365976b06ddf17aaa1056a36e8f167e7db5a"; + name = "kolf-19.08.0.tar.xz"; }; }; kollision = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kollision-19.04.3.tar.xz"; - sha256 = "8374313b4bf4590ba051051fb6510774862690468719e8425addcdfd9daeff91"; - name = "kollision-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kollision-19.08.0.tar.xz"; + sha256 = "24a8ae084443359d59c16cbbafc450bbc467bd8b2a2516572e70ef24823750fd"; + name = "kollision-19.08.0.tar.xz"; }; }; kolourpaint = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kolourpaint-19.04.3.tar.xz"; - sha256 = "7ba4089fe55c870b54ff44bd423eebe50303b0324c4b421589115c4d1d349cac"; - name = "kolourpaint-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kolourpaint-19.08.0.tar.xz"; + sha256 = "00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d"; + name = "kolourpaint-19.08.0.tar.xz"; }; }; kompare = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kompare-19.04.3.tar.xz"; - sha256 = "4dcb419336826ac1b8d37135ec153da585f8cebfdc9b6574c6abb866c277c8d0"; - name = "kompare-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kompare-19.08.0.tar.xz"; + sha256 = "695c4096c3ac15ab38e5cfb4114f9425c8ccb2f618a65b5f36f3ddee5edec212"; + name = "kompare-19.08.0.tar.xz"; }; }; konqueror = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/konqueror-19.04.3.tar.xz"; - sha256 = "257488e521c024fb6c8fdbef71aaccd9315505c8b14c6ffde0ce4060a48579b4"; - name = "konqueror-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/konqueror-19.08.0.tar.xz"; + sha256 = "cc37709dcf183c68effb5332c29527b13fe7aae78216b84680ef6cc73192f971"; + name = "konqueror-19.08.0.tar.xz"; }; }; konquest = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/konquest-19.04.3.tar.xz"; - sha256 = "cdf061ca7f2a3c30fd24b1bada2c9854ed4cb58232fbd5c999cb66602bc3d15b"; - name = "konquest-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/konquest-19.08.0.tar.xz"; + sha256 = "94919dce58182859f7e720ece73be81b5bafc359afdc1c29f4f45a3b24155e60"; + name = "konquest-19.08.0.tar.xz"; }; }; konsole = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/konsole-19.04.3.tar.xz"; - sha256 = "20cadcda75a22ce7b4cb19240a16c9b286fa6ed836f352b8b337fb418e9a3b4c"; - name = "konsole-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/konsole-19.08.0.tar.xz"; + sha256 = "4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e"; + name = "konsole-19.08.0.tar.xz"; }; }; kontact = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kontact-19.04.3.tar.xz"; - sha256 = "05fab6c512635b07b6c99b3ee38d9e53060d44124052734381e9a6ddbef06e73"; - name = "kontact-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kontact-19.08.0.tar.xz"; + sha256 = "e47d3b4133e24b1c90a3a15f99a77cef442eefa0f2570dd34d5a9e302e845d9b"; + name = "kontact-19.08.0.tar.xz"; }; }; kontactinterface = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kontactinterface-19.04.3.tar.xz"; - sha256 = "d541daab32bddd6727b795d280be668be9da801ef7267159ea030f998b52ca74"; - name = "kontactinterface-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kontactinterface-19.08.0.tar.xz"; + sha256 = "e490fb4dc0e762d4f12a837ecbddc2f14276672d8f46d10029987222b372f3bc"; + name = "kontactinterface-19.08.0.tar.xz"; }; }; kopete = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kopete-19.04.3.tar.xz"; - sha256 = "038c6385d6b2b6d1f35c5c337ebd8c492eea3e4a27d6f7236fd2fee219a7f28a"; - name = "kopete-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kopete-19.08.0.tar.xz"; + sha256 = "ef777cc2840db7fc462c3b00a8a289be3db3786ff16ae51ac9a988621848d7b7"; + name = "kopete-19.08.0.tar.xz"; }; }; korganizer = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/korganizer-19.04.3.tar.xz"; - sha256 = "b2bae3a41994794a9c4d9ddfe10695edb0fee103f14ee607c31aec42c9e5d06c"; - name = "korganizer-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/korganizer-19.08.0.tar.xz"; + sha256 = "fbb6db9e517f7065ed978c6356989a38cea0c9520693d5e67fa04d8cfa625722"; + name = "korganizer-19.08.0.tar.xz"; }; }; kpat = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kpat-19.04.3.tar.xz"; - sha256 = "ca9d53d400a2be3ca421d6d916cafeff3b9dcf220e627a1762f96817e952e8e2"; - name = "kpat-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kpat-19.08.0.tar.xz"; + sha256 = "1d68ac9094ad8f9bf0487daced786508f96ce2a63fd8d9884c2d03960fda9328"; + name = "kpat-19.08.0.tar.xz"; }; }; kpimtextedit = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kpimtextedit-19.04.3.tar.xz"; - sha256 = "e71e0c4dc666db23a1cfcbe202d37cac3b0c5fd966c3edbdd88c85ed2e983f24"; - name = "kpimtextedit-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kpimtextedit-19.08.0.tar.xz"; + sha256 = "45fcc5898e921c41eb28bb64ddd6d8240f4261360b9149a149ae4c281844dfcb"; + name = "kpimtextedit-19.08.0.tar.xz"; }; }; kpkpass = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kpkpass-19.04.3.tar.xz"; - sha256 = "ee602c3176f141bf83d20d0ab277d26306a8b13ac105ec5594cfc8835d838a55"; - name = "kpkpass-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kpkpass-19.08.0.tar.xz"; + sha256 = "1555856e987d3667eea8a210e3dd592742ca953dfa2d381e50bc9670183e7137"; + name = "kpkpass-19.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kqtquickcharts-19.04.3.tar.xz"; - sha256 = "18f51bd61d8ab28832355b69082bb63a0efa3cf720918d5e7ff434e2219c17f5"; - name = "kqtquickcharts-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kqtquickcharts-19.08.0.tar.xz"; + sha256 = "6b25edca7643287acaf436ba58124077b89d067e2881a5dbfbd8833b68f3cb05"; + name = "kqtquickcharts-19.08.0.tar.xz"; }; }; krdc = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/krdc-19.04.3.tar.xz"; - sha256 = "2458858d3e4d00ca2a95151ff7433d3a1726518f9a28281d5e1bb90855132426"; - name = "krdc-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/krdc-19.08.0.tar.xz"; + sha256 = "62c995dc1b6eabf2486d475ad089cb3e286d37c6927e4c5bd2455489f52a3e75"; + name = "krdc-19.08.0.tar.xz"; }; }; kreversi = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kreversi-19.04.3.tar.xz"; - sha256 = "25325dee759916c803f2c43b8f97152257b0fcb90f9687d4f916c132ae956af4"; - name = "kreversi-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kreversi-19.08.0.tar.xz"; + sha256 = "1dbfcce80813c238d5a9084ffcde828b0abeb7b370cfb1e82b55de75a5f02ba9"; + name = "kreversi-19.08.0.tar.xz"; }; }; krfb = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/krfb-19.04.3.tar.xz"; - sha256 = "6f1fd97b294150c017adebf18cb04dd1d554f5ece0d761e11131ecc549ee35b7"; - name = "krfb-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/krfb-19.08.0.tar.xz"; + sha256 = "1142e493a37ce867b069ac278215377b56061b2412ee2dd46b0db456fb1419d4"; + name = "krfb-19.08.0.tar.xz"; }; }; kross-interpreters = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kross-interpreters-19.04.3.tar.xz"; - sha256 = "f72e5418c522122bffcc8c8ae28ef912a34b1444b5c3626b74be3452cf92461f"; - name = "kross-interpreters-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kross-interpreters-19.08.0.tar.xz"; + sha256 = "d0cda357a32d755d6eba373871c0903a5e6ee5f63289aa6f40c623e985453ecd"; + name = "kross-interpreters-19.08.0.tar.xz"; }; }; kruler = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kruler-19.04.3.tar.xz"; - sha256 = "58aa7dc6713647efa4dc0996c28736b614f2b88241f92fb21b60e662c7087a86"; - name = "kruler-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kruler-19.08.0.tar.xz"; + sha256 = "a78d054359b559b612dd1dac8f0974f554fb7a52bd8de7152de88866719f9226"; + name = "kruler-19.08.0.tar.xz"; }; }; kshisen = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kshisen-19.04.3.tar.xz"; - sha256 = "3109a0bdb8933eebf10b945a75fc8b355aa8c97d5debd28943d8145a80efe2fe"; - name = "kshisen-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kshisen-19.08.0.tar.xz"; + sha256 = "f591834b26ff622c995be81acdb07b6d25cf2e25745688a7c162d0b92532066d"; + name = "kshisen-19.08.0.tar.xz"; }; }; ksirk = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ksirk-19.04.3.tar.xz"; - sha256 = "d91e6c34ac284e7f7e95d07d2f94852cb6ef549dd7e00f404ea40e22a4d2802b"; - name = "ksirk-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksirk-19.08.0.tar.xz"; + sha256 = "a929c6b10a01d765c8702afc1fa8e77ada7357cf8064c45cff34623d23a2c94c"; + name = "ksirk-19.08.0.tar.xz"; }; }; ksmtp = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ksmtp-19.04.3.tar.xz"; - sha256 = "8d5eae342468f128fe1311b4797c9533b6017b9fb0901fb4c0d09bb73e39d02e"; - name = "ksmtp-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksmtp-19.08.0.tar.xz"; + sha256 = "2947d49f183fe25dc340dd3fa6145c85b1896c8adb08bab9966e1f99a927a003"; + name = "ksmtp-19.08.0.tar.xz"; }; }; ksnakeduel = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ksnakeduel-19.04.3.tar.xz"; - sha256 = "05b5c7f0f4ed21ac2926bbe9d2b3913ed8b512863837c3b83754c1048fe0cd04"; - name = "ksnakeduel-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksnakeduel-19.08.0.tar.xz"; + sha256 = "51799e15ce35237cf410bfd69cca40eeea6ec75ac3b3b98686b44028e8fd2b0b"; + name = "ksnakeduel-19.08.0.tar.xz"; }; }; kspaceduel = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kspaceduel-19.04.3.tar.xz"; - sha256 = "c6a0e64f6c3149b408d3d11435388b6cd7760c2b1a4ead03a72215ca7fbadae0"; - name = "kspaceduel-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kspaceduel-19.08.0.tar.xz"; + sha256 = "fcd3b90e5a61cb27753cbacf4699c156317cfe30d50732f1f89ac4973dfb39f2"; + name = "kspaceduel-19.08.0.tar.xz"; }; }; ksquares = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ksquares-19.04.3.tar.xz"; - sha256 = "d85c90f883c3ce1559dd0d3ceb20500563704cf6d1824c5fea3ddce0e1ca7563"; - name = "ksquares-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksquares-19.08.0.tar.xz"; + sha256 = "649a89da0a928c8977218a76023044205b20f07af9b3abda042e46bc450bd00f"; + name = "ksquares-19.08.0.tar.xz"; }; }; ksudoku = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ksudoku-19.04.3.tar.xz"; - sha256 = "608ffcde2d0bad3e2a19d7842c47b41627d009721a4e3161ccf2736f7777e922"; - name = "ksudoku-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksudoku-19.08.0.tar.xz"; + sha256 = "0f773ce70fbc05f30285b7123c5e28fe241ff56677c5b80c1201238bdbc375f8"; + name = "ksudoku-19.08.0.tar.xz"; }; }; ksystemlog = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ksystemlog-19.04.3.tar.xz"; - sha256 = "7d155c91d57e253c00f038100e136e4bf6eb4d709549d689608ee0026354a965"; - name = "ksystemlog-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksystemlog-19.08.0.tar.xz"; + sha256 = "1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259"; + name = "ksystemlog-19.08.0.tar.xz"; }; }; kteatime = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kteatime-19.04.3.tar.xz"; - sha256 = "49a404223896bd3df976e0c155a6907936f52721fc7da14289998b9d1ea372ba"; - name = "kteatime-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kteatime-19.08.0.tar.xz"; + sha256 = "3be9667867ef41a638c8f97fefb213b078b0ba3171add881438588bc8afba342"; + name = "kteatime-19.08.0.tar.xz"; }; }; ktimer = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktimer-19.04.3.tar.xz"; - sha256 = "c282a02019f7b1f69eae09b564481ed7526c7c836155b1eed2b22fb01fcaf563"; - name = "ktimer-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktimer-19.08.0.tar.xz"; + sha256 = "c7f684b9c7f0c92638153fabdfdb1082c900a8da2f660eeebe4b8b3b669f8c8d"; + name = "ktimer-19.08.0.tar.xz"; }; }; ktnef = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktnef-19.04.3.tar.xz"; - sha256 = "ef0760dc31cad222f73a56d5098ffa9bff0e4c68a26f6f85ad542bb4f8dd3693"; - name = "ktnef-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktnef-19.08.0.tar.xz"; + sha256 = "54b2e09a872e8f8e4e8a1ef77975b1d063ef0d07999b1bf2a696675659e6d52f"; + name = "ktnef-19.08.0.tar.xz"; }; }; ktouch = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktouch-19.04.3.tar.xz"; - sha256 = "dce3f72204f43ddde109a39fca65f2936e9d9db686e6b3edf8ae04bc9c1c0e55"; - name = "ktouch-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktouch-19.08.0.tar.xz"; + sha256 = "23ae45be76371fa40aac875551b5de8956a2d2b0980024bd788b8b7835b902ba"; + name = "ktouch-19.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-accounts-kcm-19.04.3.tar.xz"; - sha256 = "1c2f411bc161bbf08276bd3a12329f11f233e84e3e04cb632a2096c6e4d03afb"; - name = "ktp-accounts-kcm-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-accounts-kcm-19.08.0.tar.xz"; + sha256 = "f849b7a9b2cee5b328e726dd254b1e606b740e5b75cdc59a1ea18601e131c0b5"; + name = "ktp-accounts-kcm-19.08.0.tar.xz"; }; }; ktp-approver = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-approver-19.04.3.tar.xz"; - sha256 = "40796bfd2644b1d43f6ecd3ce48298240af53967485283fa8d9cd330e8377b74"; - name = "ktp-approver-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-approver-19.08.0.tar.xz"; + sha256 = "8662a7b3e4f67a5ed2faa12187faef9dd7e056ee9f2d4b69d68f7a381e258e85"; + name = "ktp-approver-19.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-auth-handler-19.04.3.tar.xz"; - sha256 = "f65ceba1958b846f24894d57e180cf80f94ddad289713965f2abfd1ec8d91292"; - name = "ktp-auth-handler-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-auth-handler-19.08.0.tar.xz"; + sha256 = "5674ebf51565854262b5ae0a5fbf8d0837c87b016ea5b32f56f96aa8583a7e39"; + name = "ktp-auth-handler-19.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-call-ui-19.04.3.tar.xz"; - sha256 = "e747049eefe80f7fccf4639c2bb1ed294538dc79e17a2ed395003d213a64821c"; - name = "ktp-call-ui-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-call-ui-19.08.0.tar.xz"; + sha256 = "1f7922a1920770decfd3e17aaf42e46db60b5c3660efc544a9be743d9a85d08f"; + name = "ktp-call-ui-19.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-common-internals-19.04.3.tar.xz"; - sha256 = "43bcf817c3269251578e16fb9519668683e6efe4e33f453e13f5ef95fd96a9aa"; - name = "ktp-common-internals-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-common-internals-19.08.0.tar.xz"; + sha256 = "bdbf20e4e0ad7ba7bdc76a0087ff7307cf813c711da6fba3acb0104756ef1559"; + name = "ktp-common-internals-19.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-list-19.04.3.tar.xz"; - sha256 = "c74903c4d099f4a138fa3cb4758460b2fdf49292070439e4da6194c0cc486c2f"; - name = "ktp-contact-list-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-list-19.08.0.tar.xz"; + sha256 = "e6ba69a5a8a6b841e5babd8cb7ddb0a799d34b881ab4bdd0495062a23e59d3e1"; + name = "ktp-contact-list-19.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-contact-runner-19.04.3.tar.xz"; - sha256 = "30551ec0419e978f43d25f1a9b48d07429a14cde0feba58a08ad452a2f2d3b0e"; - name = "ktp-contact-runner-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-runner-19.08.0.tar.xz"; + sha256 = "2a90784f7f266399c41a2b64cdb4ae748fca6739c026beed6bfef91b037c2b28"; + name = "ktp-contact-runner-19.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-desktop-applets-19.04.3.tar.xz"; - sha256 = "826dd1e28e3fc7f730dbbe465183fc5df3bc1be67c89ccc8615607de783cc91d"; - name = "ktp-desktop-applets-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-desktop-applets-19.08.0.tar.xz"; + sha256 = "56562f335767e1071b36e7e31474a371b862785babeb4f5181b48065f6513221"; + name = "ktp-desktop-applets-19.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-filetransfer-handler-19.04.3.tar.xz"; - sha256 = "a2408806c9a3a50a7f04bb9106d27ba62e4b0e670957e6630a7841a191b5ca9c"; - name = "ktp-filetransfer-handler-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-filetransfer-handler-19.08.0.tar.xz"; + sha256 = "a3a298058e5f6d135abac474a4cd788cea16ccfb4763948f007b6f769fd47de4"; + name = "ktp-filetransfer-handler-19.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-kded-module-19.04.3.tar.xz"; - sha256 = "dbbb1876c55e8bef22cde4bb59395ae6d4d01dd851368a5f293c5f7e2aed25e4"; - name = "ktp-kded-module-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-kded-module-19.08.0.tar.xz"; + sha256 = "a225a4e16cb18b19c5750d27c7a3834bbbe362c40c7cad8a9e500488682d67cc"; + name = "ktp-kded-module-19.08.0.tar.xz"; }; }; ktp-send-file = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-send-file-19.04.3.tar.xz"; - sha256 = "1ef4f7099e571e2a1f5fbaaf802d1002f14f5a644d5054b4b850a292bbb676c6"; - name = "ktp-send-file-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-send-file-19.08.0.tar.xz"; + sha256 = "d69e48d1f69e04618c97f8e83e8909e97d3f1793fff41277bb883885a8c9da8f"; + name = "ktp-send-file-19.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktp-text-ui-19.04.3.tar.xz"; - sha256 = "cf21be1ee61e5b4703feacab093f89aa66f126aba248b71111281513ba65661a"; - name = "ktp-text-ui-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-text-ui-19.08.0.tar.xz"; + sha256 = "1858215d519efdcf4a0e4ef771e0d0a33f7c918ce2b70fbc95a56b61d240855a"; + name = "ktp-text-ui-19.08.0.tar.xz"; }; }; ktuberling = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/ktuberling-19.04.3.tar.xz"; - sha256 = "7abc2254d7a5c594e021807172486dfd93cfbda827a1b41583f8b1977a1a4f21"; - name = "ktuberling-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktuberling-19.08.0.tar.xz"; + sha256 = "ca751ad3cc06475955fa9cb037a1a60539f59b7e3d22aa7d47e9fd4f2771cd5f"; + name = "ktuberling-19.08.0.tar.xz"; }; }; kturtle = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kturtle-19.04.3.tar.xz"; - sha256 = "811df4d31b920a2b3a6a0420df68e97e68b4226defd97d264f0b0b05c775c469"; - name = "kturtle-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kturtle-19.08.0.tar.xz"; + sha256 = "0e7453e785344a792747b5d51d2c4a190d41e87ddf7e0a9ea49d107a2dd03db8"; + name = "kturtle-19.08.0.tar.xz"; }; }; kubrick = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kubrick-19.04.3.tar.xz"; - sha256 = "ee2932136e6bb7c9b03d0014c6ec845fb789668035ef22b2235dad23e6a5e4c7"; - name = "kubrick-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kubrick-19.08.0.tar.xz"; + sha256 = "3a69a6d9a519db9fd25793d532da561a77e7033d71cd3dc67d0ee48c332b71c3"; + name = "kubrick-19.08.0.tar.xz"; }; }; kwalletmanager = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kwalletmanager-19.04.3.tar.xz"; - sha256 = "b7eafd7ce252396bba0609d4114f88e0d1956e9f0f7f9703000eadda0cd7cc0e"; - name = "kwalletmanager-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kwalletmanager-19.08.0.tar.xz"; + sha256 = "aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471"; + name = "kwalletmanager-19.08.0.tar.xz"; }; }; kwave = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kwave-19.04.3.tar.xz"; - sha256 = "dc9ad96a59b4bab1cd8f04401b3d87883cf888711898fdfc20d96113faf92431"; - name = "kwave-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kwave-19.08.0.tar.xz"; + sha256 = "60f5408e9a67e934c67332b9a9643513f35946796d1ccf70369e411f804b1043"; + name = "kwave-19.08.0.tar.xz"; }; }; kwordquiz = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/kwordquiz-19.04.3.tar.xz"; - sha256 = "fc1a5a4780f667a805c17bda05d7024702d20d0e6aa552a0b7b6840b6e6cb381"; - name = "kwordquiz-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kwordquiz-19.08.0.tar.xz"; + sha256 = "ed4278c1ca0e6e7da548e563a4248fa9e0ff0707b67e06e53ae26dbc2069fc71"; + name = "kwordquiz-19.08.0.tar.xz"; }; }; libgravatar = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libgravatar-19.04.3.tar.xz"; - sha256 = "23f8d50c5831ec1df995d6d711a590eb4f7de2823971ea5692aea50707c54bea"; - name = "libgravatar-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libgravatar-19.08.0.tar.xz"; + sha256 = "f8dd753abdc868623b878433c0b2ed53d4d4ab2cb62c69cb94c433e51cb713a9"; + name = "libgravatar-19.08.0.tar.xz"; }; }; libkcddb = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkcddb-19.04.3.tar.xz"; - sha256 = "6471261ffef0e1546317040c4275a6fc11c131fde7229b5d0c9358a40442bec3"; - name = "libkcddb-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkcddb-19.08.0.tar.xz"; + sha256 = "f97b90660bfd403aa64be8e6221a89087f74ab443431a9f692fe14cc90d82151"; + name = "libkcddb-19.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkcompactdisc-19.04.3.tar.xz"; - sha256 = "9294aa908f158437241e27d57f924a2b7a07aa4203a51b83566de8c9690e86bc"; - name = "libkcompactdisc-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkcompactdisc-19.08.0.tar.xz"; + sha256 = "cc940df2a1e499965fe05b466c60014082d205f0ae606562980e6088d714eac5"; + name = "libkcompactdisc-19.08.0.tar.xz"; }; }; libkdcraw = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkdcraw-19.04.3.tar.xz"; - sha256 = "5017a47a76346e183e57617e093d5b61780bf564df55a07d02b1d75e2ff98c2d"; - name = "libkdcraw-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkdcraw-19.08.0.tar.xz"; + sha256 = "5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1"; + name = "libkdcraw-19.08.0.tar.xz"; }; }; libkdegames = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkdegames-19.04.3.tar.xz"; - sha256 = "187aa81539113bc6786d861e1f5302fa17533ae1108299bbd1a86be18accfbc4"; - name = "libkdegames-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkdegames-19.08.0.tar.xz"; + sha256 = "cb1135a86b373543410f3eb0677aed033bad2b8ef60130753c699338e0c22d1b"; + name = "libkdegames-19.08.0.tar.xz"; }; }; libkdepim = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkdepim-19.04.3.tar.xz"; - sha256 = "d3719c533df0b0fe8800a7810ee39f108d8408b909e5fb583ee2ab7ed4b4a6e9"; - name = "libkdepim-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkdepim-19.08.0.tar.xz"; + sha256 = "4ff394bda799ebe700d12d60ab8171c64e054c6acb105870cd955b5ddce42eab"; + name = "libkdepim-19.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkeduvocdocument-19.04.3.tar.xz"; - sha256 = "e0e229607c47b5da028588b9a22ffe41cf3e35d7e4f849eb109d9ce6c537277d"; - name = "libkeduvocdocument-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkeduvocdocument-19.08.0.tar.xz"; + sha256 = "7b0314bc1f06a4ea4cbb4b4b203a9a0f4a0370f355f8def4398dc452075f6fcf"; + name = "libkeduvocdocument-19.08.0.tar.xz"; }; }; libkexiv2 = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkexiv2-19.04.3.tar.xz"; - sha256 = "b0c5da0e23e93a218f7e96f98a753b36e2d608e74ac68c687ae868b6de99d1e6"; - name = "libkexiv2-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkexiv2-19.08.0.tar.xz"; + sha256 = "42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15"; + name = "libkexiv2-19.08.0.tar.xz"; }; }; libkgapi = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkgapi-19.04.3.tar.xz"; - sha256 = "0fa879280979775523f258c80ec17c58045f812cbc6961b994ab78974a75afac"; - name = "libkgapi-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkgapi-19.08.0.tar.xz"; + sha256 = "bc8a54e0997f4e3e0e840e350c6a9dee26582028415c5e9863d53a3280faa9f6"; + name = "libkgapi-19.08.0.tar.xz"; }; }; libkgeomap = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkgeomap-19.04.3.tar.xz"; - sha256 = "9266af7950b4cd73b694d61cf7bc0d03fc27d2bde3015f4c698e6d5d480d17bd"; - name = "libkgeomap-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkgeomap-19.08.0.tar.xz"; + sha256 = "267c3bb6d033dcbcfabb6822eebc69410de2d13b792ce62af47034bbcf3a5e54"; + name = "libkgeomap-19.08.0.tar.xz"; }; }; libkipi = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkipi-19.04.3.tar.xz"; - sha256 = "7da2a62e719b27221a74232375c907087be9a53b90fce0f7d36cbc11d7c13f7c"; - name = "libkipi-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkipi-19.08.0.tar.xz"; + sha256 = "94b184c3128fe7ded9e816e2a6124ee0dcf016b1325636dd41b157866b461989"; + name = "libkipi-19.08.0.tar.xz"; }; }; libkleo = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkleo-19.04.3.tar.xz"; - sha256 = "6c4ad79234c8a3cbe5cb0b5a6e7a11ccec98c5c5058bd970e44419ccab8663de"; - name = "libkleo-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkleo-19.08.0.tar.xz"; + sha256 = "a0a022f3da4d8f73c020ab55221c74d5c1590b2cbdb3b754218be17622a59cc6"; + name = "libkleo-19.08.0.tar.xz"; }; }; libkmahjongg = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkmahjongg-19.04.3.tar.xz"; - sha256 = "995f10fc62c506dbbb31bdab635fd52cb08e03eb09c859353aaf3423f48c7381"; - name = "libkmahjongg-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkmahjongg-19.08.0.tar.xz"; + sha256 = "b51aea6773b609cc1c3a297e72e15b7b504c2877938030e1afac86319e855694"; + name = "libkmahjongg-19.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libkomparediff2-19.04.3.tar.xz"; - sha256 = "35f45f48c9c6afb32ade11985ca9e886e8f77a7428e2ce6650e119c3f29ce9b7"; - name = "libkomparediff2-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkomparediff2-19.08.0.tar.xz"; + sha256 = "d86765e6514bdcf838ed36ae5968f9b2b7cb2e74f4fe884ae87f58b9bcc963fe"; + name = "libkomparediff2-19.08.0.tar.xz"; }; }; libksane = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libksane-19.04.3.tar.xz"; - sha256 = "ec9c0a969806fefcefc0fda2e227bf0908e2b338fdf3377870a910d7f041e1e0"; - name = "libksane-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libksane-19.08.0.tar.xz"; + sha256 = "62c670c316a47facbd0beedb0fcc35247fbbd285892a90ab06ebb8f74b8a6329"; + name = "libksane-19.08.0.tar.xz"; }; }; libksieve = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/libksieve-19.04.3.tar.xz"; - sha256 = "5853f1b3764872a26b21064f8c23dd4ec66e453648c1aefa510f22af780e3289"; - name = "libksieve-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libksieve-19.08.0.tar.xz"; + sha256 = "48d0925a8dd0adfa6ccd4945b14e2e562b8855faa6bed43de0442a273fd41966"; + name = "libksieve-19.08.0.tar.xz"; }; }; lokalize = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/lokalize-19.04.3.tar.xz"; - sha256 = "ec8c552a176d131140273f975958e29f3a476c840cab0c470db072cc850e85c8"; - name = "lokalize-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/lokalize-19.08.0.tar.xz"; + sha256 = "bb51159c803890af82a38e5a4bd4df0895cc34ed68fa8ed3a4c66adafc9ea6b6"; + name = "lokalize-19.08.0.tar.xz"; }; }; lskat = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/lskat-19.04.3.tar.xz"; - sha256 = "4e31cbad9534838c3fe380fd1326f56158dcc2b3a63a1e4c05529dcc9fc9b703"; - name = "lskat-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/lskat-19.08.0.tar.xz"; + sha256 = "b321f58772eab7f569c76ff4afb56b1e3324dc5febf45bf5ed90993cf38696b5"; + name = "lskat-19.08.0.tar.xz"; }; }; mailcommon = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/mailcommon-19.04.3.tar.xz"; - sha256 = "b38a23d2d59fed22dfcabeb9430b962c021fd62fd7e48d12ad3610b4d3a162fa"; - name = "mailcommon-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/mailcommon-19.08.0.tar.xz"; + sha256 = "6c69b70356d9d96578c3fd472aaa36e33feb0677d7e65c36981c0596daf3aea3"; + name = "mailcommon-19.08.0.tar.xz"; }; }; mailimporter = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/mailimporter-19.04.3.tar.xz"; - sha256 = "17483bf5d57936179f13abcee347aadadcc17d2cf40c1e2a3b5f2b6d85db87ec"; - name = "mailimporter-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/mailimporter-19.08.0.tar.xz"; + sha256 = "242f1a93b3521abc68ca8e1abfc75acd0b59e1e2d553df80a057645102246dd7"; + name = "mailimporter-19.08.0.tar.xz"; }; }; marble = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/marble-19.04.3.tar.xz"; - sha256 = "b2451d338bf433d5a0211c954f48fb5c6c80fecbb8fa69d604276fecb45fe826"; - name = "marble-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/marble-19.08.0.tar.xz"; + sha256 = "c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1"; + name = "marble-19.08.0.tar.xz"; }; }; mbox-importer = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/mbox-importer-19.04.3.tar.xz"; - sha256 = "68160ddd977c7f8f771b2934e57ec15042508a92461ca9d233312546d8d2c537"; - name = "mbox-importer-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/mbox-importer-19.08.0.tar.xz"; + sha256 = "e03fd814c70b15fca3b5dd2cde1dcece436b831ceb04323d7ffcca66daf3ce1c"; + name = "mbox-importer-19.08.0.tar.xz"; }; }; messagelib = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/messagelib-19.04.3.tar.xz"; - sha256 = "c97f88152593a031415148daa31384c56964973d4291aa86a892b2776333e223"; - name = "messagelib-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/messagelib-19.08.0.tar.xz"; + sha256 = "0797b11452874a1d8264f92e8cc6d6977f3b0416dc66ff558b124bf2a52b118d"; + name = "messagelib-19.08.0.tar.xz"; }; }; minuet = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/minuet-19.04.3.tar.xz"; - sha256 = "6d4614b7b42391c8b68627b879f61f59c22942ff1b340a25f75d90e296cdeb33"; - name = "minuet-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/minuet-19.08.0.tar.xz"; + sha256 = "3827a7e8dd3c48e12521fd0aa76eccbeaf9f2627935f19647f2147e87db63554"; + name = "minuet-19.08.0.tar.xz"; }; }; okular = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/okular-19.04.3.tar.xz"; - sha256 = "87ab5ffd852109d549d021b8fe94b9a4de212b2f164e9cc796b144732ff94282"; - name = "okular-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/okular-19.08.0.tar.xz"; + sha256 = "721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec"; + name = "okular-19.08.0.tar.xz"; }; }; palapeli = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/palapeli-19.04.3.tar.xz"; - sha256 = "7cbf7a1666e16a476de9bdab7155f17f2224baa7db9d80cd77c785dead6f2e10"; - name = "palapeli-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/palapeli-19.08.0.tar.xz"; + sha256 = "fcdefb41685728cd9e01cc3249d2676a589f61a611e32c2e1a2e3d4d30721dde"; + name = "palapeli-19.08.0.tar.xz"; }; }; parley = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/parley-19.04.3.tar.xz"; - sha256 = "4c4aeaae4f1dd4193c422c5921d9cf02216fc6670f5077fcd92b4d48378fa720"; - name = "parley-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/parley-19.08.0.tar.xz"; + sha256 = "d3c8f8e7ceee62ffa9b95dbf539a509260b5f759fadd136a966d90a67e8a94a4"; + name = "parley-19.08.0.tar.xz"; }; }; picmi = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/picmi-19.04.3.tar.xz"; - sha256 = "1e47527b49f8d94da0a6ea492d23215ae7ff3fcb403116abe43665efb567beab"; - name = "picmi-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/picmi-19.08.0.tar.xz"; + sha256 = "1d7a6152b05ad22f98762a5a6cd96edbc03ae63bdbc0154f387dc5cce31243eb"; + name = "picmi-19.08.0.tar.xz"; }; }; pimcommon = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/pimcommon-19.04.3.tar.xz"; - sha256 = "b979ba19d0c5c7d4f218992bfe434fdc9b49bd8cfdee0d25e4c44bbddc793fee"; - name = "pimcommon-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/pimcommon-19.08.0.tar.xz"; + sha256 = "23be57010127831c3ad9b9475e467e8078ff92410c80609660498c5dc6fbaf9a"; + name = "pimcommon-19.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/pim-data-exporter-19.04.3.tar.xz"; - sha256 = "33bc76f798849b4421563d3d7989ae72182ad75573e176469e785d08a867b653"; - name = "pim-data-exporter-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/pim-data-exporter-19.08.0.tar.xz"; + sha256 = "f5ff68dcbad1df7ea132b409b70b9b4269badb26e28b4b7cd50239172507f7d8"; + name = "pim-data-exporter-19.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/pim-sieve-editor-19.04.3.tar.xz"; - sha256 = "331eff69a144cb7f71bba2533bd2690f26bfb56adb796dc1adaa9c5f41db4e09"; - name = "pim-sieve-editor-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/pim-sieve-editor-19.08.0.tar.xz"; + sha256 = "1ea0cc219d6776968d81ff1a606a9a11e1714f864fda9f00a13a5d7c84b45b46"; + name = "pim-sieve-editor-19.08.0.tar.xz"; }; }; poxml = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/poxml-19.04.3.tar.xz"; - sha256 = "844ccecc8db4c6da4b84a4829cdd1961603a09fd5ee18dfda73a9def78addefe"; - name = "poxml-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/poxml-19.08.0.tar.xz"; + sha256 = "82393645a5f97890bba866554c0e05d7b216f0ed7eafea00fe1c2708ac12e0b2"; + name = "poxml-19.08.0.tar.xz"; }; }; print-manager = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/print-manager-19.04.3.tar.xz"; - sha256 = "5ab32527d6916c1063bf175a1515a0cebb0dfb93844881c4339b2ee690697907"; - name = "print-manager-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/print-manager-19.08.0.tar.xz"; + sha256 = "56fe89f6bc3be64848adee20a22c712ba8f72602e28fb3288cd5328797e32c7b"; + name = "print-manager-19.08.0.tar.xz"; }; }; rocs = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/rocs-19.04.3.tar.xz"; - sha256 = "eec0f7ab55f81946dafa2e31ee92a2bec5c1727e64bdeb8e7566c61f66e53d01"; - name = "rocs-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/rocs-19.08.0.tar.xz"; + sha256 = "2e9346781bb6198a3fb3c3357ef796c0e86fdd104146de87a481619d3cbe78fe"; + name = "rocs-19.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/signon-kwallet-extension-19.04.3.tar.xz"; - sha256 = "bddf5fe036b95769ad9ff02a9583b7f96280e9a48db4abc92f98e4d163f7daa9"; - name = "signon-kwallet-extension-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/signon-kwallet-extension-19.08.0.tar.xz"; + sha256 = "f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f"; + name = "signon-kwallet-extension-19.08.0.tar.xz"; }; }; spectacle = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/spectacle-19.04.3.tar.xz"; - sha256 = "bbf2c17298608dc69139f1f0a07de05b724d83cf57e8fe085a376723d83d15d1"; - name = "spectacle-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/spectacle-19.08.0.tar.xz"; + sha256 = "8ada4f765f81ee496f9fd00b74764690df9c479e343a035e363f7159f93c35a4"; + name = "spectacle-19.08.0.tar.xz"; }; }; step = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/step-19.04.3.tar.xz"; - sha256 = "a9b2daff1c9821e9c0fa79d39fc15b96753a3d0c61863d76d07e4e3222b0a4a2"; - name = "step-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/step-19.08.0.tar.xz"; + sha256 = "7a2dc38617822c8118c721ccaaa9907ec3e109eacf57e46b599c6731b325a993"; + name = "step-19.08.0.tar.xz"; }; }; svgpart = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/svgpart-19.04.3.tar.xz"; - sha256 = "5dd870a24f275b6d8e0ec9593da713c29b521234d1eb07415726d57ae3fb8dc5"; - name = "svgpart-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/svgpart-19.08.0.tar.xz"; + sha256 = "7e1f4b3f8807e996b2acb496971bd7ebcb1e456ac090e269e42d15fce629858d"; + name = "svgpart-19.08.0.tar.xz"; }; }; sweeper = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/sweeper-19.04.3.tar.xz"; - sha256 = "03b0ed0006da9a9ee02b9e3201e4974444fba00a5a59fc14ca179656eeb86aaf"; - name = "sweeper-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/sweeper-19.08.0.tar.xz"; + sha256 = "3cab8817b5c52bd0064e49e6062d3295328604d96e355779a766075d5ae10764"; + name = "sweeper-19.08.0.tar.xz"; }; }; umbrello = { - version = "19.04.3"; + version = "19.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/19.08.0/src/umbrello-19.08.0.tar.xz"; + sha256 = "8df6e0394670ee3f91f449a3110312a37876d3aa047442ed8439d8b876a6b0e2"; + name = "umbrello-19.08.0.tar.xz"; + }; + }; + yakuake = { + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/umbrello-19.04.3.tar.xz"; - sha256 = "a507f31087c0103873e78004bc47b632d8cd7cdda2734e342a19da48d0c3780c"; - name = "umbrello-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/yakuake-19.08.0.tar.xz"; + sha256 = "f0931fffbcd6f17687f13ab766e628961c6caf6dcf8cad79f6e311a0b5692a49"; + name = "yakuake-19.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.04.3"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.3/src/zeroconf-ioslave-19.04.3.tar.xz"; - sha256 = "83c6fa651c6601c9b5e4f085e34fa0de5e88dda2420f95e88996ffad11303d7f"; - name = "zeroconf-ioslave-19.04.3.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/zeroconf-ioslave-19.08.0.tar.xz"; + sha256 = "0fbe1e0d1c30cc570d96e6a5aa12692bd8e5d11bfd4b9af5077f4c5e80c8f183"; + name = "zeroconf-ioslave-19.08.0.tar.xz"; }; }; } -- GitLab From 2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 10:16:18 +0200 Subject: [PATCH 47/92] kde_applications: disable obsolete patches --- pkgs/applications/kde/ark/default.nix | 10 +--------- pkgs/applications/kde/kate.nix | 10 +--------- pkgs/applications/kde/kmail.nix | 12 ++---------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 96332cc9168..6015cb69d77 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, config, fetchpatch, + mkDerivation, lib, config, extra-cmake-modules, kdoctools, @@ -27,14 +27,6 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # This patch should be backported in 19.04.4 KDE applications - (fetchpatch { - url = "https://cgit.kde.org/ark.git/patch/?id=7065c5390c78c2b18807721490f19c62761220e5"; - sha256 = "0sipw5z60gk6l025rk4xsbc10n3bvv9743f4cbvf6hyy4mbm4p1m"; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libarchive libzip ] ++ extraTools; diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index 7051bac404b..95ff6cf198b 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, lib, extra-cmake-modules, kdoctools, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, @@ -14,14 +14,6 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # This patch should be backported in 19.04.4 KDE applications - (fetchpatch { - url = "https://cgit.kde.org/kate.git/patch/?id=76ec8b55a86a29a90125b2ff3f512df007789cb1"; - sha256 = "1q0bkb6vl4xvh4aba1rlqii4a75pvl7vbcs4plny8lalzslnbzhj"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index b08444f18bb..a58b3b8c45d 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, fetchpatch, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim, @@ -26,13 +26,5 @@ mkDerivation { libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; - patches = [ - ./kmail.patch - - # This patch should be backported in 19.04.4 KDE applications - (fetchpatch { - url = "https://cgit.kde.org/kmail.git/patch/?id=28a8cf907b3cd903aef0b963314df219afc6b66a"; - sha256 = "1gr94zmxnyhhyqjhcmm8aykvmf15pmn751cvdh4ll59rzbra8h0n"; - }) - ]; + patches = [ ./kmail.patch ]; } -- GitLab From fc7f5e7c5530844e6e28dd4cddb2d96314cac091 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 10:31:50 +0200 Subject: [PATCH 48/92] yakuake: move to kde_applications --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/yakuake.nix | 32 ++++++++++ pkgs/applications/misc/yakuake/default.nix | 69 ---------------------- pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 34 insertions(+), 74 deletions(-) create mode 100644 pkgs/applications/kde/yakuake.nix delete mode 100644 pkgs/applications/misc/yakuake/default.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 01df2bd2631..44d9293047f 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -171,6 +171,7 @@ let pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; + yakuake = callPackage ./yakuake.nix {}; # Okteta was removed from kde applications and will now be released independently # Lets keep an alias for compatibility reasons inherit okteta; diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix new file mode 100644 index 00000000000..6f9c8df3001 --- /dev/null +++ b/pkgs/applications/kde/yakuake.nix @@ -0,0 +1,32 @@ +{ + mkDerivation, lib, kdoctools, extra-cmake-modules, + karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications, + knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras +}: + +mkDerivation { + name = "yakuake"; + + buildInputs = [ + karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications + knotifyconfig kparts kwindowsystem qtx11extras + ]; + + propagatedBuildInputs = [ + karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications + knotifyconfig kparts kwindowsystem + ]; + + propagatedUserEnvPkgs = [ konsole ]; + + nativeBuildInputs = [ + extra-cmake-modules kdoctools + ]; + + meta = { + homepage = https://yakuake.kde.org; + description = "Quad-style terminal emulator for KDE"; + maintainers = with lib.maintainers; [ fridh ]; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix deleted file mode 100644 index a3d32f1597f..00000000000 --- a/pkgs/applications/misc/yakuake/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ mkDerivation -, lib -, fetchurl -, kdoctools -, wrapGAppsHook -, extra-cmake-modules -, karchive -, kcrash -, kdbusaddons -, ki18n -, kiconthemes -, knewstuff -, knotifications -, knotifyconfig -, konsole -, kparts -, kwindowsystem -, qtx11extras -}: - -mkDerivation rec { - pname = "yakuake"; - version = "3.0.5"; - - src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8"; - }; - - buildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - qtx11extras - ]; - - propagatedBuildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - ]; - - propagatedUserEnvPkgs = [ konsole ]; - - nativeBuildInputs = [ - extra-cmake-modules kdoctools wrapGAppsHook - ]; - - meta = { - homepage = https://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - maintainers = with lib.maintainers; [ fridh ]; - license = lib.licenses.gpl2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14e313e6c4c..de1d645fa3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18978,7 +18978,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog - keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole + keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -21571,10 +21571,6 @@ in yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { }; - yakuake = libsForQt5.callPackage ../applications/misc/yakuake { - inherit (kdeApplications) konsole; - }; - yarp = callPackage ../applications/science/robotics/yarp {}; yarssr = callPackage ../applications/misc/yarssr { }; -- GitLab From 6d5a90a111912cb6e533ae05f0cf902c4dcbe5ff Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 10:32:16 +0200 Subject: [PATCH 49/92] kipi-plugins: move to kde_applications --- .../graphics/kipi-plugins/default.nix | 30 ------------------- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kipi-plugins.nix | 23 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/graphics/kipi-plugins/default.nix create mode 100644 pkgs/applications/kde/kipi-plugins.nix diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix deleted file mode 100644 index de51422d1da..00000000000 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenv, fetchurl, - extra-cmake-modules, - karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, - libkipi, qtbase, qtsvg, qtxmlpatterns -}: - -stdenv.mkDerivation rec { - pname = "kipi-plugins"; - version = "5.9.1"; - - src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0hjm05nkz0w926sn4lav5258rda6zkd6gfnqd8hh3fa2q0dd7cq4"; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi - qtbase qtsvg qtxmlpatterns - ]; - - meta = { - description = "Plugins for KDE-based image applications"; - license = stdenv.lib.licenses.gpl2; - homepage = https://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 44d9293047f..f21d14f94a1 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -116,6 +116,7 @@ let kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; + kipi-plugins = callPackage ./kipi-plugins.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix new file mode 100644 index 00000000000..5fb953acbd6 --- /dev/null +++ b/pkgs/applications/kde/kipi-plugins.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, + libkipi, qtbase, qtsvg, qtxmlpatterns +}: + +mkDerivation { + name = "kipi-plugins"; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi + qtbase qtsvg qtxmlpatterns + ]; + + meta = { + description = "Plugins for KDE-based image applications"; + license = lib.licenses.gpl2; + homepage = https://cgit.kde.org/kipi-plugins.git; + maintainers = with lib.maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de1d645fa3a..ef46b185dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19031,8 +19031,6 @@ in ffmpeg = ffmpeg_2; }; - kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { }; - kitty = callPackage ../applications/misc/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; -- GitLab From 3400620cc37aad3cabb37d68ae23e4481e425d77 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 13:52:03 +0200 Subject: [PATCH 50/92] akonadi: update patch akonadi-paths Version 19.08 introduce a new mPgUpgradePath variable. I applied what was done for the mServerPath variable. --- ...adi-installation-properly-relocatabl.patch | 31 +++-- .../kde/akonadi/akonadi-paths.patch | 109 ++++++++---------- .../kde/akonadi/akonadi-timestamps.patch | 8 +- pkgs/applications/kde/akonadi/default.nix | 1 + 4 files changed, 67 insertions(+), 82 deletions(-) diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch index 24ed20fd83f..c3964c5c05b 100644 --- a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch +++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch @@ -9,11 +9,11 @@ This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. KF5AkonadiConfig.cmake.in | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9788bea94..15bad00fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -285,9 +285,6 @@ configure_package_config_file( +Index: akonadi-19.08.0/CMakeLists.txt +=================================================================== +--- akonadi-19.08.0.orig/CMakeLists.txt ++++ akonadi-19.08.0/CMakeLists.txt +@@ -306,9 +306,6 @@ configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} @@ -23,13 +23,13 @@ index 9788bea94..15bad00fd 100644 ) install(FILES -diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in -index 75abede50..10f039376 100644 ---- a/KF5AkonadiConfig.cmake.in -+++ b/KF5AkonadiConfig.cmake.in -@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@") - find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@") - find_dependency(Qt5Network "@QT_REQUIRED_VERSION@") +Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in +=================================================================== +--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in ++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in +@@ -26,8 +26,8 @@ if(BUILD_TESTING) + find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") + endif() -set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") -set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") @@ -38,15 +38,12 @@ index 75abede50..10f039376 100644 find_dependency(Boost "@Boost_MINIMUM_VERSION@") -@@ -22,7 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) +@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") - + #################################################################################### # CMAKE_AUTOMOC --- -2.15.1 - diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index fcbbbbb72eb..ba6bbedeeae 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -1,8 +1,8 @@ -diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp -index d85c1a79b..8df02710c 100644 ---- a/src/akonadicontrol/agentmanager.cpp -+++ b/src/akonadicontrol/agentmanager.cpp -@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent) +Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, mStorageController = new Akonadi::ProcessControl; mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); @@ -17,11 +17,11 @@ index d85c1a79b..8df02710c 100644 } } -diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp -index be1cc4afb..6d0c1d7e5 100644 ---- a/src/akonadicontrol/agentprocessinstance.cpp -+++ b/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) +Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A } else { Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); const QStringList arguments = QStringList() << executable << identifier(); @@ -30,11 +30,11 @@ index be1cc4afb..6d0c1d7e5 100644 mController->start(agentLauncherExec, arguments); } return true; -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index dfff6fc29..419e54a5b 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings) +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -42,7 +42,7 @@ index dfff6fc29..419e54a5b 100644 QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett #endif const bool defaultInternalServer = true; @@ -59,8 +59,8 @@ index dfff6fc29..419e54a5b 100644 + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN - defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings) + defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") +@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett #endif } @@ -73,7 +73,7 @@ index dfff6fc29..419e54a5b 100644 qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -82,7 +82,7 @@ index dfff6fc29..419e54a5b 100644 mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -92,7 +92,7 @@ index dfff6fc29..419e54a5b 100644 qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -102,7 +102,7 @@ index dfff6fc29..419e54a5b 100644 settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer() +@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer( #endif // generate config file @@ -111,56 +111,35 @@ index dfff6fc29..419e54a5b 100644 const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { -diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp -index 6b50ae50e..f94a8c5eb 100644 ---- a/src/server/storage/dbconfigpostgresql.cpp -+++ b/src/server/storage/dbconfigpostgresql.cpp -@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings) +Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp +@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; - QString defaultServerPath; QString defaultInitDbPath; +- QString defaultPgUpgradePath; QString defaultPgData; -@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings) + #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows +@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { -- QStringList postgresSearchPath; +- const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql")); - --#ifdef POSTGRES_PATH -- const QString dir(QStringLiteral(POSTGRES_PATH)); -- if (QDir(dir).exists()) { -- postgresSearchPath << QStringLiteral(POSTGRES_PATH); -- } --#endif -- postgresSearchPath << QStringLiteral("/usr/bin") -- << QStringLiteral("/usr/sbin") -- << QStringLiteral("/usr/local/sbin"); -- // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed -- // sorted order, so we search from the newest one to the oldest. -- QStringList postgresVersionedSearchPaths; -- QDir versionedDir(QStringLiteral("/usr/lib/postgresql")); -- if (versionedDir.exists()) { -- const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed); -- for (const auto &path : versionedDirs) { -- // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed -- if (path.fileName().startsWith(QLatin1String("10."))) { -- postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin")); -- } else { -- postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin")); -- } -- } -- } -- postgresSearchPath.append(postgresVersionedSearchPaths); -- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath); -- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths); +- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths); + defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); +- defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings) + +@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -172,7 +151,18 @@ index 6b50ae50e..f94a8c5eb 100644 qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { -@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings) + mInitDbPath = defaultInitDbPath; + } + qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath; +- mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString(); +- if (mInternalServer && mPgUpgradePath.isEmpty()) { +- mPgUpgradePath = defaultPgUpgradePath; +- } ++ mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE); + qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; + mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); + if (mPgData.isEmpty()) { +@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings settings.setValue(QStringLiteral("Port"), mHostPort); } settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -180,6 +170,3 @@ index 6b50ae50e..f94a8c5eb 100644 settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); --- -2.18.1 - diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch index 25a835f5ba2..e299a6991f0 100644 --- a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch +++ b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch @@ -1,8 +1,8 @@ -Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp =================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer( +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer( bool confUpdate = false; QFile actualFile(actualConfig); // update conf only if either global (or local) is newer than actual diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index cba0b1e59e3..b9a96394a67 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -25,6 +25,7 @@ mkDerivation { ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"'' ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"'' ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' + ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"'' ]; preConfigure = '' -- GitLab From a4fc84de44c4edad7fcf303944bcb874180c1bf3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Aug 2019 17:50:28 +0200 Subject: [PATCH 51/92] rustc: 1.36.0 -> 1.37.0 --- .../rust/{binaryBuild.nix => binary.nix} | 2 ++ pkgs/development/compilers/rust/bootstrap.nix | 18 +++++++++--------- pkgs/development/compilers/rust/rustc.nix | 5 ++--- 3 files changed, 13 insertions(+), 12 deletions(-) rename pkgs/development/compilers/rust/{binaryBuild.nix => binary.nix} (98%) diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binary.nix similarity index 98% rename from pkgs/development/compilers/rust/binaryBuild.nix rename to pkgs/development/compilers/rust/binary.nix index cb2fba96e18..acccc749686 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -60,6 +60,8 @@ rec { # are very hard to track down. For details, see # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 ''; + + setupHooks = ./setup-hook.sh; }; cargo = stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 973d17e1c7b..5cf48715dae 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.35.0"; + version = "1.36.0"; - # fetch hashes by running `print-hashes.sh 1.34.2` + # fetch hashes by running `print-hashes.sh 1.36.0` hashes = { - i686-unknown-linux-gnu = "05337776b3645e4b8c8c7ced0bcd1615cf9ad1b9c8b3d0f333620e5401e31aee"; - x86_64-unknown-linux-gnu = "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c"; - armv7-unknown-linux-gnueabihf = "8f0f32d8ddc6fb7bcb8f50ec5e694078799d93facbf135eec5bd9a8c94d0c11e"; - aarch64-unknown-linux-gnu = "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952"; - i686-apple-darwin = "6a45ae8db094c5f6c57c5594a00f1a92b08c444a7347a657b4033186d4f08b19"; - x86_64-apple-darwin = "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6"; + i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d"; + x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55"; + armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb"; + aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d"; + i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60"; + x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325"; }; platform = @@ -35,7 +35,7 @@ let sha256 = hashes."${platform}"; }; -in callPackage ./binaryBuild.nix +in callPackage ./binary.nix { inherit version src platform; versionType = "bootstrap"; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d7776958390..78d276c1f16 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -17,11 +17,11 @@ let llvmShared = llvm_7.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; - version = "1.36.0"; + version = "1.37.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"; + sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"; }; __darwinAllowLocalNetworking = true; @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 stripDebugList = [ "bin" ]; - NIX_LDFLAGS = # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" -- GitLab From d945117959745f456e71cc837ae7ca8a86eedae3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 14:11:09 +0200 Subject: [PATCH 52/92] kcalc: add new MPFR dependency --- pkgs/applications/kde/kcalc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 3cb89cb4daa..4e2a308b17f 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, gmp, kconfig, kconfigwidgets, kcrash, kguiaddons, ki18n, kinit, - knotifications, kxmlgui, + knotifications, kxmlgui, mpfr, }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gmp kconfig kconfigwidgets kcrash kguiaddons ki18n kinit knotifications - kxmlgui + kxmlgui mpfr ]; } -- GitLab From 5d0acaa67734d531faf3c0bccd44cfe472f229ac Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 14:54:13 +0200 Subject: [PATCH 53/92] kpurpose: add missing kirigami2 dependency --- pkgs/development/libraries/kde-frameworks/purpose.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 147c4123a10..1484b2d0489 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, extra-cmake-modules, qtbase -, qtdeclarative, kconfig, kcoreaddons, ki18n, kio +, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2 }: mkDerivation { @@ -9,6 +9,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtdeclarative kconfig kcoreaddons - ki18n kio + ki18n kio kirigami2 ]; } -- GitLab From 1b820c24e3301930c281b2b3bafcc9397cc8acce Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 14:54:58 +0200 Subject: [PATCH 54/92] pimcommon: add new kpurpose dependency --- pkgs/applications/kde/pimcommon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index bbbcca13d98..cd9ff2528fa 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -4,7 +4,7 @@ akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, - kwallet, kwindowsystem, libkdepim, qtwebengine + kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit - kwallet kwindowsystem libkdepim qtwebengine + kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ akonadi akonadi-contacts kconfig kcontacts kimap -- GitLab From b7a828031238b0962cd91131eba50844ef401b93 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Aug 2019 15:05:14 +0200 Subject: [PATCH 55/92] rustc: Provide compiler-rt sources This is needed to build libprofiler_builtins now. https://github.com/rust-lang/rust/commit/e59f0cc0d33f3098a883661227c0c14def403cfd#diff-daf9539767b10f18e1517f65cdc2e0e2 https://github.com/rust-lang-nursery/compiler-builtins/issues/295 --- pkgs/development/compilers/rust/rustc.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 78d276c1f16..daf7af1babd 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python2, tzdata, ps -, llvm_7, darwin, git, cmake, rustPlatform +, llvmPackages_7, darwin, git, cmake, rustPlatform , which, libffi, gdb , withBundledLLVM ? false }: @@ -9,13 +9,17 @@ let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; }; + llvmPackages = llvmPackages_7; + + llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; }; # For use at runtime - llvmShared = llvm_7.override { enableSharedLibraries = true; }; -in stdenv.mkDerivation rec { + llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; }; +in + +stdenv.mkDerivation rec { pname = "rustc"; version = "1.37.0"; @@ -24,6 +28,12 @@ in stdenv.mkDerivation rec { sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"; }; + # Provide the compiler-rt sources needed for profiling. + preConfigure = '' + mkdir src/llvm-project/compiler-rt + tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1 + ''; + __darwinAllowLocalNetworking = true; # rustc complains about modified source files otherwise -- GitLab From d6ab8baa1bba68800fa6b7b743a96011d2633ab3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 16 Aug 2019 15:28:31 +0200 Subject: [PATCH 56/92] kde: add myself as maintainer --- pkgs/applications/kde/default.nix | 2 +- pkgs/desktops/plasma-5/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f21d14f94a1..6027d8daa9d 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -60,7 +60,7 @@ let inherit mkDerivation; # Team of maintainers assigned to the KDE PIM suite - kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; + kdepimTeam = with lib.maintainers; [ ttuegel vandenoever nyanloutre ]; }; in { akonadi = callPackage ./akonadi {}; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index d1bd9e957f7..07c6805c689 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -86,7 +86,7 @@ let lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; homepage = http://www.kde.org; } // (args.meta or {}); in diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 7745d78f8fc..e8a7aa7322f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -77,7 +77,7 @@ let license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; platforms = lib.platforms.linux; } // (args.meta or {}); -- GitLab From c814d72b517bb201c8bbbfc64e386c7023352886 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 13 Aug 2019 21:52:01 +0000 Subject: [PATCH 57/92] treewide: name -> pname --- pkgs/applications/altcoins/aeon/default.nix | 3 ++- pkgs/applications/audio/abcde/default.nix | 3 ++- pkgs/applications/audio/caudec/default.nix | 3 ++- .../applications/audio/clementine/default.nix | 6 ++++-- pkgs/applications/audio/ekho/default.nix | 5 +++-- pkgs/applications/audio/faust/faust1.nix | 3 ++- pkgs/applications/audio/faust/faust2.nix | 3 ++- .../default.nix | 3 ++- pkgs/applications/audio/gradio/default.nix | 3 ++- .../audio/midisheetmusic/default.nix | 3 ++- pkgs/applications/audio/mpc123/default.nix | 5 +++-- .../applications/audio/openmpt123/default.nix | 3 ++- pkgs/applications/audio/pmidi/default.nix | 3 ++- pkgs/applications/audio/rhvoice/default.nix | 3 ++- pkgs/applications/audio/sayonara/default.nix | 3 ++- pkgs/applications/audio/spotify/default.nix | 3 ++- .../audio/tree-from-tags/default.nix | 3 ++- pkgs/applications/audio/uade123/default.nix | 3 ++- pkgs/applications/audio/vmpk/default.nix | 5 +++-- .../display-managers/lightdm/gtk-greeter.nix | 5 +++-- .../display-managers/sddm/default.nix | 3 ++- .../editors/emacs-modes/d/default.nix | 3 ++- .../editors/emacs-modes/haskell/default.nix | 3 ++- .../editors/emacs-modes/hsc3/default.nix | 3 ++- .../emacs-modes/ido-ubiquitous/default.nix | 3 ++- .../emacs-modes/markdown-mode/default.nix | 3 ++- .../editors/emacs-modes/ocaml/default.nix | 3 ++- .../rainbow-delimiters/default.nix | 3 ++- .../editors/emacs-modes/rudel/default.nix | 3 ++- .../editors/emacs-modes/s/default.nix | 3 ++- .../editors/emacs-modes/tuareg/default.nix | 3 ++- .../editors/emacs-modes/writegood/default.nix | 3 ++- pkgs/applications/editors/geany/default.nix | 5 +++-- pkgs/applications/editors/jedit/default.nix | 3 ++- .../editors/kodestudio/default.nix | 3 ++- .../applications/editors/netbeans/default.nix | 3 ++- pkgs/applications/editors/rstudio/default.nix | 5 +++-- .../editors/standardnotes/default.nix | 3 ++- pkgs/applications/editors/texmacs/darwin.nix | 3 ++- .../graphics/awesomebump/default.nix | 3 ++- .../graphics/draftsight/default.nix | 3 ++- .../applications/graphics/fig2dev/default.nix | 3 ++- .../applications/graphics/gcolor2/default.nix | 3 ++- .../applications/graphics/gcolor3/default.nix | 3 ++- .../applications/graphics/guetzli/default.nix | 3 ++- .../graphics/synfigstudio/default.nix | 6 ++++-- .../graphics/unigine-valley/default.nix | 3 ++- pkgs/applications/graphics/xfig/default.nix | 3 ++- .../misc/asciiquarium/default.nix | 3 ++- .../misc/bashSnippets/default.nix | 3 ++- .../misc/bitcoinarmory/default.nix | 3 ++- pkgs/applications/misc/cardpeek/default.nix | 3 ++- pkgs/applications/misc/confclerk/default.nix | 3 ++- pkgs/applications/misc/cura/stable.nix | 3 ++- pkgs/applications/misc/curaengine/stable.nix | 3 ++- .../misc/dfilemanager/default.nix | 3 ++- pkgs/applications/misc/fetchmail/default.nix | 3 ++- pkgs/applications/misc/gmrun/default.nix | 5 +++-- pkgs/applications/misc/gmtp/default.nix | 3 ++- .../applications/misc/googleearth/default.nix | 3 ++- pkgs/applications/misc/gpg-mdp/default.nix | 3 ++- pkgs/applications/misc/hubstaff/default.nix | 3 ++- .../misc/keepass-plugins/keeagent/default.nix | 3 ++- .../keepass-plugins/keepasshttp/default.nix | 3 ++- .../keepass-plugins/keepassrpc/default.nix | 3 ++- pkgs/applications/misc/krusader/default.nix | 5 +++-- pkgs/applications/misc/lxterminal/default.nix | 3 ++- .../misc/masterpdfeditor/default.nix | 3 ++- pkgs/applications/misc/nrsc5/default.nix | 3 ++- pkgs/applications/misc/opentx/default.nix | 3 ++- .../applications/misc/playonlinux/default.nix | 3 ++- pkgs/applications/misc/qdirstat/default.nix | 3 ++- .../misc/qtbitcointrader/default.nix | 3 ++- .../misc/redshift-plasma-applet/default.nix | 3 ++- pkgs/applications/misc/roxterm/default.nix | 5 +++-- pkgs/applications/misc/subsurface/default.nix | 6 ++++-- pkgs/applications/misc/synapse/default.nix | 5 +++-- pkgs/applications/misc/teseq/default.nix | 3 ++- pkgs/applications/misc/tomboy/default.nix | 3 ++- .../networking/browsers/otter/default.nix | 3 ++- .../networking/cluster/hadoop/default.nix | 3 ++- .../networking/cluster/kops/default.nix | 3 ++- .../networking/cluster/kubecfg/default.nix | 3 ++- .../networking/cluster/spark/default.nix | 7 ++++--- pkgs/applications/networking/dropbox/cli.nix | 3 ++- .../instant-messengers/franz/default.nix | 3 ++- .../instant-messengers/hipchat/default.nix | 3 ++- .../pidgin-plugins/pidgin-latex/default.nix | 3 ++- .../pidgin-plugins/pidgin-mra/default.nix | 3 ++- .../pidgin-xmpp-receipts/default.nix | 3 ++- .../pidgin-plugins/purple-matrix/default.nix | 3 ++- .../purple-vk-plugin/default.nix | 3 ++- .../telegram-purple/default.nix | 3 ++- .../instant-messengers/qtox/default.nix | 3 ++- .../instant-messengers/quaternion/default.nix | 3 ++- .../skypeforlinux/default.nix | 3 ++- .../instant-messengers/slack/default.nix | 3 ++- .../vk-messenger/default.nix | 3 ++- .../instant-messengers/wavebox/default.nix | 3 ++- .../instant-messengers/zoom-us/default.nix | 3 ++- .../networking/mailreaders/lumail/default.nix | 3 ++- .../notmuch-addrlookup/default.nix | 3 ++- .../networking/newsreaders/pan/default.nix | 3 ++- .../networking/p2p/freenet/default.nix | 3 ++- .../networking/protonmail-bridge/default.nix | 3 ++- .../networking/spideroak/default.nix | 3 ++- .../networking/super-productivity/default.nix | 3 ++- .../networking/tcpkali/default.nix | 3 ++- .../office/impressive/default.nix | 3 ++- .../office/libreoffice/default.nix | 3 ++- .../applications/office/libreoffice/still.nix | 3 ++- pkgs/applications/office/mendeley/default.nix | 3 ++- pkgs/applications/office/mmex/default.nix | 3 ++- pkgs/applications/office/mytetra/default.nix | 3 ++- pkgs/applications/office/planner/default.nix | 3 ++- .../office/todo.txt-cli/default.nix | 3 ++- .../applications/office/wpsoffice/default.nix | 5 +++-- pkgs/applications/radio/airspy/default.nix | 3 ++- pkgs/applications/radio/gnuradio/limesdr.nix | 3 ++- pkgs/applications/radio/limesuite/default.nix | 3 ++- .../radio/multimon-ng/default.nix | 3 ++- .../applications/radio/qradiolink/default.nix | 3 ++- .../radio/soapyairspy/default.nix | 3 ++- .../radio/soapybladerf/default.nix | 3 ++- .../radio/soapyhackrf/default.nix | 3 ++- .../radio/soapyremote/default.nix | 3 ++- .../radio/soapyrtlsdr/default.nix | 3 ++- pkgs/applications/radio/soapysdr/default.nix | 3 ++- pkgs/applications/radio/soapyuhd/default.nix | 3 ++- pkgs/applications/radio/uhd/default.nix | 3 ++- pkgs/applications/radio/welle-io/default.nix | 3 ++- .../science/astronomy/gpredict/default.nix | 3 ++- .../science/chemistry/gwyddion/default.nix | 3 ++- .../science/chemistry/octopus/default.nix | 3 ++- .../science/chemistry/openmolcas/default.nix | 3 ++- .../science/geometry/tetgen/default.nix | 3 ++- .../science/logic/coq/default.nix | 3 ++- .../science/logic/coq2html/default.nix | 3 ++- .../science/logic/logisim/default.nix | 3 ++- .../science/logic/tlaplus/toolbox.nix | 3 ++- .../science/math/ripser/default.nix | 3 ++- .../science/misc/gephi/default.nix | 3 ++- .../science/misc/megam/default.nix | 3 ++- .../science/misc/tulip/default.nix | 5 +++-- .../science/programming/scyther/cli.nix | 3 ++- .../science/programming/scyther/default.nix | 3 ++- .../git-and-tools/git/default.nix | 3 ++- .../git-and-tools/grv/default.nix | 3 ++- .../svn-all-fast-export/default.nix | 3 ++- .../git-and-tools/svn2git/default.nix | 3 ++- .../version-management/guitone/default.nix | 3 ++- .../version-management/monotone/default.nix | 7 ++++--- .../redmine/4.x/default.nix | 5 +++-- .../version-management/redmine/default.nix | 5 +++-- .../version-management/yadm/default.nix | 3 ++- .../video/subtitleeditor/default.nix | 3 ++- .../applications/video/tivodecode/default.nix | 3 ++- .../virtualization/virtinst/default.nix | 3 ++- .../virtualization/virtualbox/default.nix | 3 ++- .../window-managers/windowlab/default.nix | 3 ++- .../window-managers/yabar/build.nix | 3 ++- pkgs/data/fonts/dejavu-fonts/default.nix | 9 +++++--- pkgs/data/fonts/kochi-substitute/default.nix | 3 ++- pkgs/data/fonts/noto-fonts/default.nix | 3 ++- pkgs/data/misc/shared-mime-info/default.nix | 3 ++- .../gnome-3/apps/gnome-boxes/default.nix | 5 +++-- .../gnome-3/apps/gnome-notes/default.nix | 3 ++- .../gnome-3/core/gnome-contacts/default.nix | 5 +++-- .../extensions/chrome-gnome-shell/default.nix | 5 +++-- pkgs/desktops/gnustep/make/default.nix | 3 ++- pkgs/development/compilers/as31/default.nix | 3 ++- .../compilers/chicken/4/chicken.nix | 3 ++- .../compilers/chicken/5/chicken.nix | 3 ++- pkgs/development/compilers/cmucl/binary.nix | 3 ++- .../development/compilers/crystal/default.nix | 3 ++- pkgs/development/compilers/dale/default.nix | 3 ++- pkgs/development/compilers/gambit/build.nix | 3 ++- .../compilers/gcc-arm-embedded/default.nix | 3 ++- pkgs/development/compilers/gerbil/build.nix | 3 ++- pkgs/development/compilers/gforth/default.nix | 3 ++- pkgs/development/compilers/haxe/default.nix | 3 ++- .../development/compilers/inform7/default.nix | 3 ++- pkgs/development/compilers/ldc/default.nix | 3 ++- pkgs/development/compilers/llvm/3.5/clang.nix | 3 ++- .../compilers/llvm/3.5/dragonegg.nix | 7 ++++--- .../compilers/llvm/3.5/libc++/default.nix | 3 ++- .../compilers/llvm/3.5/libc++abi/default.nix | 3 ++- pkgs/development/compilers/llvm/3.5/lld.nix | 3 ++- pkgs/development/compilers/llvm/3.5/lldb.nix | 3 ++- pkgs/development/compilers/llvm/3.5/llvm.nix | 3 ++- pkgs/development/compilers/llvm/3.5/polly.nix | 3 ++- .../compilers/llvm/3.8/clang/default.nix | 3 ++- .../compilers/llvm/3.8/libc++/default.nix | 3 ++- .../compilers/llvm/3.8/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/3.8/lldb.nix | 3 ++- pkgs/development/compilers/llvm/3.8/llvm.nix | 3 ++- .../compilers/llvm/3.9/clang/default.nix | 3 ++- .../compilers/llvm/3.9/libc++/default.nix | 3 ++- .../compilers/llvm/3.9/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/3.9/lldb.nix | 3 ++- pkgs/development/compilers/llvm/3.9/llvm.nix | 3 ++- .../compilers/llvm/4/libc++/default.nix | 3 ++- .../compilers/llvm/4/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/4/lld.nix | 3 ++- pkgs/development/compilers/llvm/4/lldb.nix | 3 ++- pkgs/development/compilers/llvm/4/openmp.nix | 3 ++- .../compilers/llvm/5/libc++/default.nix | 3 ++- .../compilers/llvm/5/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/5/lld.nix | 3 ++- pkgs/development/compilers/llvm/5/lldb.nix | 3 ++- pkgs/development/compilers/llvm/5/openmp.nix | 3 ++- .../compilers/llvm/6/libc++/default.nix | 3 ++- .../compilers/llvm/6/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/6/lld.nix | 3 ++- pkgs/development/compilers/llvm/6/lldb.nix | 3 ++- pkgs/development/compilers/llvm/6/openmp.nix | 3 ++- .../compilers/llvm/7/libc++/default.nix | 3 ++- .../compilers/llvm/7/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/7/lld.nix | 3 ++- pkgs/development/compilers/llvm/7/lldb.nix | 3 ++- pkgs/development/compilers/llvm/7/openmp.nix | 3 ++- .../compilers/llvm/8/libc++/default.nix | 3 ++- .../compilers/llvm/8/libc++abi.nix | 3 ++- .../compilers/llvm/8/libunwind.nix | 3 ++- pkgs/development/compilers/llvm/8/lld.nix | 3 ++- pkgs/development/compilers/llvm/8/lldb.nix | 3 ++- pkgs/development/compilers/llvm/8/openmp.nix | 3 ++- pkgs/development/compilers/mlton/20130715.nix | 13 ++++++------ .../compilers/mlton/from-git-source.nix | 3 ++- pkgs/development/compilers/mono/generic.nix | 5 +++-- pkgs/development/compilers/mozart/binary.nix | 3 ++- pkgs/development/compilers/polyml/5.6.nix | 3 ++- pkgs/development/compilers/smlnj/default.nix | 3 ++- .../compilers/swi-prolog/default.nix | 3 ++- pkgs/development/compilers/teyjus/default.nix | 3 ++- .../interpreters/clojure/clooj.nix | 3 ++- .../development/interpreters/dart/default.nix | 3 ++- pkgs/development/interpreters/eff/default.nix | 3 ++- .../interpreters/maude/default.nix | 3 ++- .../interpreters/nix-exec/default.nix | 3 ++- .../development/interpreters/ruby/default.nix | 3 ++- .../interpreters/spidermonkey/52.nix | 3 ++- .../interpreters/spidermonkey/60.nix | 3 ++- pkgs/development/interpreters/tcl/generic.nix | 3 ++- .../development/java-modules/jogl/default.nix | 3 ++- pkgs/development/libraries/adns/default.nix | 3 ++- pkgs/development/libraries/asio/generic.nix | 3 ++- .../libraries/audio/libgme/default.nix | 3 ++- .../libraries/avro-c++/default.nix | 3 ++- pkgs/development/libraries/avro-c/default.nix | 3 ++- .../libraries/bulletml/default.nix | 3 ++- pkgs/development/libraries/cairo/default.nix | 5 +++-- pkgs/development/libraries/celt/generic.nix | 3 ++- .../libraries/classads/default.nix | 3 ++- pkgs/development/libraries/codec2/default.nix | 3 ++- pkgs/development/libraries/csfml/default.nix | 3 ++- pkgs/development/libraries/eigen/default.nix | 3 ++- pkgs/development/libraries/fltk/1.4.nix | 3 ++- pkgs/development/libraries/fltk/default.nix | 3 ++- .../libraries/fontconfig-ultimate/default.nix | 3 ++- pkgs/development/libraries/fox/fox-1.6.nix | 5 +++-- .../libraries/freeglut/default.nix | 3 ++- pkgs/development/libraries/glib/default.nix | 9 ++++---- .../libraries/globalarrays/default.nix | 3 ++- pkgs/development/libraries/gloox/default.nix | 3 ++- .../libraries/gnutls-kdh/generic.nix | 3 ++- pkgs/development/libraries/goocanvas/2.x.nix | 5 +++-- .../libraries/http-parser/default.nix | 3 ++- .../libraries/ignition-math/default.nix | 3 ++- .../libraries/ignition-transport/generic.nix | 3 ++- .../libraries/java/rhino/default.nix | 3 ++- pkgs/development/libraries/libav/default.nix | 5 +++-- .../libraries/libbladeRF/default.nix | 3 ++- .../libraries/libbytesize/default.nix | 3 ++- pkgs/development/libraries/libcec/default.nix | 3 ++- .../development/libraries/libcec/platform.nix | 3 ++- .../libraries/libdwarf/default.nix | 6 ++++-- .../development/libraries/libdynd/default.nix | 3 ++- .../development/libraries/libjson/default.nix | 3 ++- .../libraries/liblastfm/default.nix | 5 +++-- .../libraries/liblouis/default.nix | 3 ++- .../libraries/libmodplug/default.nix | 5 +++-- pkgs/development/libraries/libmpc/default.nix | 3 ++- .../libraries/libmypaint/default.nix | 3 ++- pkgs/development/libraries/libnih/default.nix | 3 ++- pkgs/development/libraries/libofa/default.nix | 5 +++-- .../development/libraries/libopus/default.nix | 3 ++- .../libraries/libopusenc/default.nix | 3 ++- .../libraries/libossp-uuid/default.nix | 3 ++- .../development/libraries/libpar2/default.nix | 5 +++-- pkgs/development/libraries/libpgf/default.nix | 3 ++- .../libraries/libqmatrixclient/default.nix | 3 ++- .../libraries/libspatialindex/default.nix | 3 ++- .../libraries/libspotify/default.nix | 6 ++++-- .../libtorrent-rasterbar/default.nix | 3 ++- .../libraries/libtoxcore/default.nix | 3 ++- .../libraries/libtxc_dxtn/default.nix | 5 +++-- .../libraries/libtxc_dxtn_s2tc/default.nix | 3 ++- pkgs/development/libraries/libxc/default.nix | 3 ++- .../libraries/libxklavier/default.nix | 5 +++-- .../development/libraries/msgpack/generic.nix | 3 ++- .../development/libraries/ndn-cxx/default.nix | 3 ++- pkgs/development/libraries/ndpi/default.nix | 3 ++- .../libraries/nix-plugins/default.nix | 3 ++- pkgs/development/libraries/nspr/default.nix | 3 ++- pkgs/development/libraries/ntrack/default.nix | 5 +++-- .../libraries/opencore-amr/default.nix | 3 ++- .../libraries/openjpeg/generic.nix | 3 ++- .../development/libraries/openmpi/default.nix | 5 +++-- .../development/libraries/openssl/default.nix | 5 +++-- .../libraries/openzwave/default.nix | 3 ++- pkgs/development/libraries/physfs/default.nix | 5 +++-- pkgs/development/libraries/ppl/default.nix | 3 ++- .../libraries/protobuf/generic-v3.nix | 3 ++- .../libraries/protobuf/generic.nix | 3 ++- .../libraries/protobufc/generic.nix | 3 ++- pkgs/development/libraries/qpdf/default.nix | 5 +++-- .../libraries/science/math/arpack/default.nix | 3 ++- .../libraries/science/math/fenics/default.nix | 18 ++++++++++------ .../science/math/liblapack/default.nix | 3 ++- .../libraries/science/math/magma/default.nix | 3 ++- pkgs/development/libraries/sfml/default.nix | 3 ++- .../startup-notification/default.nix | 3 ++- pkgs/development/libraries/tinyxml/2.6.2.nix | 3 ++- pkgs/development/libraries/uthash/default.nix | 3 ++- .../libraries/volume-key/default.nix | 3 ++- pkgs/development/libraries/wt/default.nix | 3 ++- .../libraries/wxwidgets/2.9/default.nix | 3 ++- pkgs/development/libraries/xapian/default.nix | 3 ++- pkgs/development/libraries/xmlsec/default.nix | 3 ++- pkgs/development/misc/amdapp-sdk/default.nix | 3 ++- pkgs/development/misc/avr/libc/default.nix | 3 ++- pkgs/development/misc/msp430/mspdebug.nix | 3 ++- pkgs/development/misc/newlib/default.nix | 3 ++- .../development/misc/qmk_firmware/default.nix | 3 ++- .../misc/stm32/betaflight/default.nix | 3 ++- pkgs/development/misc/stm32/inav/default.nix | 3 ++- pkgs/development/mobile/abootimg/default.nix | 3 ++- pkgs/development/ocaml-modules/base64/2.0.nix | 3 ++- .../ocaml-modules/dolog/default.nix | 3 ++- .../ocaml-modules/iso8601/default.nix | 3 ++- .../ocaml-modules/llvm/default.nix | 3 ++- .../ocaml-modules/magic-mime/default.nix | 3 ++- .../ocaml-modules/menhir/generic.nix | 3 ++- .../ocaml-modules/ocamlmake/default.nix | 3 ++- .../ocsigen-deriving/default.nix | 3 ++- .../tools/analysis/radare2/default.nix | 3 ++- .../tools/build-managers/apache-ant/1.9.nix | 3 ++- .../build-managers/apache-ant/default.nix | 3 ++- .../build-managers/apache-maven/default.nix | 5 +++-- .../tools/build-managers/bazel/default.nix | 3 ++- .../build-managers/gnumake/4.2/default.nix | 3 ++- .../tools/build-managers/rebar/default.nix | 3 ++- pkgs/development/tools/buildah/default.nix | 3 ++- pkgs/development/tools/casperjs/default.nix | 3 ++- .../buildkite-agent/generic.nix | 3 ++- .../tools/database/cdb/default.nix | 3 ++- .../tools/database/squirrel-sql/default.nix | 3 ++- .../tools/flatpak-builder/default.nix | 5 +++-- pkgs/development/tools/flyway/default.nix | 3 ++- .../tools/java/fastjar/default.nix | 3 ++- pkgs/development/tools/minizinc/default.nix | 3 ++- pkgs/development/tools/minizinc/ide.nix | 3 ++- .../tools/misc/dfu-programmer/default.nix | 5 +++-- .../tools/misc/nixbang/default.nix | 3 ++- .../tools/misc/prelink/default.nix | 3 ++- .../development/tools/misc/stlink/default.nix | 3 ++- .../tools/misc/teensy-loader-cli/default.nix | 3 ++- pkgs/development/tools/nailgun/default.nix | 3 ++- .../tools/ocaml/js_of_ocaml/default.nix | 3 ++- .../tools/ocaml/obuild/default.nix | 3 ++- pkgs/development/tools/ocaml/utop/default.nix | 3 ++- pkgs/development/tools/parsing/antlr/4.7.nix | 6 ++++-- .../tools/parsing/ragel/default.nix | 5 +++-- .../tools/profiling/systemtap/default.nix | 3 ++- pkgs/development/tools/pypi2nix/default.nix | 3 ++- pkgs/development/tools/skopeo/default.nix | 3 ++- pkgs/games/anki/default.nix | 8 ++++--- pkgs/games/armagetronad/default.nix | 3 ++- pkgs/games/crrcsim/default.nix | 5 +++-- pkgs/games/dwarf-fortress/dfhack/default.nix | 3 ++- pkgs/games/eduke32/default.nix | 3 ++- pkgs/games/endless-sky/default.nix | 3 ++- pkgs/games/flightgear/default.nix | 3 ++- pkgs/games/freedink/default.nix | 10 +++++---- pkgs/games/freedroidrpg/default.nix | 3 ++- pkgs/games/gogui/default.nix | 3 ++- .../games/linux-steam-integration/default.nix | 3 ++- pkgs/games/megaglest/default.nix | 3 ++- pkgs/games/minetest/default.nix | 3 ++- pkgs/games/nexuiz/default.nix | 3 ++- pkgs/games/openxcom/default.nix | 3 ++- pkgs/games/quake3/content/demo.nix | 3 ++- pkgs/games/quake3/content/pointrelease.nix | 3 ++- pkgs/games/rrootage/default.nix | 3 ++- pkgs/games/simutrans/default.nix | 3 ++- pkgs/games/steam/steam.nix | 3 ++- pkgs/games/stockfish/default.nix | 3 ++- pkgs/games/vdrift/default.nix | 3 ++- pkgs/misc/drivers/epson-201106w/default.nix | 3 ++- pkgs/misc/drivers/epson-alc1100/default.nix | 3 ++- pkgs/misc/drivers/epson_201207w/default.nix | 3 ++- .../drivers/postscript-lexmark/default.nix | 3 ++- pkgs/misc/drivers/sundtek/default.nix | 3 ++- pkgs/misc/drivers/xboxdrv/default.nix | 3 ++- pkgs/misc/emulators/ccemux/default.nix | 3 ++- pkgs/misc/ghostscript/default.nix | 5 +++-- pkgs/misc/long-shebang/default.nix | 3 ++- pkgs/misc/themes/kde2/default.nix | 3 ++- pkgs/misc/themes/qtcurve/default.nix | 3 ++- pkgs/os-specific/linux/beegfs/default.nix | 3 ++- .../linux/firmware/b43-firmware/5.1.138.nix | 3 ++- .../firmware/facetimehd-firmware/default.nix | 3 ++- .../linux/firmware/fwupdate/default.nix | 3 ++- pkgs/os-specific/linux/fuse/common.nix | 5 +++-- pkgs/os-specific/linux/hibernate/default.nix | 3 ++- pkgs/os-specific/linux/iomelt/default.nix | 3 ++- pkgs/os-specific/linux/kernel/generic.nix | 3 ++- .../linux/kmod-blacklist-ubuntu/default.nix | 3 ++- pkgs/os-specific/linux/ldm/default.nix | 3 ++- pkgs/os-specific/linux/lsiutil/default.nix | 3 ++- pkgs/os-specific/linux/lvm2/default.nix | 3 ++- pkgs/os-specific/linux/ply/default.nix | 3 ++- pkgs/os-specific/linux/rdma-core/default.nix | 3 ++- pkgs/os-specific/linux/regionset/default.nix | 3 ++- pkgs/os-specific/linux/util-linux/default.nix | 5 +++-- pkgs/os-specific/windows/libgnurx/default.nix | 5 +++-- .../os-specific/windows/mingw-w64/default.nix | 3 ++- .../windows/pthread-w32/default.nix | 2 +- pkgs/servers/bird/default.nix | 5 +++-- pkgs/servers/brickd/default.nix | 3 ++- pkgs/servers/dns/bind/default.nix | 5 +++-- .../apache-modules/mod_fastcgi/default.nix | 3 ++- pkgs/servers/http/gatling/default.nix | 5 +++-- pkgs/servers/http/myserver/default.nix | 5 +++-- pkgs/servers/http/nginx/generic.nix | 3 ++- pkgs/servers/mail/postfix/pfixtools.nix | 3 ++- pkgs/servers/mattermost/default.nix | 6 ++++-- pkgs/servers/monitoring/uchiwa/default.nix | 6 ++++-- pkgs/servers/nosql/mongodb/default.nix | 3 ++- pkgs/servers/search/sphinxsearch/default.nix | 3 ++- pkgs/servers/sql/monetdb/default.nix | 3 ++- pkgs/servers/tvheadend/default.nix | 3 ++- pkgs/servers/unifi/default.nix | 3 ++- pkgs/servers/varnish/default.nix | 5 +++-- pkgs/servers/x11/quartz-wm/default.nix | 3 ++- pkgs/servers/xmpp/ejabberd/default.nix | 3 ++- pkgs/shells/es/default.nix | 3 ++- pkgs/shells/oil/default.nix | 3 ++- pkgs/shells/zsh/default.nix | 3 ++- .../zsh/nix-zsh-completions/default.nix | 3 ++- pkgs/tools/X11/bumblebee/default.nix | 5 +++-- pkgs/tools/X11/nitrogen/default.nix | 5 +++-- pkgs/tools/X11/xautomation/default.nix | 3 ++- pkgs/tools/X11/xbindkeys/default.nix | 3 ++- pkgs/tools/X11/xwinwrap/default.nix | 3 ++- pkgs/tools/archivers/fsarchiver/default.nix | 3 ++- pkgs/tools/audio/dir2opus/default.nix | 5 +++-- pkgs/tools/audio/qastools/default.nix | 3 ++- pkgs/tools/backup/bup/default.nix | 3 ++- pkgs/tools/backup/znapzend/default.nix | 3 ++- pkgs/tools/cd-dvd/lsdvd/default.nix | 3 ++- pkgs/tools/compression/pbzip2/default.nix | 5 +++-- pkgs/tools/filesystems/ceph/generic.nix | 3 ++- pkgs/tools/filesystems/dislocker/default.nix | 3 ++- pkgs/tools/filesystems/jmtpfs/default.nix | 3 ++- .../filesystems/reiser4progs/default.nix | 5 +++-- .../filesystems/reiserfsprogs/default.nix | 5 +++-- pkgs/tools/filesystems/zfstools/default.nix | 3 ++- pkgs/tools/graphics/argyllcms/default.nix | 3 ++- pkgs/tools/graphics/briss/default.nix | 3 ++- pkgs/tools/graphics/gmic/default.nix | 3 ++- pkgs/tools/graphics/gmic_krita_qt/default.nix | 3 ++- pkgs/tools/graphics/graphviz/base.nix | 3 ++- pkgs/tools/graphics/mscgen/default.nix | 3 ++- pkgs/tools/graphics/pgf/default.nix | 3 ++- pkgs/tools/graphics/twilight/default.nix | 3 ++- pkgs/tools/misc/aptly/default.nix | 3 ++- pkgs/tools/misc/autorandr/default.nix | 3 ++- pkgs/tools/misc/buildtorrent/default.nix | 5 +++-- pkgs/tools/misc/clasp/default.nix | 3 ++- pkgs/tools/misc/ddccontrol/default.nix | 3 ++- pkgs/tools/misc/edid-decode/default.nix | 3 ++- pkgs/tools/misc/fortune/default.nix | 3 ++- pkgs/tools/misc/gh-ost/default.nix | 3 ++- pkgs/tools/misc/gringo/default.nix | 3 ++- pkgs/tools/misc/grub/2.0x.nix | 5 +++-- pkgs/tools/misc/grub/trusted.nix | 3 ++- pkgs/tools/misc/hdaps-gl/default.nix | 3 ++- pkgs/tools/misc/lbdb/default.nix | 3 ++- pkgs/tools/misc/mdbtools/default.nix | 3 ++- pkgs/tools/misc/mongodb-compass/default.nix | 3 ++- pkgs/tools/misc/shallot/default.nix | 3 ++- pkgs/tools/misc/ultrastar-manager/default.nix | 3 ++- pkgs/tools/misc/xburst-tools/default.nix | 3 ++- pkgs/tools/networking/burpsuite/default.nix | 3 ++- pkgs/tools/networking/bwm-ng/default.nix | 5 +++-- pkgs/tools/networking/djbdns/default.nix | 3 ++- pkgs/tools/networking/easyrsa/default.nix | 3 ++- .../networking/gmrender-resurrect/default.nix | 3 ++- pkgs/tools/networking/gnirehtet/default.nix | 3 ++- pkgs/tools/networking/minidlna/default.nix | 3 ++- pkgs/tools/networking/miniupnpc/default.nix | 7 ++++--- pkgs/tools/networking/nettee/default.nix | 3 ++- pkgs/tools/networking/nfdump/default.nix | 3 ++- pkgs/tools/networking/phodav/default.nix | 5 +++-- pkgs/tools/networking/zssh/default.nix | 5 +++-- pkgs/tools/package-management/nix/default.nix | 3 ++- pkgs/tools/security/fail2ban/default.nix | 3 ++- pkgs/tools/security/haka/default.nix | 3 ++- pkgs/tools/security/tpm-tools/default.nix | 5 +++-- pkgs/tools/security/vault/vault-bin.nix | 3 ++- pkgs/tools/system/ior/default.nix | 3 ++- pkgs/tools/system/smartmontools/default.nix | 5 +++-- pkgs/tools/system/tree/default.nix | 3 ++- pkgs/tools/text/cconv/default.nix | 3 ++- pkgs/tools/text/gnugrep/default.nix | 3 ++- pkgs/tools/typesetting/kindlegen/default.nix | 3 ++- pkgs/tools/typesetting/tex/texlive/bin.nix | 21 ++++++++++++------- .../virtualization/cloud-init/default.nix | 3 ++- 520 files changed, 1164 insertions(+), 622 deletions(-) diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix index 5a09641c70d..d65889be3ac 100644 --- a/pkgs/applications/altcoins/aeon/default.nix +++ b/pkgs/applications/altcoins/aeon/default.nix @@ -7,7 +7,8 @@ let version = "0.12.9.0"; in stdenv.mkDerivation { - name = "aeon-${version}"; + pname = "aeon"; + inherit version; src = fetchFromGitHub { owner = "aeonix"; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index b602707b392..adb38d4bbba 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -6,7 +6,8 @@ let version = "2.9.3"; in stdenv.mkDerivation { - name = "abcde-${version}"; + pname = "abcde"; + inherit version; src = fetchurl { url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04"; diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 04f0f9d3025..9c2f17c5cc9 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "caudec-${version}"; + pname = "caudec"; + inherit version; src = fetchurl { url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 1b0dfebe22c..f48a429b389 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -67,7 +67,8 @@ let ''; free = stdenv.mkDerivation { - name = "clementine-free-${version}"; + pname = "clementine-free"; + inherit version; inherit src patches nativeBuildInputs postPatch; # gst_plugins needed for setup-hooks @@ -95,7 +96,8 @@ let # Unfree Spotify blob for Clementine unfree = stdenv.mkDerivation { - name = "clementine-blob-${version}"; + pname = "clementine-blob"; + inherit version; # Use the same patches and sources as Clementine inherit src nativeBuildInputs postPatch; diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 209ffa05bf2..0e2c950051a 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -5,7 +5,8 @@ let version = "5.8.2"; in stdenv.mkDerivation rec { - name = "ekho-${version}"; + pname = "ekho"; + inherit version; meta = with stdenv.lib; { description = "Chinese text-to-speech software"; @@ -23,7 +24,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz"; + url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz"; sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; }; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 6e47d921d34..687608b4352 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -25,7 +25,8 @@ let }; faust = stdenv.mkDerivation { - name = "faust-${version}"; + pname = "faust"; + inherit version; inherit src; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 383d2deb10b..ad1239b22af 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -35,7 +35,8 @@ let faust = stdenv.mkDerivation { - name = "faust-${version}"; + pname = "faust"; + inherit version; inherit src; diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 7716b1e0c35..b51b72f1c8a 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -43,7 +43,8 @@ let in stdenv.mkDerivation { - name = "google-play-music-desktop-player-${version}"; + pname = "google-play-music-desktop-player"; + inherit version; src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 3aea07235d8..94d0f5eb50f 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -19,7 +19,8 @@ let version = "7.2"; in stdenv.mkDerivation rec { - name = "gradio-${version}"; + pname = "gradio"; + inherit version; src = fetchFromGitHub { owner = "haecker-felix"; diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index dd8b28fc2d8..48052fc4ec8 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -5,7 +5,8 @@ let version = "2.6"; in stdenv.mkDerivation { - name = "midisheetmusic-${version}"; + pname = "midisheetmusic"; + inherit version; src = fetchurl { url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz"; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index efaef97257e..f024e5a6a1d 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -2,10 +2,11 @@ let version = "0.2.4"; in stdenv.mkDerivation rec { - name = "mpc123-${version}"; + pname = "mpc123"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz"; + url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz"; sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1"; }; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index f8f08369ab9..8116bcaf0bd 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -4,7 +4,8 @@ let version = "0.4.1"; in stdenv.mkDerivation rec { - name = "openmpt123-${version}"; + pname = "openmpt123"; + inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 9f51d300825..f9b3fbae213 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -3,7 +3,8 @@ , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" }: stdenv.mkDerivation { - name = "pmidi-${version}"; + pname = "pmidi"; + inherit version; src = fetchurl { url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz"; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index 6516532df33..c34b27edd96 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -4,7 +4,8 @@ let version = "unstable-2018-02-10"; in stdenv.mkDerivation rec { - name = "rhvoice-${version}"; + pname = "rhvoice"; + inherit version; src = fetchFromGitHub { owner = "Olga-Yakovleva"; diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index fbe90c5377d..7776fa0c166 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1-git1-20180828"; in stdenv.mkDerivation { - name = "sayonara-player-${version}"; + pname = "sayonara-player"; + inherit version; src = fetchurl { url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 77aa7994994..403075f9135 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -60,7 +60,8 @@ let in stdenv.mkDerivation { - name = "spotify-${version}"; + pname = "spotify"; + inherit version; # fetch from snapcraft instead of the debian repository most repos fetch from. # That is a bit more cumbersome. But the debian repository only keeps the last diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix index cdee979768c..521133cb08f 100644 --- a/pkgs/applications/audio/tree-from-tags/default.nix +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -7,7 +7,8 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - name = "tree-from-tags-${version}"; + pname = "tree-from-tags"; + inherit version; src = fetchFromGitHub { owner = "dbrock"; repo = "bongo"; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 7db3b7ec237..b5ff8e41fe0 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -3,7 +3,8 @@ let version = "2.13"; in stdenv.mkDerivation rec { - name = "uade123-${version}"; + pname = "uade123"; + inherit version; src = fetchurl { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index dde96764fe6..2bc40a78af4 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -5,7 +5,8 @@ let version = "0.5.1"; in stdenv.mkDerivation rec { - name = "vmpk-${version}"; + pname = "vmpk"; + inherit version; meta = with stdenv.lib; { description = "Virtual MIDI Piano Keyboard"; @@ -15,7 +16,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2"; sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc"; }; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 61db182f744..f892a9da50b 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -12,10 +12,11 @@ let version = "2.0.6"; in stdenv.mkDerivation rec { - name = "lightdm-gtk-greeter-${version}"; + pname = "lightdm-gtk-greeter"; + inherit version; src = fetchurl { - url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; + url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15"; }; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 63f241d9d1c..fc61d43436d 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -7,7 +7,8 @@ let version = "0.18.1"; in mkDerivation rec { - name = "sddm-${version}"; + pname = "sddm"; + inherit version; src = fetchFromGitHub { owner = "sddm"; diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix index 28736acded2..779ba992686 100644 --- a/pkgs/applications/editors/emacs-modes/d/default.nix +++ b/pkgs/applications/editors/emacs-modes/d/default.nix @@ -4,7 +4,8 @@ let version = "20150111"; in stdenv.mkDerivation { - name = "emacs-d-${version}"; + pname = "emacs-d"; + inherit version; src = fetchurl { url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 6b10766bedb..b55cf998991 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -6,7 +6,8 @@ let version = "13.14-169-g0d3569d"; # git describe --tags in stdenv.mkDerivation { - name = "haskell-mode-${version}"; + pname = "haskell-mode"; + inherit version; src = fetchFromGitHub { owner = "haskell"; diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 199a5886e1d..75b72516a3c 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -6,7 +6,8 @@ let version = "0.15"; in stdenv.mkDerivation { - name = "hsc3-mode-${version}"; + pname = "hsc3-mode"; + inherit version; src = fetchurl { url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz; sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix index 3cc8156337e..eaa0f2c2a5b 100644 --- a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix +++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix @@ -4,7 +4,8 @@ let version = "3.6-4-gb659bf8"; in stdenv.mkDerivation { - name = "ido-ubiquitous-${version}"; + pname = "ido-ubiquitous"; + inherit version; src = fetchFromGitHub { owner = "DarwinAwardWinner"; diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix index 7176b289b8b..4e79e9edda7 100644 --- a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix @@ -4,7 +4,8 @@ let version = "2.0-82-gfe30ef7"; in stdenv.mkDerivation { - name = "markdown-mode-${version}"; + pname = "markdown-mode"; + inherit version; src = fetchFromGitHub { owner = "defunkt"; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 9f8d408dd5a..becc2dc5dc9 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -5,7 +5,8 @@ let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; in stdenv.mkDerivation { - name = "ocaml-mode-${version}"; + pname = "ocaml-mode"; + inherit version; inherit (ocaml) prefixKey src; # a quick configure to get the Makefile generated. Since diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix index 2b4223cdc1f..9dfe089fe29 100644 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix @@ -3,7 +3,8 @@ let version = "1.3.13"; in stdenv.mkDerivation { - name = "emacs-rainbow-delimiters-${version}"; + pname = "emacs-rainbow-delimiters"; + inherit version; src = fetchurl { url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix index 0031ffee4d4..8b9e08a5378 100644 --- a/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "rudel-${version}"; + pname = "rudel"; + inherit version; src = fetchurl { url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix index b818348939e..fc79ec46761 100644 --- a/pkgs/applications/editors/emacs-modes/s/default.nix +++ b/pkgs/applications/editors/emacs-modes/s/default.nix @@ -3,7 +3,8 @@ let version = "1.9.0"; in stdenv.mkDerivation { - name = "emacs-s-${version}"; + pname = "emacs-s"; + inherit version; src = fetchurl { url = "https://github.com/magnars/s.el/archive/${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index be03938f8a5..556b27e4cbf 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -6,7 +6,8 @@ let version = "2.0.9"; in stdenv.mkDerivation { - name = "tuareg-mode-${version}"; + pname = "tuareg-mode"; + inherit version; src = fetchzip { url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix index 6d0631a4cb8..5f3041d22d4 100644 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix @@ -3,7 +3,8 @@ let version = "2.0.2"; in stdenv.mkDerivation { - name = "writegood-mode-${version}"; + pname = "writegood-mode"; + inherit version; src = fetchurl { url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz"; sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k"; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 0ff56e9145f..a30a8f70224 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -7,10 +7,11 @@ let in stdenv.mkDerivation rec { - name = "geany-${version}"; + pname = "geany"; + inherit version; src = fetchurl { - url = "https://download.geany.org/${name}.tar.bz2"; + url = "https://download.geany.org/${pname}-${version}.tar.bz2"; sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim"; }; diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 11322e8240c..21a6a847518 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -13,7 +13,8 @@ let in stdenv.mkDerivation { - name = "jedit-${version}"; + pname = "jedit"; + inherit version; src = fetchurl { url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x"; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index b212773712c..df46cb12338 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation rec { - name = "kodestudio-${version}"; + pname = "kodestudio"; + inherit version; src = fetchurl { url = urlStr; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 3d215b28856..ba01304f723 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -15,7 +15,8 @@ let }; in stdenv.mkDerivation { - name = "netbeans-${version}"; + pname = "netbeans"; + inherit version; src = fetchurl { url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx"; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index f90e17a6065..74e5460f529 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -13,7 +13,8 @@ let gwtVer = "2.8.1"; in stdenv.mkDerivation rec { - name = "RStudio-${version}"; + pname = "RStudio"; + inherit version; nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; @@ -98,7 +99,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { - name = name; + name = "${pname}-${version}"; exec = "rstudio %F"; icon = "rstudio"; desktopName = "RStudio"; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 2d52aedc831..629bd9d019d 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "standardnotes-${version}"; + pname = "standardnotes"; + inherit version; src = fetchurl { url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage"; diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index dfb2e49e0c8..5d5843890e1 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -15,7 +15,8 @@ let }; in stdenv.mkDerivation { - name = "TeXmacs-${version}"; + pname = "TeXmacs"; + inherit version; src= fetchurl { url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index df742645e86..43f8f561e2f 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -23,7 +23,8 @@ let ''; }; in stdenv.mkDerivation rec { - name = "awesomebump-${version}"; + pname = "awesomebump"; + inherit version; inherit src; diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 30101bb9477..e59d14f7dd6 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -6,7 +6,8 @@ let version = "2018SP2"; in stdenv.mkDerivation { - name = "draftsight-${version}"; + pname = "draftsight"; + inherit version; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 1e54152fff4..ae38730226a 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -4,7 +4,8 @@ let version = "3.2.7a"; in stdenv.mkDerivation { - name = "fig2dev-${version}"; + pname = "fig2dev"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 025b3ae65ec..103f40fc9c7 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -2,7 +2,8 @@ let version = "0.4"; in stdenv.mkDerivation { - name = "gcolor2-${version}"; + pname = "gcolor2"; + inherit version; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386"; src = fetchurl { diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 5ad7cb88b03..c7555b612f7 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -3,7 +3,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "gcolor3-${version}"; + pname = "gcolor3"; + inherit version; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index 061dc2b69a6..d7b96425968 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -3,7 +3,8 @@ let version = "1.0.1"; in stdenv.mkDerivation { - name = "guetzli-${version}"; + pname = "guetzli"; + inherit version; src = fetchFromGitHub { owner = "google"; repo = "guetzli"; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index b399dd2d228..34294d27129 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -22,7 +22,8 @@ let }; synfig = stdenv.mkDerivation rec { - name = "synfig-${version}"; + pname = "synfig"; + inherit version; src = fetchFromGitHub { repo = "synfig"; @@ -47,7 +48,8 @@ let }; in stdenv.mkDerivation rec { - name = "synfigstudio-${version}"; + pname = "synfigstudio"; + inherit version; src = fetchFromGitHub { repo = "synfig"; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 3a139f3740c..09abfc60a52 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -27,7 +27,8 @@ let in stdenv.mkDerivation rec { - name = "unigine-valley-${version}"; + pname = "unigine-valley"; + inherit version; src = fetchurl { url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run"; diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 429af12b9bb..fe5a1370332 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -6,7 +6,8 @@ let version = "3.2.7a"; in stdenv.mkDerivation { - name = "xfig-${version}"; + pname = "xfig"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix index 3c18d70d6c2..0e524ede091 100644 --- a/pkgs/applications/misc/asciiquarium/default.nix +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -2,7 +2,8 @@ let version = "1.1"; in stdenv.mkDerivation { - name = "asciiquarium-${version}"; + pname = "asciiquarium"; + inherit version; src = fetchurl { url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz"; sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v"; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index fc5fa4d0300..b0af34ec760 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -12,7 +12,8 @@ let ]; in stdenv.mkDerivation { - name = "bashSnippets-${version}"; + pname = "bashSnippets"; + inherit version; src = fetchFromGitHub { owner = "alexanderepstein"; diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index 9c99dcee2b3..090cb2f519e 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -10,7 +10,8 @@ let in buildPythonApplication { - name = "bitcoinarmory-${version}"; + pname = "bitcoinarmory"; + inherit version; src = fetchFromGitHub { owner = "goatpig"; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index a0e5c814996..40dbfea9801 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -4,7 +4,8 @@ let version = "0.8.4"; in stdenv.mkDerivation { - name = "cardpeek-${version}"; + pname = "cardpeek"; + inherit version; src = fetchFromGitHub { owner = "L1L1"; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 3851730c459..b07e0fb8c52 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -2,7 +2,8 @@ let version = "0.6.4"; in stdenv.mkDerivation { - name = "confclerk-${version}"; + pname = "confclerk"; + inherit version; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index a53b001b0e9..1972042f805 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -4,7 +4,8 @@ let version = "15.04"; in stdenv.mkDerivation rec { - name = "cura-${version}"; + pname = "cura"; + inherit version; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index ce743a00879..41f110e9ee1 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -3,7 +3,8 @@ let version = "15.04.6"; in stdenv.mkDerivation { - name = "curaengine-${version}"; + pname = "curaengine"; + inherit version; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index eeb7a8ccf52..5df7c0b0672 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -4,7 +4,8 @@ let version = "git-2016-01-10"; in stdenv.mkDerivation { - name = "dfilemanager-${version}"; + pname = "dfilemanager"; + inherit version; src = fetchgit { url = "git://git.code.sf.net/p/dfilemanager/code"; rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index e9d19466609..bbbf1a0aff9 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -4,7 +4,8 @@ let version = "6.3.26"; in stdenv.mkDerivation { - name="fetchmail-${version}"; + pname = "fetchmail"; + inherit version; src = fetchurl { url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2"; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 47fb50242c1..8a54cefaab0 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -5,10 +5,11 @@ let in stdenv.mkDerivation rec { - name = "gmrun-${version}"; + pname = "gmrun"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/gmrun/${name}.tar.gz"; + url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz"; sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index bb1556c7c4d..c8bbcf2aa7f 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -5,7 +5,8 @@ let version = "1.3.11"; in stdenv.mkDerivation { - name = "gmtp-${version}"; + pname = "gmtp"; + inherit version; src = fetchurl { url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 0fccf83acf7..961efe4b057 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -40,7 +40,8 @@ let ]; in stdenv.mkDerivation rec { - name = "googleearth-${version}"; + pname = "googleearth"; + inherit version; src = fetchurl { url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb"; inherit sha256; diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index 4143f6fde55..9954ff660ad 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -3,7 +3,8 @@ let version = "0.7.4"; in stdenv.mkDerivation { # mdp renamed to gpg-mdp because there is a mdp package already. - name = "gpg-mdp-${version}"; + pname = "gpg-mdp"; + inherit version; meta = { homepage = https://tamentis.com/projects/mdp/; license = [stdenv.lib.licenses.isc]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index acdeec10d30..b2997ece5d5 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -17,7 +17,8 @@ let in stdenv.mkDerivation { - name = "hubstaff-${version}"; + pname = "hubstaff"; + inherit version; src = fetchurl { inherit sha256 url; }; diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index 80bf5deceb1..c3d26077443 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -3,7 +3,8 @@ let version = "0.10.1"; drv = stdenv.mkDerivation { - name = "keeagent-${version}"; + pname = "keeagent"; + inherit version; src = fetchzip { url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index e64632d529b..76ea9df78c2 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -3,7 +3,8 @@ let version = "1.8.4.2"; drv = stdenv.mkDerivation { - name = "keepasshttp-${version}"; + pname = "keepasshttp"; + inherit version; src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index b45cb24b1b5..562835159eb 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -3,7 +3,8 @@ let version = "1.8.0"; drv = stdenv.mkDerivation { - name = "keepassrpc-${version}"; + pname = "keepassrpc"; + inherit version; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd"; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 70915ca8707..cf81d572c61 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -8,10 +8,11 @@ let pname = "krusader"; version = "2.7.1"; in mkDerivation rec { - name = "krusader-${version}"; + pname = "krusader"; + inherit version; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm"; }; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 4fd86a5a4f5..8ce353e85b9 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -5,7 +5,8 @@ let version = "0.3.2"; in stdenv.mkDerivation rec { - name = "lxterminal-${version}"; + pname = "lxterminal"; + inherit version; src = fetchurl { url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index eb0e61ba6d7..1474ea2fc4f 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -4,7 +4,8 @@ let version = "5.4.10"; in stdenv.mkDerivation { - name = "masterpdfeditor-${version}"; + pname = "masterpdfeditor"; + inherit version; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index 69f74d66dd0..3ad83776842 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -13,7 +13,8 @@ let version = "1.0"; in stdenv.mkDerivation { - name = "nrsc5-${version}"; + pname = "nrsc5"; + inherit version; src = fetchFromGitHub { owner = "theori-io"; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index cd9a86e7fac..585c85cbd2c 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "opentx-${version}"; + pname = "opentx"; + inherit version; src = fetchFromGitHub { owner = "opentx"; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index e5c096fd2ae..48188574ad4 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -55,7 +55,8 @@ let libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; in stdenv.mkDerivation { - name = "playonlinux-${version}"; + pname = "playonlinux"; + inherit version; src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 4d204021247..48a05091ca8 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -5,7 +5,8 @@ let version = "1.6"; in mkDerivation rec { - name = "qdirstat-${version}"; + pname = "qdirstat"; + inherit version; src = fetchFromGitHub { owner = "shundhammer"; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 7586669218d..d942f999f69 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -4,7 +4,8 @@ let version = "1.40.41"; in stdenv.mkDerivation { - name = "qtbitcointrader-${version}"; + pname = "qtbitcointrader"; + inherit version; src = fetchzip { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index 03b8d709fce..2eebe67c46d 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -3,7 +3,8 @@ let version = "1.0.18"; in stdenv.mkDerivation { - name = "redshift-plasma-applet-${version}"; + pname = "redshift-plasma-applet"; + inherit version; src = fetchFromGitHub { owner = "kotelnik"; diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index aa0ebc29a55..1cff3635bf9 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -11,10 +11,11 @@ let version = "3.3.2"; in stdenv.mkDerivation rec { - name = "roxterm-${version}"; + pname = "roxterm"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/roxterm/${name}.tar.xz"; + url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz"; sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; }; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 5967fa3ad77..a29dad2c444 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -7,7 +7,8 @@ let version = "4.8.2"; libdc = stdenv.mkDerivation rec { - name = "libdivecomputer-ssrf-${version}"; + pname = "libdivecomputer-ssrf"; + inherit version; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; @@ -66,7 +67,8 @@ let }; in stdenv.mkDerivation rec { - name = "subsurface-${version}"; + pname = "subsurface"; + inherit version; src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 3e7983c667f..c314e8ffe5a 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -5,10 +5,11 @@ let version = "0.2.99.4"; in stdenv.mkDerivation rec { - name = "synapse-${version}"; + pname = "synapse"; + inherit version; src = fetchurl { - url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j"; }; diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix index 9502b3a0abe..b1764591982 100644 --- a/pkgs/applications/misc/teseq/default.nix +++ b/pkgs/applications/misc/teseq/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1"; in stdenv.mkDerivation { - name = "teseq-${version}"; + pname = "teseq"; + inherit version; src = fetchurl { url = "mirror://gnu/teseq/teseq-${version}.tar.gz"; diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index ba6e97d61fb..d8a6f86f104 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "tomboy-${version}"; + pname = "tomboy"; + inherit version; src = fetchurl { url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index b7118b49dae..d41f8440420 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -4,7 +4,8 @@ , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" }: stdenv.mkDerivation { - name = "otter-browser-${version}"; + pname = "otter-browser"; + inherit version; src = fetchFromGitHub { owner = "OtterBrowser"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 42c043d0007..7522307032e 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -64,7 +64,8 @@ let }; in stdenv.mkDerivation rec { - name = "hadoop-${version}"; + pname = "hadoop"; + inherit version; src = binary-distributon; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6a721ef14c1..c8b95baf2f3 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -6,7 +6,8 @@ let generic = { version, sha256, ...}@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in buildGoPackage { - name = "kops-${version}"; + pname = "kops"; + inherit version; inherit goPackagePath; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index cf0116ba856..e1b5a4425d5 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -3,7 +3,8 @@ let version = "0.12.0"; in buildGoPackage { - name = "kubecfg-${version}"; + pname = "kubecfg"; + inherit version; src = fetchFromGitHub { owner = "bitnami"; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 3572bfe7f5b..e675d17491a 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -15,18 +15,19 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spark-${version}"; + pname = "spark"; + inherit version; src = fetchzip { inherit sha256; - url = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz"; + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] ++ optional RSupport R ++ optional mesosSupport mesos; - untarDir = "${name}-bin-without-hadoop"; + untarDir = "${pname}-${version}-bin-without-hadoop"; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index ae0643669dc..54ed0f2eea0 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -15,7 +15,8 @@ let dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { - name = "dropbox-cli-${version}"; + pname = "dropbox-cli"; + inherit version; outputs = [ "out" "nautilusExtension" ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 97a4341dc4d..f04afb6f1f7 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -5,7 +5,8 @@ let version = "5.2.0"; in stdenv.mkDerivation rec { - name = "franz-${version}"; + pname = "franz"; + inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg"; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 9e1b9fe9c39..47854683e0e 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -39,7 +39,8 @@ let libGL ] + ":${stdenv.cc.cc.lib}/lib64"; in stdenv.mkDerivation { - name = "hipchat-${version}"; + pname = "hipchat"; + inherit version; src = fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 59b1d463c9d..eb6d954eb33 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -3,7 +3,8 @@ let version = "1.5.0"; in stdenv.mkDerivation { - name = "pidgin-latex-${version}"; + pname = "pidgin-latex"; + inherit version; src = fetchurl { url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 18bf89a5f2e..9a1e46e5ac5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -4,7 +4,8 @@ let version = "54b2992"; in stdenv.mkDerivation rec { - name = "pidgin-mra-${version}"; + pname = "pidgin-mra"; + inherit version; src = fetchgit { url = "https://github.com/dreadatour/pidgin-mra"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index f482e12a4bc..936974a1a88 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "pidgin-xmpp-receipts-${version}"; + pname = "pidgin-xmpp-receipts"; + inherit version; src = fetchFromGitHub { owner = "noonien-d"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 0b2cba64920..3c416927487 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -4,7 +4,8 @@ let version = "2018-08-03"; in stdenv.mkDerivation rec { - name = "purple-matrix-unstable-${version}"; + pname = "purple-matrix-unstable"; + inherit version; src = fetchgit { url = "https://github.com/matrix-org/purple-matrix"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index e54af933a08..22554a4abf8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -4,7 +4,8 @@ let version = "40ddb6d"; in stdenv.mkDerivation rec { - name = "purple-vk-plugin-${version}"; + pname = "purple-vk-plugin"; + inherit version; src = fetchhg { url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 8527593c1a2..df2665d8ce8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -4,7 +4,8 @@ let version = "1.3.0"; in stdenv.mkDerivation rec { - name = "telegram-purple-${version}"; + pname = "telegram-purple"; + inherit version; src = fetchgit { url = "https://github.com/majn/telegram-purple"; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 4ab3c64d16d..6a43344fbd3 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -11,7 +11,8 @@ let rev = "v${version}"; in mkDerivation rec { - name = "qtox-${version}"; + pname = "qtox"; + inherit version; src = fetchFromGitHub { owner = "qTox"; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 1c58ae353bb..111efb182e5 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -4,7 +4,8 @@ let generic = version: sha256: prefix: library: stdenv.mkDerivation rec { - name = "quaternion-${version}"; + pname = "quaternion"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index ab84ee6ec0f..dd76063a0fa 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -64,7 +64,8 @@ let throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "skypeforlinux-${version}"; + pname = "skypeforlinux"; + inherit version; system = "x86_64-linux"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 94c02ab0226..fab9c28ec97 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -57,7 +57,8 @@ let throw "Slack is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "slack-${version}"; + pname = "slack"; + inherit version; inherit src; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index b992263e215..03bf3b3bbdd 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,7 +4,8 @@ let version = "4.0.1"; in stdenv.mkDerivation { - name = "vk-messenger-${version}"; + pname = "vk-messenger"; + inherit version; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 9f704e52721..da4c5073000 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -22,7 +22,8 @@ let tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; in stdenv.mkDerivation rec { - name = "wavebox-${version}"; + pname = "wavebox"; + inherit version; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23"; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 8aa732fd6ba..e822b023f54 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -31,7 +31,8 @@ let }; in mkDerivation { - name = "zoom-us-${version}"; + pname = "zoom-us"; + inherit version; src = srcs.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index bc0918737dd..0a670b2b9a6 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -25,7 +25,8 @@ let luaCPath = getPath "so"; in stdenv.mkDerivation { - name = "lumail-${version}"; + pname = "lumail"; + inherit version; src = fetchurl { url = "https://lumail.org/download/lumail-${version}.tar.gz"; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 126e2854574..67c673bc913 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -4,7 +4,8 @@ let version = "9"; in stdenv.mkDerivation rec { - name = "notmuch-addrlookup-${version}"; + pname = "notmuch-addrlookup"; + inherit version; src = fetchFromGitHub { owner = "aperezdc"; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index e88936dc072..34ebf4364ce 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -10,7 +10,8 @@ assert spellChecking -> gtkspell3 != null; let version = "0.145"; in stdenv.mkDerivation { - name = "pan-${version}"; + pname = "pan"; + inherit version; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index d674c70e4c2..24435288488 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -18,7 +18,8 @@ let version = "build01475"; freenet-jars = stdenv.mkDerivation { - name = "freenet-jars-${version}"; + pname = "freenet-jars"; + inherit version; src = fetchFromGitHub { owner = "freenet"; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index c685a270586..bf8e7a16a4f 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -22,7 +22,8 @@ let }; in mkDerivation rec { - name = "protonmail-bridge-${version}"; + pname = "protonmail-bridge"; + inherit version; src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index d96a810ee05..11c8af368b9 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -14,7 +14,8 @@ let version = "7.5.0"; in stdenv.mkDerivation { - name = "spideroak-${version}"; + pname = "spideroak"; + inherit version; src = fetchurl { name = "SpiderOakONE-${version}-slack_tar_x64.tgz"; diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 3f87c8558e1..c5ff090a807 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -53,7 +53,8 @@ let throw "super-productivity is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "super-productivity-${version}"; + pname = "super-productivity"; + inherit version; inherit src; diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index 8a056e21692..a7142542238 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -3,7 +3,8 @@ let version = "1.1.1"; in stdenv.mkDerivation rec { - name = "tcpkali-${version}"; + pname = "tcpkali"; + inherit version; src = fetchFromGitHub { owner = "machinezone"; repo = "tcpkali"; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 8946bbab931..5065a1cb9bc 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation { # This project was formerly known as KeyJNote. # See http://keyj.emphy.de/apple-lawsuit/ for details. - name = "impressive-${version}"; + pname = "impressive"; + inherit version; src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a8299936662..6acd692a95b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -60,7 +60,8 @@ let }; in stdenv.mkDerivation rec { - name = "libreoffice-${version}"; + pname = "libreoffice"; + inherit version; inherit (primary-src) src; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index efcc4407842..77109a61fcb 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -60,7 +60,8 @@ let }; in stdenv.mkDerivation rec { - name = "libreoffice-${version}"; + pname = "libreoffice"; + inherit version; inherit (primary-src) src; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 3c4434f0098..655a10d3a94 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -91,7 +91,8 @@ let in stdenv.mkDerivation { - name = "mendeley-${version}"; + pname = "mendeley"; + inherit version; src = fetchurl { url = url; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 3ddca8fe762..99824cd19ec 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -5,7 +5,8 @@ let version = "1.3.3"; in stdenv.mkDerivation { - name = "money-manager-ex-${version}"; + pname = "money-manager-ex"; + inherit version; src = fetchgit { url = "https://github.com/moneymanagerex/moneymanagerex.git"; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index a7887357cd3..324cdd5cc42 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -3,7 +3,8 @@ let version = "1.44.55"; in stdenv.mkDerivation rec { - name = "mytetra-${version}"; + pname = "mytetra"; + inherit version; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index d8765d2fa61..41cc3d94016 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -13,7 +13,8 @@ let version = "unstable-2019-02-13"; in stdenv.mkDerivation { - name = "planner-${version}"; + pname = "planner"; + inherit version; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 77a60295443..edb2c778a0a 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -2,7 +2,8 @@ let version = "2.11.0"; in stdenv.mkDerivation { - name = "todo.txt-cli-${version}"; + pname = "todo.txt-cli"; + inherit version; src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 4c83d67f7cd..1f21ec60ae2 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -8,10 +8,11 @@ let version = "10.1.0.5672"; in stdenv.mkDerivation rec{ - name = "wpsoffice-${version}"; + pname = "wpsoffice"; + inherit version; src = fetchurl { - name = "${name}.tar.xz"; + name = "${pname}-${version}.tar.xz"; url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz"; sha256 = if bits == "x86_64" then "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 2042f1047b2..0a313c35a18 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -6,7 +6,8 @@ let version = "1.0.9"; in stdenv.mkDerivation { - name = "airspy-${version}"; + pname = "airspy"; + inherit version; src = fetchFromGitHub { owner = "airspy"; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index af3cabac9ef..d56994e46ff 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -8,7 +8,8 @@ let version = "2.0.0"; in stdenv.mkDerivation rec { - name = "gr-limesdr-${version}"; + pname = "gr-limesdr"; + inherit version; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 3ff73c4ef2a..4e69b11efbf 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -7,7 +7,8 @@ let version = "19.04.0"; in stdenv.mkDerivation { - name = "limesuite-${version}"; + pname = "limesuite"; + inherit version; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index 13755b88c65..f624359c163 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -3,7 +3,8 @@ let version = "1.1.8"; in stdenv.mkDerivation { - name = "multimon-ng-${version}"; + pname = "multimon-ng"; + inherit version; src = fetchFromGitHub { owner = "EliasOenal"; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 40a168675f6..a1c1f625bea 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -8,7 +8,8 @@ let version = "0.5.0"; in stdenv.mkDerivation { - name = "qradiolink-${version}"; + pname = "qradiolink"; + inherit version; src = fetchFromGitHub { owner = "kantooon"; diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 1d8056ca1e8..eacbe66e5e5 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -6,7 +6,8 @@ let version = "0.1.2"; in stdenv.mkDerivation { - name = "soapyairspy-${version}"; + pname = "soapyairspy"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 5472254b19d..0bb05a204da 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -6,7 +6,8 @@ let version = "0.4.1"; in stdenv.mkDerivation { - name = "soapybladerf-${version}"; + pname = "soapybladerf"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 2c5dd058ced..5ab4c3363f4 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -6,7 +6,8 @@ let version = "0.3.3"; in stdenv.mkDerivation { - name = "soapyhackrf-${version}"; + pname = "soapyhackrf"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index a0057978ea3..2f73403a168 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -4,7 +4,8 @@ let version = "0.5.1"; in stdenv.mkDerivation { - name = "soapyremote-${version}"; + pname = "soapyremote"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index d85fe347cd7..8bf473cb36a 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -6,7 +6,8 @@ let version = "0.3.0"; in stdenv.mkDerivation { - name = "soapyrtlsdr-${version}"; + pname = "soapyrtlsdr"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 6754e8f2a55..5e4a78cfbd2 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -13,7 +13,8 @@ let extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; in stdenv.mkDerivation { - name = "soapysdr-${version}"; + pname = "soapysdr"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 6ed88e0431e..9e910584158 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -6,7 +6,8 @@ let version = "0.3.6"; in stdenv.mkDerivation { - name = "soapyuhd-${version}"; + pname = "soapyuhd"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index fd0bd8d5d75..b3ff0f51f11 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -21,7 +21,8 @@ let }; in stdenv.mkDerivation { - name = "uhd-${version}"; + pname = "uhd"; + inherit version; src = fetchFromGitHub { owner = "EttusResearch"; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index acf0226c0db..c6b09595c20 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "welle-io-${version}"; + pname = "welle-io"; + inherit version; src = fetchFromGitHub { owner = "AlbrechtL"; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 9bacf6d9041..ff273ab8e95 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -6,7 +6,8 @@ let version = "2.2.1"; in stdenv.mkDerivation { - name = "gpredict-${version}"; + pname = "gpredict"; + inherit version; src = fetchurl { url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 92f997900d5..12007c940b3 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -4,7 +4,8 @@ with stdenv.lib; let version = "2.48"; in stdenv.mkDerivation { - name = "gwyddion-${version}"; + pname = "gwyddion"; + inherit version; src = fetchurl { url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz"; sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 4b580a6cf52..dfb04ccd1de 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -7,7 +7,8 @@ let fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; in stdenv.mkDerivation { - name = "octopus-${version}"; + pname = "octopus"; + inherit version; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index bc6301e1fd4..487558a23c1 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -11,7 +11,8 @@ let python = python3.withPackages (ps : with ps; [ six pyparsing ]); in stdenv.mkDerivation { - name = "openmolcas-${version}"; + pname = "openmolcas"; + inherit version; src = fetchFromGitLab { owner = "Molcas"; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index b655cc48c73..7be0103304a 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -2,7 +2,8 @@ let version = "1.5.0"; in stdenv.mkDerivation { - name = "tetgen-${version}"; + pname = "tetgen"; + inherit version; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 10fe722d7e9..dfe1277d5ac 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -39,7 +39,8 @@ let substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; self = stdenv.mkDerivation { - name = "coq-${version}"; + pname = "coq"; + inherit version; passthru = { inherit coq-version; diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix index d76462ca938..bebf81b030d 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "coq2html-${version}"; + pname = "coq2html"; + inherit version; src = fetchgit { url = "https://github.com/xavierleroy/coq2html"; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index db784237ea9..d6a1207b5d6 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -3,7 +3,8 @@ let version = "2.7.1"; in stdenv.mkDerivation { - name = "logisim-${version}"; + pname = "logisim"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index f1116a27c0b..1566719084c 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "tla-toolbox-${version}"; + pname = "tla-toolbox"; + inherit version; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 5e0b7fc300b..a42a5b710ce 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -17,7 +17,8 @@ let version = "1.0"; in stdenv.mkDerivation { - name = "ripser-${version}"; + pname = "ripser"; + inherit version; src = fetchFromGitHub { owner = "Ripser"; diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index b81f188a91b..17b2fe27f29 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation rec { - name = "gephi-${version}"; + pname = "gephi"; + inherit version; inherit src; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 8cd119c7b7b..59f5afb2f43 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -2,7 +2,8 @@ let version = "0.92"; in stdenv.mkDerivation rec { - name = "megam-${version}"; + pname = "megam"; + inherit version; src = fetchurl { url = "http://hal3.name/megam/megam_src.tgz"; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 7db2e6a12c2..82e3136b8f0 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -3,10 +3,11 @@ let version = "5.1.0"; in stdenv.mkDerivation rec { - name = "tulip-${version}"; + pname = "tulip"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/auber/${name}_src.tar.gz"; + url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; }; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix index 152b7121774..6623f5def4c 100644 --- a/pkgs/applications/science/programming/scyther/cli.nix +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -1,7 +1,8 @@ { stdenv, glibc, flex, bison, cmake , version, src, meta }: stdenv.mkDerivation { - name = "scyther-cli-${version}"; + pname = "scyther-cli"; + inherit version; inherit src meta; diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index e0993a58019..b4daae1afc0 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -25,7 +25,8 @@ let }; gui = stdenv.mkDerivation { - name = "scyther-gui-${version}"; + pname = "scyther-gui"; + inherit version; inherit src meta; buildInputs = [ python27Packages.wrapPython diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 87059634752..9a2e2484d7a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -28,7 +28,8 @@ let in stdenv.mkDerivation { - name = "git-${version}"; + pname = "git"; + inherit version; src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index b7828418db0..e6b746233fe 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -3,7 +3,8 @@ let version = "0.3.1"; in buildGoPackage { - name = "grv-${version}"; + pname = "grv"; + inherit version; buildInputs = [ ncurses readline curl libgit2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 34c367b20a4..3c7784e8506 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -4,7 +4,8 @@ let version = "1.0.16"; in stdenv.mkDerivation { - name = "svn-all-fast-export-${version}"; + pname = "svn-all-fast-export"; + inherit version; src = fetchFromGitHub { owner = "svn-all-fast-export"; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index d00fdd0c29e..821ecf3e3d8 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -4,7 +4,8 @@ let version = "2.4.0"; in stdenv.mkDerivation { - name = "svn2git-${version}"; + pname = "svn2git"; + inherit version; src = fetchurl { url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 33d2eb89ad0..0aa8afa9361 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -2,7 +2,8 @@ let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { - name = "guitone-${version}"; + pname = "guitone"; + inherit version; #src = fetchurl { # url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz"; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 010d4d2f86a..7081e1a0899 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -11,7 +11,8 @@ in assert perlVersion != ""; stdenv.mkDerivation rec { - name = "monotone-${version}"; + pname = "monotone"; + inherit version; src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { openssl gmp bzip2 ]; postInstall = '' - mkdir -p $out/share/${name} - cp -rv contrib/ $out/share/${name}/contrib + mkdir -p $out/share/${pname}-${version} + cp -rv contrib/ $out/share/${pname}-${version}/contrib mkdir -p $out/${perl.libPrefix}/${perlVersion} cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion} ''; diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix index 1fbc22f8776..a3ba418a146 100644 --- a/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/pkgs/applications/version-management/redmine/4.x/default.nix @@ -11,10 +11,11 @@ let }; in stdenv.mkDerivation rec { - name = "redmine-${version}"; + pname = "redmine"; + inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a"; }; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index ba1980c3d14..0b1f64b58a1 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -11,10 +11,11 @@ let }; in stdenv.mkDerivation rec { - name = "redmine-${version}"; + pname = "redmine"; + inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r"; }; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 6baeb5279c2..aed5cb807dc 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -2,7 +2,8 @@ let version = "1.12.0"; in stdenv.mkDerivation { - name = "yadm-${version}"; + pname = "yadm"; + inherit version; src = fetchFromGitHub { owner = "TheLocehiliosan"; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index ea51471d9aa..03fc1f5399a 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "subtitleeditor-${version}"; + pname = "subtitleeditor"; + inherit version; src = fetchFromGitHub { owner = "kitone"; diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index 83ca41e201c..bc6561a0bbd 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation { - name = "tivodecode-${version}"; + pname = "tivodecode"; + inherit version; src = fetchurl { url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz"; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 8222fb50a8f..6931e492e99 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -5,7 +5,8 @@ with stdenv.lib; let version = "0.600.4"; in stdenv.mkDerivation rec { - name = "virtinst-${version}"; + pname = "virtinst"; + inherit version; src = fetchurl { url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1a6ba5ac527..20930b86537 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -24,7 +24,8 @@ let main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; version = "6.0.8"; in stdenv.mkDerivation { - name = "virtualbox-${version}"; + pname = "virtualbox"; + inherit version; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index caf97c6510d..d0a1de7f600 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -3,7 +3,8 @@ let version = "1.40"; in stdenv.mkDerivation { - name = "windowlab-${version}"; + pname = "windowlab"; + inherit version; src = fetchurl { url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar"; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 678ebad75dd..f7867882d22 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -5,7 +5,8 @@ }: stdenv.mkDerivation { - name = "yabar-${version}"; + pname = "yabar"; + inherit version; src = fetchFromGitHub { inherit rev sha256; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index e563d201ff3..38a2d8fe56c 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -24,7 +24,8 @@ let }; full-ttf = stdenv.mkDerivation { - name = "dejavu-fonts-full-${version}"; + pname = "dejavu-fonts-full"; + inherit version; nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF]; src = fetchFromGitHub { @@ -44,14 +45,16 @@ let }; minimal = stdenv.mkDerivation { - name = "dejavu-fonts-minimal-${version}"; + pname = "dejavu-fonts-minimal"; + inherit version; buildCommand = '' install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf ''; inherit meta; }; in stdenv.mkDerivation { - name = "dejavu-fonts-${version}"; + pname = "dejavu-fonts"; + inherit version; buildCommand = '' install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index 6ed540121a2..cf89a8fcb8f 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -3,7 +3,8 @@ let version = "20030809"; in stdenv.mkDerivation { - name = "kochi-substitute-${version}"; + pname = "kochi-substitute"; + inherit version; src = fetchurl { url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 5043e031c08..0acb8e2c7be 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -90,7 +90,8 @@ rec { }; }; noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation { - name = "noto-fonts-emoji-${version}"; + pname = "noto-fonts-emoji"; + inherit version; src = fetchFromGitHub { owner = "googlei18n"; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 6d29d876073..79924c4832f 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -3,7 +3,8 @@ let version = "1.12"; in stdenv.mkDerivation rec { - name = "shared-mime-info-${version}"; + pname = "shared-mime-info"; + inherit version; src = fetchurl { url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 2a308a2da45..27ce5d0f078 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -11,10 +11,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-boxes-${version}"; + pname = "gnome-boxes"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 2941d629f8f..a729a924f6b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -7,7 +7,8 @@ let version = "3.32.2"; in stdenv.mkDerivation rec { - name = "gnome-notes-${version}"; + pname = "gnome-notes"; + inherit version; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 57cb90c7c45..75a15a41f97 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -7,10 +7,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-contacts-${version}"; + pname = "gnome-contacts"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy"; }; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 755c8e1b02f..b4b184d4fa0 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -5,10 +5,11 @@ let inherit (python3.pkgs) python pygobject3 requests; in stdenv.mkDerivation rec { - name = "chrome-gnome-shell-${version}"; + pname = "chrome-gnome-shell"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 6ef87cece4e..5e7db35a727 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "gnustep-make-${version}"; + pname = "gnustep-make"; + inherit version; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix index 519992fd8c2..b70fde00e15 100644 --- a/pkgs/development/compilers/as31/default.nix +++ b/pkgs/development/compilers/as31/default.nix @@ -5,7 +5,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "as31-${version}"; + pname = "as31"; + inherit version; src = fetchurl { name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz"; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index ceeff56330b..34512fc8ef0 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 8; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 74f71181190..5fefce12dbf 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 11; diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 9e3184c42eb..3f93ea9e1ba 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -19,7 +19,8 @@ let in stdenv.mkDerivation { - name = "cmucl-binary-${version}"; + pname = "cmucl-binary"; + inherit version; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 2e823fe1f0f..90355896064 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -23,7 +23,8 @@ let genericBinary = { version, sha256s, rel ? 1 }: stdenv.mkDerivation rec { - name = "crystal-binary-${version}"; + pname = "crystal-binary"; + inherit version; src = fetchurl { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 8bae6e2363f..128c245d277 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -11,7 +11,8 @@ let version = "20170519"; in stdenv.mkDerivation { - name = "dale-${version}"; + pname = "dale"; + inherit version; src = fetchFromGitHub { owner = "tomhrr"; diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 65d16c48a61..7a3324d7560 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,7 +1,8 @@ { stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }: stdenv.mkDerivation rec { - name = "gambit-${version}"; + pname = "gambit"; + inherit version; inherit src; bootstrap = import ./bootstrap.nix ( pkgs ); diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 350eed2fedd..b86b35525a6 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -14,7 +14,8 @@ let else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update in stdenv.mkDerivation { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; + inherit version; src = fetchurl { url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index b20d6f9c47e..9ef650c330f 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -7,7 +7,8 @@ # TODO: make static compilation work stdenv.mkDerivation rec { - name = "gerbil-${version}"; + pname = "gerbil"; + inherit version; inherit src; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 675522d54ea..e90e0dc3d98 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -4,7 +4,8 @@ let version = "0.7.3"; in stdenv.mkDerivation { - name = "gforth-${version}"; + pname = "gforth"; + inherit version; src = fetchurl { url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 0a974fccc88..7e11c75e07d 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,8 @@ let generic = { version, sha256, prePatch }: stdenv.mkDerivation rec { - name = "haxe-${version}"; + pname = "haxe"; + inherit version; buildInputs = [ocaml zlib pcre neko camlp4]; diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index a6955c03051..2a6551aad18 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -2,7 +2,8 @@ let version = "6M62"; in stdenv.mkDerivation { - name = "inform7-${version}"; + pname = "inform7"; + inherit version; buildInputs = [ perl coreutils gnutar gzip ]; src = fetchzip { url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz"; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index e4ef37e4721..787a9352e22 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation rec { - name = "ldc-${version}"; + pname = "ldc"; + inherit version; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 132cd67a4ae..9a602c62777 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -2,7 +2,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"; diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index d54ffd96382..e327fa79c6f 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,7 +1,8 @@ {stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { - name = "dragonegg-${version}"; + pname = "dragonegg"; + inherit version; src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw"; @@ -11,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ]; installPhase = '' - mkdir -p $out/lib $out/share/doc/${name} + mkdir -p $out/lib $out/share/doc/${pname}-${version} cp -d dragonegg.so $out/lib - cp README COPYING $out/share/doc/${name} + cp README COPYING $out/share/doc/${pname}-${version} ''; meta = { diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 6edd5e9798c..4f766e5f9a5 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -3,7 +3,8 @@ let version = "3.5.2"; in stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix index 268f2702a23..d295ddbf8a4 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix @@ -8,7 +8,8 @@ let sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j"; }; in stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index 4a398bd96a0..8fe4dd6f1d5 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89"; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index a5161333b28..b4823e9d8c2 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 6eec9971778..95632a45999 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -18,7 +18,8 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index bacf4d30556..06bc7490c7b 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, isl, python, gmp, llvm, version }: stdenv.mkDerivation { - name = "polly-${version}"; + pname = "polly"; + inherit version; src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx"; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 47a1bed126d..0276393d840 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -3,7 +3,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index 5a0410302f2..b66284152d4 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp"; diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 8b25681c2db..80b069fff75 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index d27786464c0..985cd666385 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l"; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index a73b73137dd..5fe681185b2 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -17,7 +17,8 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index e2cf437e19e..3d09277ad4c 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -3,7 +3,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index bd2cc19d2e0..af65fd6388e 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5"; diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dffb207a32b..f799199d449 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 52f27de8cdb..1a7c9aeead8 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy"; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index c8d819cc963..4dde3be277a 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -27,7 +27,8 @@ let in stdenv.mkDerivation { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 2b543b9d793..74e9b8719d1 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 735c5e9e743..8e36c5ad53a 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index cf6de26a9e8..3ab56677d72 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 325149fc19b..8adf11abddd 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index a8a6b3dfea8..a69fe286ecc 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b182f1250e7..e3015ae8448 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 227ecbeda19..1b891af09ed 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index bf23f80ef10..bfee91d91bf 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index 5e670d4de15..cce44c7e50f 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 901015bf2ff..559377bcc1b 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 3a165e9da7b..906baa4ae64 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"; diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index df9c784a10f..ac1f4f653e6 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 1e68276945e..58b9b8060fa 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7"; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 9571e7ab5a6..d3db8082c96 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 908a5f1218f..447904b9ad5 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6"; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index e2ec4e274f4..fc9e3714db0 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4"; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 2fe6f1c58f6..b5e6e0e7048 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2"; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 63ad43e62cd..823e9640cf4 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1"; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index 1b2dff2c76c..44687ead4d1 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -16,7 +16,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index e55f4aa5ba1..7adc2aa588e 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy"; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index f8a07de0722..e0bc9e816f5 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz"; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 1ee6d069f4b..58a1241d823 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp"; diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 75edd1fff54..646cd3c3ca4 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,7 +1,8 @@ { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { - name = "libunwind-${version}"; + pname = "libunwind"; + inherit version; src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q"; diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index aec1b14b994..fc52d691d03 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index f31da000bb8..254933c82a0 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8"; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 8cf55173561..166e7f68eb3 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y"; diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index f495be8a93e..207ed8f29bc 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -9,32 +9,33 @@ let in stdenv.mkDerivation rec { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; binSrc = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.x86-linux.tgz"; sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz"; sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz"; sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; }) else throw "Architecture not supported"; codeSrc = fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}.src.tgz"; sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; }; srcs = [ binSrc codeSrc ]; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index 3a3538a7ea4..2585b599caf 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; src = fetchgit { inherit url rev sha256; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 43ef5d4b62d..ecb687e96e5 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -4,11 +4,12 @@ let llvm = callPackage ./llvm.nix { }; in stdenv.mkDerivation rec { - name = "mono-${version}"; + pname = "mono"; + inherit version; src = fetchurl { inherit sha256; - url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${pname}-${version}.tar.bz2"; }; buildInputs = diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index ef6cd1160b3..2067184a5b0 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "mozart-binary-${version}"; + pname = "mozart-binary"; + inherit version; preferLocalBuild = true; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 7f22f4de624..370c08f001a 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "polyml-${version}"; + pname = "polyml"; + inherit version; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index dce46ade459..89912ac9ad6 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -29,7 +29,8 @@ let { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; } ]; in stdenv.mkDerivation { - name = "smlnj-${version}"; + pname = "smlnj"; + inherit version; inherit sources; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index bf452d21d1d..9245e59553f 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -13,7 +13,8 @@ let ''; in stdenv.mkDerivation { - name = "swi-prolog-${version}"; + pname = "swi-prolog"; + inherit version; src = fetchgit { url = "https://github.com/SWI-Prolog/swipl-devel"; diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 04efe1a9134..41cc9b38606 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "teyjus-${version}"; + pname = "teyjus"; + inherit version; src = fetchurl { url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz"; diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 57ced325aad..369d84708dc 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -3,7 +3,8 @@ let version = "0.4.4"; in stdenv.mkDerivation { - name = "clooj-${version}"; + pname = "clooj"; + inherit version; jar = fetchurl { # mirrored as original mediafire.com source does not work without user interaction diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index fa8996f0fb5..02ac6bfbcde 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -47,7 +47,8 @@ in stdenv.mkDerivation { - name = "dart-${version}"; + pname = "dart"; + inherit version; nativeBuildInputs = [ unzip diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 258aebe8172..7c7cd9abb7e 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -4,7 +4,8 @@ let version = "5.0"; in stdenv.mkDerivation { - name = "eff-${version}"; + pname = "eff"; + inherit version; src = fetchFromGitHub { owner = "matijapretnar"; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 30013946886..afd2627d20e 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -14,7 +14,8 @@ let in stdenv.mkDerivation rec { - name = "maude-${version}"; + pname = "maude"; + inherit version; src = fetchurl { url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 277993339e2..bde2f5d9fa9 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { - name = "nix-exec-${version}"; + pname = "nix-exec"; + inherit version; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4e617ce67eb..a7009097a60 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -46,7 +46,8 @@ let , libiconv, libobjc, libunwind, Foundation }: stdenv.mkDerivation rec { - name = "ruby-${version}"; + pname = "ruby"; + inherit version; src = if useRailsExpress then fetchFromGitHub { owner = "ruby"; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 2ec5923b0e1..1e1ea10ef6d 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -3,7 +3,8 @@ let version = "52.9.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 518fc5f77b7..175b2f2e767 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -6,7 +6,8 @@ with stdenv.lib; let version = "60.4.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index cd377e70cd9..d4ec1677bfb 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "tcl-${version}"; + pname = "tcl"; + inherit version; inherit src; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 36c4af5f496..abb549110a8 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -16,7 +16,8 @@ in fetchSubmodules = true; }; in stdenv.mkDerivation rec { - name = "jogl-${version}"; + pname = "jogl"; + inherit version; src = fetchgit { url = git://jogamp.org/srv/scm/jogl.git; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 76e49768d53..c9797b31eaa 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -4,7 +4,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "adns-${version}"; + pname = "adns"; + inherit version; src = fetchurl { urls = [ diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index 72305cb633f..b8d166507a9 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -5,7 +5,8 @@ with stdenv.lib; stdenv.mkDerivation { - name = "asio-${version}"; + pname = "asio"; + inherit version; src = fetchurl { url = "mirror://sourceforge/asio/asio-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index ac6f0470a0a..b8f1a5c088a 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -2,7 +2,8 @@ let version = "0.6.2"; in stdenv.mkDerivation { - name = "libgme-${version}"; + pname = "libgme"; + inherit version; meta = with stdenv.lib; { description = "A collection of video game music chip emulators"; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 11c66db7075..a2fdb66d7e9 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -3,7 +3,8 @@ let version = "1.8.2"; in stdenv.mkDerivation { - name = "avro-c++-${version}"; + pname = "avro-c++"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index cbd29a095d4..9582e54ffac 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -3,7 +3,8 @@ let version = "1.9.0"; in stdenv.mkDerivation rec { - name = "avro-c-${version}"; + pname = "avro-c"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix index b61ac1dcb09..f64090bd53a 100644 --- a/pkgs/development/libraries/bulletml/default.nix +++ b/pkgs/development/libraries/bulletml/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "bulletml-${version}"; + pname = "bulletml"; + inherit version; srcs = [ (fetchurl { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index e388b3af5f6..82570fbf7b4 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -16,10 +16,11 @@ let version = "1.16.0"; inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "cairo-${version}"; + pname = "cairo"; + inherit version; src = fetchurl { - url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 6bf7975034b..d9e69b8e751 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -7,7 +7,8 @@ # The celt codec has been deprecated and is now a part of the opus codec stdenv.mkDerivation rec { - name = "celt-${version}"; + pname = "celt"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index d329b1945fc..ff8e1ca6759 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -3,7 +3,8 @@ let version = "1.0.10"; in stdenv.mkDerivation { - name = "classads-${version}"; + pname = "classads"; + inherit version; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 9f4c4c3b6b3..7c42a7479b1 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation { - name = "codec2-${version}"; + pname = "codec2"; + inherit version; src = fetchsvn { url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}"; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 9b74ecdb0f7..506aa5f475d 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "csfml-${version}"; + pname = "csfml"; + inherit version; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 6aec15f976b..63e2707917a 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -4,7 +4,8 @@ let version = "3.3.7"; in stdenv.mkDerivation { - name = "eigen-${version}"; + pname = "eigen"; + inherit version; src = fetchurl { url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index cad4419a26c..eebe119d142 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index bb9f8fe76c9..a22b5eef8d2 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index 9aeb12344ec..b95d6dd559d 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -2,7 +2,8 @@ let version = "2016-04-23"; in stdenv.mkDerivation { - name = "fontconfig-ultimate-${version}"; + pname = "fontconfig-ultimate"; + inherit version; src = fetchFromGitHub { sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498"; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 4f1e0eaee7f..af387b7232f 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -7,10 +7,11 @@ let in stdenv.mkDerivation rec { - name = "fox-${version}"; + pname = "fox"; + inherit version; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5"; }; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index c34d9591d38..8412248b617 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -2,7 +2,8 @@ let version = "3.0.0"; in stdenv.mkDerivation { - name = "freeglut-${version}"; + pname = "freeglut"; + inherit version; src = fetchurl { url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 269c41df797..48e65cc063b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -50,10 +50,11 @@ let in stdenv.mkDerivation rec { - name = "glib-${version}"; + pname = "glib"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"; }; @@ -139,7 +140,7 @@ stdenv.mkDerivation rec { sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc @@ -148,7 +149,7 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 269071434d5..9cb5dda507d 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -6,7 +6,8 @@ let version = "5.7"; in stdenv.mkDerivation { - name = "globalarrays-${version}"; + pname = "globalarrays"; + inherit version; src = fetchFromGitHub { owner = "GlobalArrays"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index d532e906a51..d44bcdda9ae 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -14,7 +14,8 @@ let version = "1.0.22"; in stdenv.mkDerivation rec { - name = "gloox-${version}"; + pname = "gloox"; + inherit version; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 75c71632aeb..cb81b52b730 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -15,7 +15,8 @@ let doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { - name = "gnutls-kdh-${version}"; + pname = "gnutls-kdh"; + inherit version; inherit src patches; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 99b1307179a..c7556276dc3 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -3,12 +3,13 @@ let version = "2.0.4"; in stdenv.mkDerivation rec { - name = "goocanvas-${version}"; + pname = "goocanvas"; + inherit version; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz"; sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 68bf4ebec34..76173bc5b99 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -3,7 +3,8 @@ let version = "2.9.2"; in stdenv.mkDerivation { - name = "http-parser-${version}"; + pname = "http-parser"; + inherit version; src = fetchFromGitHub { owner = "nodejs"; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 867ce024d2f..297365be874 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -4,7 +4,8 @@ let version = "2.6.0"; in stdenv.mkDerivation rec { - name = "ign-math2-${version}"; + pname = "ign-math2"; + inherit version; src = fetchurl { url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 8abff4c5f05..31b9a4b0e9f 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "ign-transport-${version}"; + pname = "ign-transport"; + inherit version; inherit src; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 544f0f4c4e9..0fdce1bceed 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "rhino-${version}"; + pname = "rhino"; + inherit version; src = fetchurl { url = "mirror://mozilla/js/rhino1_7R2.zip"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 1ef453f24cd..feeb4de15e1 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -33,10 +33,11 @@ let }; libavFun = version : sha1 : stdenv.mkDerivation rec { - name = "libav-${version}"; + pname = "libav"; + inherit version; src = fetchurl { - url = "${meta.homepage}/releases/${name}.tar.xz"; + url = "${meta.homepage}/releases/${pname}-${version}.tar.xz"; inherit sha1; # upstream directly provides sha1 of releases over https }; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index d22518e96d4..c8c58315b64 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -13,7 +13,8 @@ let version = "2.2.0"; in stdenv.mkDerivation { - name = "libbladeRF-${version}"; + pname = "libbladeRF"; + inherit version; src = fetchFromGitHub { owner = "Nuand"; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index 18593f80799..4fea84723f9 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -6,7 +6,8 @@ let version = "2.1"; in stdenv.mkDerivation rec { - name = "libbytesize-${version}"; + pname = "libbytesize"; + inherit version; src = fetchFromGitHub { owner = "storaged-project"; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e016484e677..2688881e66d 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -3,7 +3,8 @@ let version = "4.0.4"; in stdenv.mkDerivation { - name = "libcec-${version}"; + pname = "libcec"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 0005525a7cd..e43cfb10a37 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -3,7 +3,8 @@ let version = "2.1.0.1"; in stdenv.mkDerivation { - name = "p8-platform-${version}"; + pname = "p8-platform"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 1a4da7713af..3fd2a328558 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -17,7 +17,8 @@ let in rec { libdwarf = stdenv.mkDerivation rec { - name = "libdwarf-${version}"; + pname = "libdwarf"; + inherit version; configureFlags = [ "--enable-shared" "--disable-nonshared" ]; @@ -37,7 +38,8 @@ in rec { }; dwarfdump = stdenv.mkDerivation rec { - name = "dwarfdump-${version}"; + pname = "dwarfdump"; + inherit version; preConfigure = '' cd dwarfdump diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 93ece69cf05..f8baa347914 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -2,7 +2,8 @@ let version = "0.7.2"; in stdenv.mkDerivation { - name = "libdynd-${version}"; + pname = "libdynd"; + inherit version; src = fetchFromGitHub { owner = "libdynd"; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index c83143dd6b1..ba92bdd5165 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -2,7 +2,8 @@ let version = "7.6.1"; in stdenv.mkDerivation rec { - name = "libjson-${version}"; + pname = "libjson"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libjson/libjson_${version}.zip"; sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 767485a7515..ff1a39fc204 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -4,12 +4,13 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "liblastfm-${version}"; + pname = "liblastfm"; + inherit version; # Upstream does not package git tags as tarballs. Get tarball from github. src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index c2731e44efb..a61c21ffec5 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -5,7 +5,8 @@ let version = "3.10.0"; in stdenv.mkDerivation rec { - name = "liblouis-${version}"; + pname = "liblouis"; + inherit version; src = fetchFromGitHub { owner = "liblouis"; diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 85800491016..231f18377e4 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -3,7 +3,8 @@ let version = "0.8.9.0"; in stdenv.mkDerivation rec { - name = "libmodplug-${version}"; + pname = "libmodplug"; + inherit version; meta = with stdenv.lib; { description = "MOD playing library"; @@ -14,7 +15,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz"; sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; } diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 106f6fe6c37..e4010280f4b 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -6,7 +6,8 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "libmpc-${version}"; # to avoid clash with the MPD client + pname = "libmpc"; + inherit version; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 8719f19acc1..cde4251e2c6 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -3,7 +3,8 @@ let version = "1.3.0"; in stdenv.mkDerivation rec { - name = "libmypaint-${version}"; + pname = "libmypaint"; + inherit version; src = fetchFromGitHub { owner = "mypaint"; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index a4b0b26a345..c0c66bc1a4a 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -3,7 +3,8 @@ let version = "1.0.3"; in stdenv.mkDerivation rec { - name = "libnih-${version}"; + pname = "libnih"; + inherit version; src = fetchurl { url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 8131420cfd6..7dc23aa1e8a 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -5,10 +5,11 @@ let deb_patch = "5"; in stdenv.mkDerivation rec { - name = "libofa-${version}"; + pname = "libofa"; + inherit version; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 10d438500a6..752be52963c 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -5,7 +5,8 @@ let version = "1.3.1"; in stdenv.mkDerivation rec { - name = "libopus-${version}"; + pname = "libopus"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 4ca0849447f..e1d70bee6c4 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -4,7 +4,8 @@ let version = "0.2.1"; in stdenv.mkDerivation rec { - name = "libopusenc-${version}"; + pname = "libopusenc"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 952509acc2e..47d9c4215fd 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -3,7 +3,8 @@ let version = "1.6.2"; in stdenv.mkDerivation { - name = "libossp-uuid-${version}"; + pname = "libossp-uuid"; + inherit version; src = fetchurl { url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index cf97744069b..bbdce71bad6 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -3,10 +3,11 @@ let version = "0.4"; in stdenv.mkDerivation rec { - name = "libpar2-${version}"; + pname = "libpar2"; + inherit version; src = fetchurl { - url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index f8c91df6468..b3dae0c60ea 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -6,7 +6,8 @@ let version = "6.14.12"; in stdenv.mkDerivation { - name = "libpgf-${version}"; + pname = "libpgf"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f175bb6ea6d..f1c7874e313 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: prefix: stdenv.mkDerivation rec { - name = "libqmatrixclient-${version}"; + pname = "libqmatrixclient"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 8018b84a52b..bdca44dc7d0 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -3,7 +3,8 @@ let version = "1.8.5"; in stdenv.mkDerivation rec { - name = "libspatialindex-${version}"; + pname = "libspatialindex"; + inherit version; src = fetchurl { url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 5bae04a88f9..9ef3d665413 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -8,7 +8,8 @@ in if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux") then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here" else stdenv.mkDerivation { - name = "libspotify-${version}"; + pname = "libspotify"; + inherit version; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -61,7 +62,8 @@ else stdenv.mkDerivation { then throw '' Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly '' else stdenv.mkDerivation { - name = "libspotify-samples-${version}"; + pname = "libspotify-samples"; + inherit version; src = libspotify.src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libspotify readline ] diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 046229e8f1d..26605eb41db 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -11,7 +11,8 @@ let boostPython = boost.override { enablePython = true; inherit python; }; in stdenv.mkDerivation { - name = "libtorrent-rasterbar-${version}"; + pname = "libtorrent-rasterbar"; + inherit version; src = fetchFromGitHub { owner = "arvidn"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 50fdbf2a81f..9bccff49b54 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -4,7 +4,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "libtoxcore-${version}"; + pname = "libtoxcore"; + inherit version; src = fetchFromGitHub { owner = "TokTok"; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index b0be3cb3c12..5ac456a60f6 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -3,10 +3,11 @@ let version = "1.0.1"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn-${version}"; + pname = "libtxc_dxtn"; + inherit version; src = fetchurl { - url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index aad8ae00c11..9a3671c3258 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -3,7 +3,8 @@ let version = "1.0"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn_s2tc-${version}"; + pname = "libtxc_dxtn_s2tc"; + inherit version; src = fetchurl { url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 7bd89b44d88..fede13fcd9b 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -4,7 +4,8 @@ let version = "4.3.4"; in stdenv.mkDerivation { - name = "libxc-${version}"; + pname = "libxc"; + inherit version; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 773389e60f5..9408b0c4587 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -5,11 +5,12 @@ let version = "5.4"; in stdenv.mkDerivation rec { - name = "libxklavier-${version}"; + pname = "libxklavier"; + inherit version; src = fetchgit { url = "git://anongit.freedesktop.org/git/libxklavier"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 29ec205d7a1..04f84d49f84 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "msgpack-${version}"; + pname = "msgpack"; + inherit version; inherit src patches; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index cbe1f984059..7f08d0a7535 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -4,7 +4,8 @@ let version = "0.6.3"; in stdenv.mkDerivation { - name = "ndn-cxx-${version}"; + pname = "ndn-cxx"; + inherit version; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 913a4a087a9..83d01f85d0a 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -3,7 +3,8 @@ let version = "2.8"; in stdenv.mkDerivation rec { - name = "ndpi-${version}"; + pname = "ndpi"; + inherit version; src = fetchFromGitHub { owner = "ntop"; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index cc5a115ed71..442fcf2e761 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: let version = "6.0.0"; in stdenv.mkDerivation { - name = "nix-plugins-${version}"; + pname = "nix-plugins"; + inherit version; src = fetchFromGitHub { owner = "shlevy"; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 4772f1111ac..b62fa1cb704 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -5,7 +5,8 @@ let version = "4.21"; in stdenv.mkDerivation { - name = "nspr-${version}"; + pname = "nspr"; + inherit version; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index c0a73fa984e..b79f940affa 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -5,10 +5,11 @@ let in stdenv.mkDerivation rec { - name = "ntrack-${version}"; + pname = "ntrack"; + inherit version; src = fetchurl { - url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w"; }; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 9a8787ad7f4..e2d34ae5f07 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -4,7 +4,8 @@ let version = "0.1.5"; in stdenv.mkDerivation { - name = "opencore-amr-${version}"; + pname = "opencore-amr"; + inherit version; src = fetchurl { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index e26f4160921..55d003d2d92 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -24,7 +24,8 @@ let in stdenv.mkDerivation rec { - name = "openjpeg-${version}"; + pname = "openjpeg"; + inherit version; src = fetchFromGitHub { owner = "uclouvain"; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 760fc3e3232..06e4726054e 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -12,10 +12,11 @@ let version = "4.0.1"; in stdenv.mkDerivation rec { - name = "openmpi-${version}"; + pname = "openmpi"; + inherit version; src = with stdenv.lib.versions; fetchurl { - url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; + url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"; }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 67b903970d3..bd4802b8775 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,10 +8,11 @@ with stdenv.lib; let common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { - name = "openssl-${version}"; + pname = "openssl"; + inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${name}.tar.gz"; + url = "https://www.openssl.org/source/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 5a5e8ffaef7..c3407289f02 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -6,7 +6,8 @@ let version = "2018-11-13"; in stdenv.mkDerivation rec { - name = "openzwave-${version}"; + pname = "openzwave"; + inherit version; # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw. # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference. diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 6edea7f5141..cf9e201b3f6 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -4,10 +4,11 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "physfs-${version}"; + pname = "physfs"; + inherit version; src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; + url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 566d88dcdb5..8f6adaf03d9 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -3,7 +3,8 @@ let version = "1.2"; in stdenv.mkDerivation rec { - name = "ppl-${version}"; + pname = "ppl"; + inherit version; src = fetchurl { url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index a98521a2d1e..957b59a6f66 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -7,7 +7,8 @@ let mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 1a20d806b96..773e3139175 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index e0c5d4db930..91c0ae5624e 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-c-${version}"; + pname = "protobuf-c"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 5bccbf74965..789a63bef74 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -3,10 +3,11 @@ let version = "8.4.2"; in stdenv.mkDerivation rec { - name = "qpdf-${version}"; + pname = "qpdf"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9"; }; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 05373cd1cbd..36576de0563 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -7,7 +7,8 @@ let version = "3.7.0"; in stdenv.mkDerivation { - name = "arpack-${version}"; + pname = "arpack"; + inherit version; src = fetchFromGitHub { owner = "opencollab"; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 4ae5ea52255..a93ede63a26 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -30,7 +30,8 @@ let version = "2017.1.0"; dijitso = pythonPackages.buildPythonPackage { - name = "dijitso-${version}"; + pname = "dijitso"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg"; @@ -54,7 +55,8 @@ let }; fiat = pythonPackages.buildPythonPackage { - name = "fiat-${version}"; + pname = "fiat"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l"; @@ -72,7 +74,8 @@ let }; ufl = pythonPackages.buildPythonPackage { - name = "ufl-${version}"; + pname = "ufl"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg"; @@ -90,7 +93,8 @@ let }; ffc = pythonPackages.buildPythonPackage { - name = "ffc-${version}"; + pname = "ffc"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0"; @@ -109,7 +113,8 @@ let }; instant = pythonPackages.buildPythonPackage { - name = "instant-${version}"; + pname = "instant"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz"; sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q"; @@ -125,7 +130,8 @@ let in stdenv.mkDerivation { - name = "dolfin-${version}"; + pname = "dolfin"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds"; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 46538d0022e..2e5bb5e371f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -12,7 +12,8 @@ let in stdenv.mkDerivation rec { - name = "liblapack-${version}"; + pname = "liblapack"; + inherit version; src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz"; sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny"; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 8444d88809a..d036e39d01a 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -5,7 +5,8 @@ with stdenv.lib; let version = "2.0.2"; in stdenv.mkDerivation { - name = "magma-${version}"; + pname = "magma"; + inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 1b043d33ad6..cf73e205830 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "sfml-${version}"; + pname = "sfml"; + inherit version; src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index fc771a493b6..82cbce8055e 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -4,7 +4,8 @@ let version = "0.12"; in stdenv.mkDerivation { - name = "libstartup-notification-${version}"; + pname = "libstartup-notification"; + inherit version; src = fetchurl { url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index d61076e569b..cc7c996f7c3 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -4,7 +4,8 @@ let version = "2.6.2"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { - name = "tinyxml-${version}"; + pname = "tinyxml"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index b80984303d7..e1f3c0bd39c 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -4,7 +4,8 @@ let version = "2.1.0"; in stdenv.mkDerivation rec { - name = "uthash-${version}"; + pname = "uthash"; + inherit version; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index f6669f2f8fe..77cd3be0cbd 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -7,7 +7,8 @@ let version = "0.3.11"; in stdenv.mkDerivation rec { - name = "volume_key-${version}"; + pname = "volume_key"; + inherit version; src = fetchgit { url = https://pagure.io/volume_key.git; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index ba77189b2a5..60f91176599 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -7,7 +7,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "wt-${version}"; + pname = "wt"; + inherit version; src = fetchFromGitHub { owner = "emweb"; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 369d011f9b3..02367e18a95 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -15,7 +15,8 @@ let version = "2.9.4"; in stdenv.mkDerivation { - name = "wxwidgets-${version}"; + pname = "wxwidgets"; + inherit version; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 271c7adf3d9..362f704a05d 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "xapian-${version}"; + pname = "xapian"; + inherit version; passthru = { inherit version; }; src = fetchurl { diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index b19bf000b0d..3e54944a377 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -5,7 +5,8 @@ let version = "1.2.28"; in stdenv.mkDerivation rec { - name = "xmlsec-${version}"; + pname = "xmlsec"; + inherit version; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 79651db23ea..ba6d5559f26 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -36,7 +36,8 @@ let }; in stdenv.mkDerivation rec { - name = "amdapp-sdk-${version}"; + pname = "amdapp-sdk"; + inherit version; src = fetchurl { url = stdenv.lib.getAttrFromPath [version "url"] src_info; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 4527a8700f6..48ea088a73c 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -4,7 +4,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "avr-libc-${version}"; + pname = "avr-libc"; + inherit version; src = fetchurl { url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 0456c8eae76..b84f358cbee 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -3,7 +3,8 @@ let version = "0.25"; in stdenv.mkDerivation { - name = "mspdebug-${version}"; + pname = "mspdebug"; + inherit version; src = fetchFromGitHub { owner = "dlbeer"; repo = "mspdebug"; diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index 4230672e12f..df0ef999dd6 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -2,7 +2,8 @@ let version = "3.1.0"; in stdenv.mkDerivation { - name = "newlib-${version}"; + pname = "newlib"; + inherit version; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv"; diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix index 0ec8664dac9..8abe4b2550e 100644 --- a/pkgs/development/misc/qmk_firmware/default.nix +++ b/pkgs/development/misc/qmk_firmware/default.nix @@ -6,7 +6,8 @@ let version = "0.6.144"; in stdenv.mkDerivation { - name = "qmk_firmware-${version}"; + pname = "qmk_firmware"; + inherit version; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index e66bb6fe211..bc806410b1e 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "betaflight-${version}"; + pname = "betaflight"; + inherit version; src = fetchFromGitHub { owner = "betaflight"; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 683883ddbce..5014cdce8f3 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "inav-${version}"; + pname = "inav"; + inherit version; src = fetchFromGitHub { owner = "iNavFlight"; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index a2ddda34347..eed4b43d6a3 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -4,7 +4,8 @@ let version = "0.6"; in stdenv.mkDerivation { - name = "abootimg-${version}"; + pname = "abootimg"; + inherit version; src = fetchFromGitHub { owner = "ggrandou"; diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix index 8128dc1cb6f..4606ebd5172 100644 --- a/pkgs/development/ocaml-modules/base64/2.0.nix +++ b/pkgs/development/ocaml-modules/base64/2.0.nix @@ -3,7 +3,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "ocaml-base64-${version}"; + pname = "ocaml-base64"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 31835316833..9239d2543ee 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -3,7 +3,8 @@ let version = "3.0"; in stdenv.mkDerivation { - name = "ocaml-dolog-${version}"; + pname = "ocaml-dolog"; + inherit version; src = fetchzip { url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 8a11d22c2c1..40db8246f4a 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -3,7 +3,8 @@ let version = "0.2.4"; in stdenv.mkDerivation { - name = "ocaml-iso8601-${version}"; + pname = "ocaml-iso8601"; + inherit version; src = fetchzip { url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz"; sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 3bced92cc3e..c91a5712137 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -3,7 +3,8 @@ let version = stdenv.lib.getVersion llvm; in stdenv.mkDerivation { - name = "ocaml-llvm-${version}"; + pname = "ocaml-llvm"; + inherit version; inherit (llvm) src; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 9a8a6259a77..65acbd6cc42 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -3,7 +3,8 @@ let version = "1.0.0"; in stdenv.mkDerivation { - name = "ocaml-magic-mime-${version}"; + pname = "ocaml-magic-mime"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index e69b9dabeab..d767c20f638 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,7 +1,8 @@ { version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { - name = "menhir-${version}"; + pname = "menhir"; + inherit version; inherit src; diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index d6d0c3292bb..8063f284728 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -6,7 +6,8 @@ let sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8"; in stdenv.mkDerivation { - name = "ocaml-make-${version}"; + pname = "ocaml-make"; + inherit version; src = fetchurl { url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 569f5081355..0263d3284ff 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -17,7 +17,8 @@ in let inherit (param) version; in stdenv.mkDerivation { - name = "ocsigen-deriving-${version}"; + pname = "ocsigen-deriving"; + inherit version; src = fetchzip { url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; inherit (param) sha256; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 39cd6417542..2db6b821b4e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -32,7 +32,8 @@ let cs_sha256 }: stdenv.mkDerivation rec { - name = "radare2-${version}"; + pname = "radare2"; + inherit version; src = fetchFromGitHub { owner = "radare"; diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 8816a005ca0..0a86aaeb6ca 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -3,7 +3,8 @@ let version = "1.9.6"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index b6c2702485b..8d1e09eeb33 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -3,7 +3,8 @@ let version = "1.10.2"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index cde6ea2f7a8..ef339e658c1 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,12 +4,13 @@ assert jdk != null; let version = "3.6.1"; in stdenv.mkDerivation rec { - name = "apache-maven-${version}"; + pname = "apache-maven"; + inherit version; builder = ./builder.sh; src = fetchurl { - url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15"; }; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1007f4df8ca..df8ccfc0e4a 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -121,7 +121,8 @@ let in stdenv.mkDerivation rec { - name = "bazel-${version}"; + pname = "bazel"; + inherit version; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 47f800c67be..b543565758c 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -6,7 +6,8 @@ let version = "4.2.1"; in stdenv.mkDerivation { - name = "gnumake-${version}"; + pname = "gnumake"; + inherit version; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.bz2"; diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 98cd7e136d2..0b858f6f20d 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -5,7 +5,8 @@ let version = "2.5.1"; in stdenv.mkDerivation { - name = "rebar-${version}"; + pname = "rebar"; + inherit version; src = fetchurl { url = "https://github.com/rebar/rebar/archive/${version}.tar.gz"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3c04f8a12af..0472f412f71 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -15,7 +15,8 @@ let goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { - name = "buildah-${version}"; + pname = "buildah"; + inherit version; inherit src; outputs = [ "bin" "man" "out" ]; diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index e07b3cd9db7..001f87b3b27 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1"; in stdenv.mkDerivation rec { - name = "casperjs-${version}"; + pname = "casperjs"; + inherit version; src = fetchFromGitHub { owner = "casperjs"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index ba0be89abf3..d9f7237d289 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -5,7 +5,8 @@ let goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { - name = "buildkite-agent-${version}"; + pname = "buildkite-agent"; + inherit version; inherit goPackagePath src postPatch; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index 553d622a83c..47f62573675 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -16,7 +16,8 @@ let }; in stdenv.mkDerivation { - name = "cdb-${version}"; + pname = "cdb"; + inherit version; src = fetchurl { url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 5eb7651f199..ca04d209fab 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -7,7 +7,8 @@ let version = "3.9.1"; in stdenv.mkDerivation rec { - name = "squirrel-sql-${version}"; + pname = "squirrel-sql"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 7eb05765428..d190ee32fca 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -45,12 +45,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; version = "1.0.8"; in stdenv.mkDerivation rec { - name = "flatpak-builder-${version}"; + pname = "flatpak-builder"; + inherit version; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { - url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912"; }; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 4ad04ae0e43..b57c9841978 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -3,7 +3,8 @@ version = "5.2.4"; in stdenv.mkDerivation { - name = "flyway-${version}"; + pname = "flyway"; + inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc"; diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 403bfeabfd0..9791cd56ea1 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -2,7 +2,8 @@ let version = "0.98"; in stdenv.mkDerivation { - name = "fastjar-${version}"; + pname = "fastjar"; + inherit version; src = fetchurl { url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 14f42ed9d40..53e2920c68d 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -3,7 +3,8 @@ let version = "2.2.3"; in stdenv.mkDerivation { - name = "minizinc-${version}"; + pname = "minizinc"; + inherit version; buildInputs = [ cmake flex bison ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 799623d34cc..284ad4a5a67 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -3,7 +3,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "minizinc-ide-${version}"; + pname = "minizinc-ide"; + inherit version; nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index ba95889b5a8..1dd53f62cec 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -3,12 +3,13 @@ let version = "0.7.2"; in stdenv.mkDerivation rec { - name="dfu-programmer-${version}"; + pname = "dfu-programmer"; + inherit version; buildInputs = [ libusb ]; src = fetchurl { - url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; + url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; }; diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix index ade9954021a..164e0e80b60 100644 --- a/pkgs/development/tools/misc/nixbang/default.nix +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -2,7 +2,8 @@ let version = "0.1.2"; in pythonPackages.buildPythonApplication { - name = "nixbang-${version}"; + pname = "nixbang"; + inherit version; namePrefix = ""; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index f99c904ed01..c0e7a3653a8 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -4,7 +4,8 @@ let version = "20130503"; in stdenv.mkDerivation rec { - name = "prelink-${version}"; + pname = "prelink"; + inherit version; buildInputs = [ libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index fdacdaef20f..98c400d5285 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -7,7 +7,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "stlink-${version}"; + pname = "stlink"; + inherit version; src = fetchFromGitHub { owner = "texane"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 82d0ec6119e..2975d64113e 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -3,7 +3,8 @@ let version = "2.1"; in stdenv.mkDerivation { - name = "teensy-loader-cli-${version}"; + pname = "teensy-loader-cli"; + inherit version; src = fetchgit { url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 07005131fb5..689b7da8802 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation rec { - name = "nailgun-${version}"; + pname = "nailgun"; + inherit version; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index f88811855a2..e6fb1b353d2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -7,7 +7,8 @@ let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" in stdenv.mkDerivation { - name = "js_of_ocaml-${version}"; + pname = "js_of_ocaml"; + inherit version; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; sha256 = { diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 41cde6f8ab7..61e8e77f384 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -3,7 +3,8 @@ let version = "0.1.10"; in stdenv.mkDerivation { - name = "obuild-${version}"; + pname = "obuild"; + inherit version; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 1dcea0da4cb..b10b7bdae57 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { # derivation of just runtime deps so env vars created by # setup-hooks can be saved for use at runtime runtime = stdenv.mkDerivation rec { - name = "utop-runtime-env-${version}"; + pname = "utop-runtime-env"; + inherit version; buildInputs = [ findlib ] ++ propagatedBuildInputs; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index e6e54f8dab9..fcd7e445b8a 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -12,7 +12,8 @@ let runtime = { cpp = stdenv.mkDerivation { - name = "antlr-runtime-cpp-${version}"; + pname = "antlr-runtime-cpp"; + inherit version; src = source; outputs = [ "out" "dev" "doc" ]; @@ -35,7 +36,8 @@ let }; antlr = stdenv.mkDerivation { - name = "antlr-${version}"; + pname = "antlr"; + inherit version; src = fetchurl { url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index d08df8265b0..2f4db7982b7 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -5,10 +5,11 @@ let generic = { version, sha256, license }: stdenv.mkDerivation rec { - name = "ragel-${version}"; + pname = "ragel"; + inherit version; src = fetchurl { - url = "https://www.colm.net/files/ragel/${name}.tar.gz"; + url = "https://www.colm.net/files/ragel/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 8f711e14654..3f0b37a7175 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -14,7 +14,8 @@ let ## stap binaries stapBuild = stdenv.mkDerivation { - name = "systemtap-${version}"; + pname = "systemtap"; + inherit version; src = fetchgit { inherit url rev sha256; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 0f1482d7953..6a709cf8f9b 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -24,7 +24,8 @@ let }; in stdenv.mkDerivation rec { - name = "pypi2nix-${version}"; + pname = "pypi2nix"; + inherit version; srcs = [ src click diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d8899de205f..786cac68425 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -20,7 +20,8 @@ let in buildGoPackage rec { - name = "skopeo-${version}"; + pname = "skopeo"; + inherit version; inherit src goPackagePath; outputs = [ "bin" "man" "out" ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 2530202a565..1e2a60566d4 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -37,7 +37,8 @@ let sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h"; manual = stdenv.mkDerivation { - name = "anki-manual-${version}"; + pname = "anki-manual"; + inherit version; src = fetchFromGitHub { owner = "dae"; repo = "ankidocs"; @@ -68,11 +69,12 @@ let in buildPythonApplication rec { - name = "anki-${version}"; + pname = "anki"; + inherit version; src = fetchurl { urls = [ - "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" + "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz" # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" # "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz" diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 5318108c491..70c23664dc0 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "armagetron-${version}"; + pname = "armagetron"; + inherit version; src = fetchurl { url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2"; sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3"; diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 98baafbb2fd..b9d3a69d87b 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -3,10 +3,11 @@ let version = "0.9.13"; in stdenv.mkDerivation rec { - name = "crrcsim-${version}"; + pname = "crrcsim"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/crrcsim/${name}.tar.gz"; + url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz"; sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698"; }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index a7725054310..0b25af645cf 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -84,7 +84,8 @@ let ''; dfhack = stdenv.mkDerivation rec { - name = "dfhack-base-${version}"; + pname = "dfhack-base"; + inherit version; # Beware of submodules src = fetchFromGitHub { diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 3407659d977..2999da8fcaa 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -18,7 +18,8 @@ let wrapper = "eduke32-wrapper"; in stdenv.mkDerivation { - name = "eduke32-${version}"; + pname = "eduke32"; + inherit version; src = fetchurl { url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz"; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 447724a2043..a138b46f81b 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation rec { - name = "endless-sky-${version}"; + pname = "endless-sky"; + inherit version; src = fetchFromGitHub { owner = "endless-sky"; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 5a04e75030f..19851341da0 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -9,7 +9,8 @@ let version = "2019.1.1"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { - name = "flightgear-base-${version}"; + pname = "flightgear-base"; + inherit version; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index d5efe2b3ebd..3b8bc1288ef 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -5,10 +5,11 @@ let version = "1.08.20121209"; freedink_data = stdenv.mkDerivation rec { - name = "freedink-data-${version}"; + pname = "freedink-data"; + inherit version; src = fetchurl { - url = "mirror://gnu/freedink/${name}.tar.gz"; + url = "mirror://gnu/freedink/${pname}-${version}.tar.gz"; sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j"; }; @@ -16,10 +17,11 @@ let }; in stdenv.mkDerivation rec { - name = "freedink-${version}"; + pname = "freedink"; + inherit version; src = fetchurl { - url = "mirror://gnu/freedink/${name}.tar.gz"; + url = "mirror://gnu/freedink/${pname}-${version}.tar.gz"; sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr"; }; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 2ebb60f3d5d..b269a5d12d6 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -3,7 +3,8 @@ let version = "0.16.1"; in stdenv.mkDerivation rec { - name = "freedroidrpg-${version}"; + pname = "freedroidrpg"; + inherit version; src = fetchurl { url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index e89d16b788a..f9ae137bb62 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -3,7 +3,8 @@ let version = "1.4.9"; in stdenv.mkDerivation { - name = "gogui-${version}"; + pname = "gogui"; + inherit version; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index 1fcf9c9527b..f57571b2a2c 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -5,7 +5,8 @@ let version = "0.7.3"; in stdenv.mkDerivation rec { - name = "linux-steam-integration-${version}"; + pname = "linux-steam-integration"; + inherit version; src = fetchFromGitHub { owner = "clearlinux"; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index de67afe45a9..df613bb4447 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -17,7 +17,8 @@ let }; in stdenv.mkDerivation { - name = "megaglest-${version}"; + pname = "megaglest"; + inherit version; src = fetchFromGitHub { owner = "MegaGlest"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 17366ae9904..52a91165537 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -24,7 +24,8 @@ let }; }; in stdenv.mkDerivation { - name = "minetest-${version}"; + pname = "minetest"; + inherit version; src = sources.src; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 39b3ae36f50..72d60eae7f6 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -13,7 +13,8 @@ let version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; in stdenv.mkDerivation { - name = "nexuiz-${version}"; + pname = "nexuiz"; + inherit version; src = fetchurl { url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip"; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 211172cee20..9b3d92a350d 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -3,7 +3,8 @@ let version = "1.0.0.2018.10.08"; in stdenv.mkDerivation { - name = "openxcom-${version}"; + pname = "openxcom"; + inherit version; src = fetchFromGitHub { owner = "SupSuper"; repo = "OpenXcom"; diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix index 88ba8679e8a..0d8a64f14cd 100644 --- a/pkgs/games/quake3/content/demo.nix +++ b/pkgs/games/quake3/content/demo.nix @@ -3,7 +3,8 @@ let version = "1.11-6"; in stdenv.mkDerivation { - name = "quake3-demodata-${version}"; + pname = "quake3-demodata"; + inherit version; src = fetchurl { url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh"; diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix index f35aaaad352..e34064d93b0 100644 --- a/pkgs/games/quake3/content/pointrelease.nix +++ b/pkgs/games/quake3/content/pointrelease.nix @@ -3,7 +3,8 @@ let version = "1.32b-3"; in stdenv.mkDerivation { - name = "quake3-pointrelease-${version}"; + pname = "quake3-pointrelease"; + inherit version; src = fetchurl { url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run"; diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix index 8b07a38c7bb..459ff238b4a 100644 --- a/pkgs/games/rrootage/default.nix +++ b/pkgs/games/rrootage/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "rrootage-${version}"; + pname = "rrootage"; + inherit version; src = fetchurl { url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz"; sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln"; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 5cbb3c1796f..e6889731619 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -107,7 +107,8 @@ let }; binaries = stdenv.mkDerivation rec { - name = "simutrans-${version}"; + pname = "simutrans"; + inherit version; src = binary_src; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 3e29ceb5b01..63c7e4675b7 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -5,7 +5,8 @@ let version = "1.0.0.59"; in stdenv.mkDerivation rec { - name = "steam-original-${version}"; + pname = "steam-original"; + inherit version; src = fetchurl { url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 13033c7f9f0..eea92b43b52 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -9,7 +9,8 @@ in stdenv.mkDerivation { - name = "stockfish-${version}"; + pname = "stockfish"; + inherit version; src = fetchurl { url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 6c571da561c..e018dfd664d 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -10,7 +10,8 @@ let version = "git"; bin = stdenv.mkDerivation { - name = "vdrift-${version}"; + pname = "vdrift"; + inherit version; src = fetchFromGitHub { owner = "vdrift"; diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index c61bfb806c5..0fa637e040e 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation { - name = "epson-201106w-${version}"; + pname = "epson-201106w"; + inherit version; src = fetchurl { url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"; diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index 1dac6034fda..fe52b104a52 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -9,7 +9,8 @@ let }; in stdenv.mkDerivation { - name = "epson-alc1100-${version}"; + pname = "epson-alc1100"; + inherit version; src = fetchurl { url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz"; diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index 2a92f8a59d9..9da1a8269ab 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "epson_201207w-${version}"; + pname = "epson_201207w"; + inherit version; src = fetchurl { url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm"; diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index a7d5710a279..cd322bf8fdb 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -3,7 +3,8 @@ let version = "20160218"; in stdenv.mkDerivation { - name = "postscript-lexmark-${version}"; + pname = "postscript-lexmark"; + inherit version; src = fetchurl { url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 35a9bd2e384..be199936426 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -17,7 +17,8 @@ in url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz"; sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; }; - name = "sundtek-${version}"; + pname = "sundtek"; + inherit version; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index c942ec59f37..1ed279d2998 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -4,7 +4,8 @@ let version = "0.8.8"; in stdenv.mkDerivation { - name = "xboxdrv-${version}"; + pname = "xboxdrv"; + inherit version; src = fetchurl { url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz"; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index a560ecd0a21..13cd21391f1 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -34,7 +34,8 @@ let in stdenv.mkDerivation rec { - name = "ccemux-${version}"; + pname = "ccemux"; + inherit version; src = jar; dontUnpack = true; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 446aac62982..5b80a553625 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -36,10 +36,11 @@ let in stdenv.mkDerivation rec { - name = "ghostscript-${version}"; + pname = "ghostscript"; + inherit version; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz"; inherit sha512; }; diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 1a064e8c627..5af75be690c 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl }: let version = "1.2.0"; in stdenv.mkDerivation { - name = "long-shebang-${version}"; + pname = "long-shebang"; + inherit version; src = fetchurl { url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz"; diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix index 91584bfa1fe..7f3aa11c3f0 100644 --- a/pkgs/misc/themes/kde2/default.nix +++ b/pkgs/misc/themes/kde2/default.nix @@ -5,7 +5,8 @@ let version = "2017-03-15"; in stdenv.mkDerivation rec { - name = "kde2-decoration-${version}"; + pname = "kde2-decoration"; + inherit version; src = fetchFromGitHub { owner = "repos-holder"; diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 54715c01a9e..0d4655186eb 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -8,7 +8,8 @@ let version = "1.9"; in stdenv.mkDerivation { - name = "qtcurve-${version}"; + pname = "qtcurve"; + inherit version; src = fetchurl { url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz"; sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8"; diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 50c48098ab0..205d788da6e 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -27,7 +27,8 @@ let ]; in stdenv.mkDerivation rec { - name = "beegfs-${version}"; + pname = "beegfs"; + inherit version; src = fetchurl { url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}"; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 1cc0e7ae4ca..58cd88b4dce 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -3,7 +3,8 @@ let version = "5.100.138"; in stdenv.mkDerivation { - name = "b43-firmware-${version}"; + pname = "b43-firmware"; + inherit version; src = fetchurl { url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2"; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 5f8f6c54252..c9723c944ab 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -35,7 +35,8 @@ in stdenv.mkDerivation { - name = "facetimehd-firmware-${version}"; + pname = "facetimehd-firmware"; + inherit version; src = fetchurl { url = dmgUrl; sha256 = "0xqkl4yds0n9fdjvnk0v5mj382q02crry6wm2q7j3ncdqwsv02sv"; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index 5b14546c90f..70a0bdbe240 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -2,7 +2,8 @@ let version = "12"; in stdenv.mkDerivation { - name = "fwupdate-${version}"; + pname = "fwupdate"; + inherit version; src = fetchurl { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index f829f1da424..35c91c5ec07 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -10,12 +10,13 @@ let isFuse3 = stdenv.lib.hasPrefix "3" version; in stdenv.mkDerivation rec { - name = "fuse-${version}"; + pname = "fuse"; + inherit version; src = fetchFromGitHub { owner = "libfuse"; repo = "libfuse"; - rev = name; + rev = "${pname}-${version}"; sha256 = sha256Hash; }; diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 15bdabcc3dc..d2319fdcf5c 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -3,7 +3,8 @@ let version = "2.0"; in stdenv.mkDerivation rec { - name = "hibernate-${version}"; + pname = "hibernate"; + inherit version; src = fetchurl { url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz"; sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh"; diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 932b8143898..7b41b095091 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -2,7 +2,8 @@ let version = "0.7"; in stdenv.mkDerivation { - name = "iomelt-${version}"; + pname = "iomelt"; + inherit version; src = fetchurl { url = "http://iomelt.com/s/iomelt-${version}.tar.gz"; sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 527811c2b8d..2c01dcb9731 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -93,7 +93,8 @@ let configfile = stdenv.mkDerivation { inherit ignoreConfigErrors autoModules preferBuiltin kernelArch; - name = "linux-config-${version}"; + pname = "linux-config"; + inherit version; generateConfig = ./generate-config.pl; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 266c94fd8c8..55ae78219d1 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -4,7 +4,8 @@ let version = "22-1.1ubuntu1"; # Zesty in stdenv.mkDerivation { - name = "kmod-blacklist-${version}"; + pname = "kmod-blacklist"; + inherit version; src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 0c333feab1c..96bb91175dc 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -7,7 +7,8 @@ let git = https://github.com/LemonBoy/ldm.git; in stdenv.mkDerivation rec { - name = "ldm-${version}"; + pname = "ldm"; + inherit version; # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 93cab433c9c..b2d1ca4791a 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -13,7 +13,8 @@ let in stdenv.mkDerivation rec { - name = "lsiutils-${version}"; + pname = "lsiutils"; + inherit version; srcs = [ src "Source/lsiutil.tar.gz" ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 469096d014d..9944250bf30 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "lvm2-${version}"; + pname = "lvm2"; + inherit version; src = fetchgit { url = "git://sourceware.org/git/lvm2.git"; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 43f184f384d..24213cd2fb5 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -5,7 +5,8 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; let version = "1.0.beta1-9e810b1"; in stdenv.mkDerivation { - name = "ply-${version}"; + pname = "ply"; + inherit version; nativeBuildInputs = [ autoreconfHook flex yacc p7zip ]; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index e604f73de2d..ce0e8707ff5 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -7,7 +7,8 @@ let version = "25.0"; in stdenv.mkDerivation { - name = "rdma-core-${version}"; + pname = "rdma-core"; + inherit version; src = fetchFromGitHub { owner = "linux-rdma"; diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix index ee7325edbe7..3cb964f364d 100644 --- a/pkgs/os-specific/linux/regionset/default.nix +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -2,7 +2,8 @@ let version = "0.2"; in stdenv.mkDerivation { - name = "regionset-${version}"; + pname = "regionset"; + inherit version; src = fetchurl { url = "http://linvdr.org/download/regionset/regionset-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 0962bd91132..b79a2cd342a 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -8,10 +8,11 @@ let patchVersion = "2"; in stdenv.mkDerivation rec { - name = "util-linux-${version}"; + pname = "util-linux"; + inherit version; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${pname}-${version}.tar.xz"; sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3"; }; diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index 88af53dd046..fedfea15ccb 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -3,9 +3,10 @@ let version = "2.5.1"; in stdenv.mkDerivation rec { - name = "libgnurx-${version}"; + pname = "libgnurx"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz"; + url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz"; sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; }; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index a7d4f09b90e..022aaffe596 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -3,7 +3,8 @@ let version = "5.0.4"; in stdenv.mkDerivation { - name = "mingw-w64-${version}"; + pname = "mingw-w64"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index de0f36dac5f..286f4a0d41f 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "pthreads-w32-${version}"; + pname = "pthreads-w32"; version = "2.9.1"; src = fetchzip { diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 7fdbfb6472c..df4a9f85de6 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -6,11 +6,12 @@ let generic = { version, sha256, enableIPv6 ? false }: stdenv.mkDerivation rec { - name = "bird-${version}"; + pname = "bird"; + inherit version; src = fetchurl { inherit sha256; - url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; + url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 4b71aaeca3a..e21ad5723b0 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -12,7 +12,8 @@ daemonlib = fetchgit { in stdenv.mkDerivation rec { - name = "brickd-${version}"; + pname = "brickd"; + inherit version; src = fetchgit { url = "git://github.com/Tinkerforge/brickd.git"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 74d0d1341d6..369bcb5d2cd 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -11,10 +11,11 @@ assert enablePython -> python3 != null; let version = "9.14.4"; in stdenv.mkDerivation rec { - name = "bind-${version}"; + pname = "bind"; + inherit version; src = fetchurl { - url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii"; }; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index ff767d9ad43..a6f4f992671 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "mod_fastcgi-${version}"; + pname = "mod_fastcgi"; + inherit version; src = fetchurl { url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 19b2d01f5be..395504e4970 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -4,10 +4,11 @@ let version = "0.15"; in stdenv.mkDerivation rec { - name = "gatling-${version}"; + pname = "gatling"; + inherit version; src = fetchurl { - url = "https://www.fefe.de/gatling/${name}.tar.xz"; + url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz"; sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg"; }; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index b18e1ea162f..3c29ddb8e0a 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -4,10 +4,11 @@ let version = "0.11"; in stdenv.mkDerivation rec { - name = "myserver-${version}"; + pname = "myserver"; + inherit version; src = fetchurl { - url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; + url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz"; sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; }; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 12b873df6a4..7292efd2f71 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "nginx-${version}"; + pname = "nginx"; + inherit version; src = fetchurl { url = "https://nginx.org/download/nginx-${version}.tar.gz"; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 8c00bcdbee2..890cd188053 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -22,7 +22,8 @@ let in stdenv.mkDerivation { - name = "pfixtools-${version}"; + pname = "pfixtools"; + inherit version; src = pfixtoolsSrc; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 2fc8232f0a2..2919647e573 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -4,7 +4,8 @@ let version = "5.9.0"; mattermost-server = buildGoPackage rec { - name = "mattermost-server-${version}"; + pname = "mattermost-server"; + inherit version; src = fetchFromGitHub { owner = "mattermost"; @@ -23,7 +24,8 @@ let }; mattermost-webapp = stdenv.mkDerivation { - name = "mattermost-webapp-${version}"; + pname = "mattermost-webapp"; + inherit version; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 1de1edfa8e1..c1f4746fadf 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -11,7 +11,8 @@ let }; backend = buildGoPackage { - name = "uchiwa-backend-${version}"; + pname = "uchiwa-backend"; + inherit version; goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' @@ -27,7 +28,8 @@ let }; in stdenv.mkDerivation rec { - name = "uchiwa-${version}"; + pname = "uchiwa"; + inherit version; inherit src; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 842c988d9b3..2864449267a 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -21,7 +21,8 @@ let version = "3.4.10"; ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; in stdenv.mkDerivation rec { - name = "mongodb-${version}"; + pname = "mongodb"; + inherit version; src = fetchurl { url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 7ba23f61fed..1238778658a 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "sphinxsearch-${version}"; + pname = "sphinxsearch"; + inherit version; src = mainSrc; configureFlags = [ diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 287054a750b..0770191c1b9 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -6,7 +6,8 @@ let version = "11.33.3"; in stdenv.mkDerivation rec { - name = "monetdb-${version}"; + pname = "monetdb"; + inherit version; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index e05d9e919d1..c996d7c0c8b 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -6,7 +6,8 @@ let version = "4.2.8"; in stdenv.mkDerivation rec { - name = "tvheadend-${version}"; + pname = "tvheadend"; + inherit version; src = fetchFromGitHub { owner = "tvheadend"; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 76c4bfc428e..b0fa2861dbc 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -3,7 +3,8 @@ let generic = { version, sha256, suffix ? "" }: stdenv.mkDerivation rec { - name = "unifi-controller-${version}"; + pname = "unifi-controller"; + inherit version; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb"; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 4ee23e68265..2375e81ff9e 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -4,10 +4,11 @@ let common = { version, sha256, extraBuildInputs ? [] }: stdenv.mkDerivation rec { - name = "varnish-${version}"; + pname = "varnish"; + inherit version; src = fetchurl { - url = "https://varnish-cache.org/_downloads/${name}.tgz"; + url = "https://varnish-cache.org/_downloads/${pname}-${version}.tgz"; inherit sha256; }; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 92350595dd8..84904d48b1e 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -2,7 +2,8 @@ let version = "1.3.1"; in stdenv.mkDerivation { - name = "quartz-wm-${version}"; + pname = "quartz-wm"; + inherit version; src = fetchurl { url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz"; sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9"; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 2fa31fff299..ed41976e1ac 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -45,7 +45,8 @@ in stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; deps = stdenv.mkDerivation { - name = "ejabberd-deps-${version}"; + pname = "ejabberd-deps"; + inherit version; inherit src; diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 789ddaf4d9b..446f28ba652 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "es-${version}"; + pname = "es"; + inherit version; src = fetchurl { url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 48c8fd0815e..05e9a0c757e 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -3,7 +3,8 @@ let version = "0.6.0"; in stdenv.mkDerivation { - name = "oil-${version}"; + pname = "oil"; + inherit version; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index e9458520bb4..0a26b8a7821 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "zsh-${version}"; + pname = "zsh"; + inherit version; src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 0a5c3ef666e..3ce32a5e436 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "nix-zsh-completions-${version}"; + pname = "nix-zsh-completions"; + inherit version; src = fetchFromGitHub { owner = "spwhitt"; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 0d764a4cbd1..f5a8fd24f5e 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -56,10 +56,11 @@ let }; in stdenv.mkDerivation rec { - name = "bumblebee-${version}"; + pname = "bumblebee"; + inherit version; src = fetchurl { - url = "https://bumblebee-project.org/${name}.tar.gz"; + url = "https://bumblebee-project.org/${pname}-${version}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index eda5703d6a8..95aa15840da 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -3,10 +3,11 @@ let version = "1.6.1"; in stdenv.mkDerivation rec { - name = "nitrogen-${version}"; + pname = "nitrogen"; + inherit version; src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz"; + url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz"; sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl"; }; diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index 79ef4cb56dc..a648eefcdde 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -2,7 +2,8 @@ let version = "1.09"; in stdenv.mkDerivation { - name = "xautomation-${version}"; + pname = "xautomation"; + inherit version; src = fetchurl { url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 4e4e49bd946..23e0ce63e5b 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -2,7 +2,8 @@ let version = "1.8.6"; in stdenv.mkDerivation { - name = "xbindkeys-${version}"; + pname = "xbindkeys"; + inherit version; src = fetchurl { url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index dbbdb0c04e9..b9d48f54574 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -4,7 +4,8 @@ let version = "4"; in stdenv.mkDerivation { - name = "xwinwrap-${version}"; + pname = "xwinwrap"; + inherit version; src = fetchbzr { url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index cb73233dcb4..3f958f7f958 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/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index 169f419cd67..d6c988ef0be 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -2,7 +2,8 @@ let version = "0.12.2"; in stdenv.mkDerivation rec { - name = "dir2opus-${version}"; + pname = "dir2opus"; + inherit version; pythonPath = [ mutagen ]; buildInputs = [ wrapPython ]; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d"; }; diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index d86a0b09c26..bdc431bcb92 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -5,7 +5,8 @@ let in mkDerivation { - name = "qastools-${version}"; + pname = "qastools"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2"; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index bf10f556b6b..8f4cd60e1ee 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -10,7 +10,8 @@ let version = "0.29.2"; in with stdenv.lib; stdenv.mkDerivation rec { - name = "bup-${version}"; + pname = "bup"; + inherit version; src = fetchFromGitHub { repo = "bup"; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 05792ecbb12..973e9217644 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -24,7 +24,8 @@ let checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in stdenv.mkDerivation rec { - name = "znapzend-${version}"; + pname = "znapzend"; + inherit version; src = fetchFromGitHub { owner = "oetiker"; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 56ec8e19f54..09fbc8b38c8 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -4,7 +4,8 @@ let version = "0.17"; in stdenv.mkDerivation { - name = "lsdvd-${version}"; + pname = "lsdvd"; + inherit version; src = fetchurl { url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 1d5cd85a62e..94ca5eb58b1 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -4,10 +4,11 @@ let major = "1.1"; version = "${major}.13"; in stdenv.mkDerivation rec { - name = "pbzip2-${version}"; + pname = "pbzip2"; + inherit version; src = fetchurl { - url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg"; }; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 6ecc65149c4..e8a4917be99 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -96,7 +96,8 @@ let in stdenv.mkDerivation { - name="ceph-${version}"; + pname = "ceph"; + inherit version; inherit src; diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index 2e4ea88df7f..e6c4474765c 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -7,7 +7,8 @@ let version = "0.7.1"; in stdenv.mkDerivation rec { - name = "dislocker-${version}"; + pname = "dislocker"; + inherit version; src = fetchFromGitHub { owner = "aorimn"; diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 6044806a34b..58963753a51 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -2,7 +2,8 @@ let version = "0.5"; in stdenv.mkDerivation { - name = "jmtpfs-${version}"; + pname = "jmtpfs"; + inherit version; src = fetchFromGitHub { sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 967a8ee43be..c9af30f873b 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -2,10 +2,11 @@ let version = "1.2.1"; in stdenv.mkDerivation rec { - name = "reiser4progs-${version}"; + pname = "reiser4progs"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; + url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; }; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 345974bed58..a89ea065750 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -2,10 +2,11 @@ let version = "3.6.24"; in stdenv.mkDerivation rec { - name = "reiserfsprogs-${version}"; + pname = "reiserfsprogs"; + inherit version; src = fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${name}.tar.xz"; + url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz"; sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y"; }; diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix index 518e92814a4..476d8065312 100644 --- a/pkgs/tools/filesystems/zfstools/default.nix +++ b/pkgs/tools/filesystems/zfstools/default.nix @@ -2,7 +2,8 @@ let version = "0.3.6"; in stdenv.mkDerivation rec { - name = "zfstools-${version}"; + pname = "zfstools"; + inherit version; src = fetchFromGitHub { sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index b66257f442e..1b2425fa71a 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -5,7 +5,8 @@ let version = "2.1.1"; in stdenv.mkDerivation rec { - name = "argyllcms-${version}"; + pname = "argyllcms"; + inherit version; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index 57a6c8c9673..e57f80f738f 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -8,7 +8,8 @@ let sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; in stdenv.mkDerivation { - name = "briss-${version}"; + pname = "briss"; + inherit version; src = fetchurl { url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; inherit sha256; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 51212a3ea94..848d804bb38 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -13,7 +13,8 @@ let sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; }; in stdenv.mkDerivation rec { - name = "gmic-${version}"; + pname = "gmic"; + inherit version; outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix index 7ea73ab8db8..e5bdf6f3177 100644 --- a/pkgs/tools/graphics/gmic_krita_qt/default.nix +++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix @@ -7,7 +7,8 @@ let version = "2.3.6"; in stdenv.mkDerivation rec { - name = "gmic_krita_qt-${version}"; + pname = "gmic_krita_qt"; + inherit version; gmic-community = fetchFromGitHub { owner = "dtschump"; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index db21df9b5d0..6cdd6dd71c1 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -25,7 +25,8 @@ let in stdenv.mkDerivation rec { - name = "graphviz-${version}"; + pname = "graphviz"; + inherit version; src = fetchFromGitLab { owner = "graphviz"; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 666cdae131e..832a48baab7 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -4,7 +4,8 @@ let version = "0.20"; in stdenv.mkDerivation { - name = "mscgen-${version}"; + pname = "mscgen"; + inherit version; src = fetchurl { url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index c91c18e3f0b..b65962ee7ba 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -6,7 +6,8 @@ let version = "6.14.12"; in stdenv.mkDerivation { - name = "pgf-${version}"; + pname = "pgf"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 3769860d469..42a86187a72 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -4,7 +4,8 @@ let version = "2018-04-19"; in stdenv.mkDerivation rec { - name = "twilight-${version}"; + pname = "twilight"; + inherit version; src = fetchFromGitHub { owner = "tweakoz"; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 2dac9bd60c9..55cfa09aa24 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -22,7 +22,8 @@ let in buildGoPackage { - name = "aptly-${version}"; + pname = "aptly"; + inherit version; src = aptlySrc; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 423fc9d8535..3c0d42e832e 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -9,7 +9,8 @@ let version = "1.8.1"; in stdenv.mkDerivation { - name = "autorandr-${version}"; + pname = "autorandr"; + inherit version; buildInputs = [ python ]; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index 90fc68dcc5c..b86bc38cb26 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -3,10 +3,11 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "buildtorrent-${version}"; + pname = "buildtorrent"; + inherit version; src = fetchurl { - url = "https://mathr.co.uk/blog/code/${name}.tar.gz"; + url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz"; sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; }; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 135eda554b3..31c35af8118 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "clasp-${version}"; + pname = "clasp"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 8453aa67747..0d5efb2ca22 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -5,7 +5,8 @@ let version = "0.4.4"; in stdenv.mkDerivation rec { - name = "ddccontrol-${version}"; + pname = "ddccontrol"; + inherit version; src = fetchFromGitHub { owner = "ddccontrol"; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 5eb4055d5b9..bcd3ec6d8f7 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -2,7 +2,8 @@ let version = "2018-12-06"; in stdenv.mkDerivation rec { - name = "edid-decode-unstable-${version}"; + pname = "edid-decode-unstable"; + inherit version; src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 45d27e7b7c8..871f113a41d 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -13,7 +13,8 @@ let srcs = { version = "2.6.2"; in stdenv.mkDerivation { - name = "fortune-mod-${version}"; + pname = "fortune-mod"; + inherit version; src = srcs.fortune; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index b79388c6f29..e5c0997c8e3 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -7,7 +7,8 @@ let in buildGoPackage ({ - name = "gh-ost-${version}"; + pname = "gh-ost"; + inherit version; inherit goPackagePath; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 6c5bac11e73..51c6d9c2075 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "gringo-${version}"; + pname = "gringo"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index ec1c5897ed7..a176ef13fcc 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -40,11 +40,12 @@ assert zfsSupport -> zfs != null; assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { - name = "grub-${version}"; + pname = "grub"; + inherit version; src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; }; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index ca4e477adce..7b432df3e8b 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -29,7 +29,8 @@ let in stdenv.mkDerivation rec { - name = "trustedGRUB2-${version}"; + pname = "trustedGRUB2"; + inherit version; src = if for_HP_laptop then fetchgit { diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index 8b19cd03895..af4d4228c2c 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -2,7 +2,8 @@ let version = "0.0.5"; in stdenv.mkDerivation { - name = "hdaps-gl-${version}"; + pname = "hdaps-gl"; + inherit version; src = fetchzip { url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz"; sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4"; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index e48d6354eb5..6624eb5102d 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -12,7 +12,8 @@ in with stdenv.lib; with perlPackages; stdenv.mkDerivation { - name = "lbdb-${version}"; + pname = "lbdb"; + inherit version; src = fetchurl { url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 8a3842322f9..b365086c46d 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -4,7 +4,8 @@ let version = "0.7.1"; in stdenv.mkDerivation { - name = "mdbtools-${version}"; + pname = "mdbtools"; + inherit version; src = fetchFromGitHub { owner = "brianb"; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 16762d243db..25d7eaba55e 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -52,7 +52,8 @@ let throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "mongodb-compass-${version}"; + pname = "mongodb-compass"; + inherit version; inherit src; diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 6c757ca224a..a22799b2073 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -6,7 +6,8 @@ let version = "0.0.3"; in stdenv.mkDerivation { - name = "shallot-${version}"; + pname = "shallot"; + inherit version; src = fetchFromGitHub { owner = "katmagic"; diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 3ab404d0207..0a3bb19d14b 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -83,7 +83,8 @@ let }; in stdenv.mkDerivation { - name = "ultrastar-manager-${version}"; + pname = "ultrastar-manager"; + inherit version; src = patchedSrc; postPatch = '' diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index aad5b35c79f..62e2b31fa15 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -6,7 +6,8 @@ let version = "2011-12-26"; in stdenv.mkDerivation { - name = "xburst-tools-${version}"; + pname = "xburst-tools"; + inherit version; src = fetchgit { url = git://projects.qi-hardware.com/xburst-tools.git; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 993e9ad7469..12885982d26 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -12,7 +12,8 @@ let exec ${jre}/bin/java -jar ${jar} "$@" ''; in stdenv.mkDerivation { - name = "burpsuite-${version}"; + pname = "burpsuite"; + inherit version; buildCommand = '' mkdir -p $out/bin echo "${launcher}" > $out/bin/burpsuite diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index a06b409ca49..4637a39e6e9 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -4,10 +4,11 @@ let version = "0.6.1"; in stdenv.mkDerivation rec { - name = "bwm-ng-${version}"; + pname = "bwm-ng"; + inherit version; src = fetchurl { - url = "https://www.gropp.org/bwm-ng/${name}.tar.gz"; + url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index b8a7133e7bc..974f8a1f346 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -11,7 +11,8 @@ let in stdenv.mkDerivation { - name = "djbdns-${version}"; + pname = "djbdns"; + inherit version; src = fetchurl { url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz"; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index d7ff19612eb..b5d4d5e6dcb 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -3,7 +3,8 @@ let version = "3.0.0"; in stdenv.mkDerivation rec { - name = "easyrsa-${version}"; + pname = "easyrsa"; + inherit version; src = fetchFromGitHub { owner = "OpenVPN"; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 6fdcfaa70db..354288b3ce6 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -4,7 +4,8 @@ let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in stdenv.mkDerivation { - name = "gmrender-resurrect-${version}"; + pname = "gmrender-resurrect"; + inherit version; src = fetchFromGitHub { owner = "hzeller"; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index db63b16415b..8261ba6e284 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -2,7 +2,8 @@ let version = "2.3"; apk = stdenv.mkDerivation { - name = "gnirehtet.apk-${version}"; + pname = "gnirehtet.apk"; + inherit version; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz"; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 56a101b3157..49cc5710e59 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -3,7 +3,8 @@ let version = "1.2.1"; in stdenv.mkDerivation { - name = "minidlna-${version}"; + pname = "minidlna"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 84b31bd5d40..dc0a4457dde 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -3,10 +3,11 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "miniupnpc-${version}"; + pname = "miniupnpc"; + inherit version; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index fdfa446907c..d95171807df 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -5,7 +5,8 @@ let sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r"; in stdenv.mkDerivation { - name = "nettee-${version}"; + pname = "nettee"; + inherit version; src = fetchurl { url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz"; diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 5ad3adfc915..bfd2c035cdb 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -5,7 +5,8 @@ let version = "1.6.17"; in stdenv.mkDerivation { - name = "nfdump-${version}"; + pname = "nfdump"; + inherit version; src = fetchFromGitHub { owner = "phaag"; diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index e585af81991..320e7614c7c 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -4,10 +4,11 @@ let version = "2.2"; in stdenv.mkDerivation rec { - name = "phodav-${version}"; + pname = "phodav"; + inherit version; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${name}.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; sha256 = "1hap0lncbcmivnflh0fbx7y58ry78p9wgj7z03r64ic0kvf0a0q8"; }; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index ac64e135c2f..b2016fe9452 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -3,10 +3,11 @@ let version = "1.5c"; in stdenv.mkDerivation rec { - name = "zssh-${version}"; + pname = "zssh"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/zssh/${name}.tgz"; + url = "mirror://sourceforge/zssh/${pname}-${version}.tgz"; sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52"; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aa212d655f8..a5e0e7f2e79 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -124,7 +124,8 @@ common = inherit fromGit; perl-bindings = if includesPerl then nix else stdenv.mkDerivation { - name = "nix-perl-${version}"; + pname = "nix-perl"; + inherit version; inherit src; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 296080cbd8e..324ac46b084 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -3,7 +3,8 @@ let version = "0.10.4"; in pythonPackages.buildPythonApplication { - name = "fail2ban-${version}"; + pname = "fail2ban"; + inherit version; src = fetchFromGitHub { owner = "fail2ban"; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 2b1708c9243..c4b96f04dc2 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -3,7 +3,8 @@ let version = "0.3.0"; in stdenv.mkDerivation rec { - name = "haka-${version}"; + pname = "haka"; + inherit version; src = fetchurl { name = "haka_${version}_source.tar.gz"; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 1944cf236e1..1812b2645fe 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -4,10 +4,11 @@ let version = "1.3.9.1"; in stdenv.mkDerivation rec { - name = "tpm-tools-${version}"; + pname = "tpm-tools"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/trousers/tpm-tools/${version}/${pname}-${version}.tar.gz"; sha256 = "0s7srgghykxnlb1g4izabzf2gfb1knxc0nzn6bly49h8cpi19dww"; }; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index b58e41d850d..d33cdeb1c56 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -29,7 +29,8 @@ let }; in stdenv.mkDerivation { - name = "vault-bin-${version}"; + pname = "vault-bin"; + inherit version; src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index ad7715f0fe6..83c0a287533 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation rec { - name = "ior-${version}"; + pname = "ior"; + inherit version; src = fetchurl { url = "https://github.com/LLNL/ior/archive/${version}.tar.gz"; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 05d96afded1..2da76cce0cd 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -13,10 +13,11 @@ let }; in stdenv.mkDerivation rec { - name = "smartmontools-${version}"; + pname = "smartmontools"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; + url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5"; }; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index a69a527f68f..0163d550217 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -24,7 +24,8 @@ let ""; # use linux flags by default in stdenv.mkDerivation { - name = "tree-${version}"; + pname = "tree"; + inherit version; src = fetchurl { url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz"; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index 9f6b7a7f122..3b80af365f6 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, autoreconfHook }: let version = "0.6.3"; in stdenv.mkDerivation { - name = "cconv-${version}"; + pname = "cconv"; + inherit version; src = fetchurl { url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz"; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 702d1b4d89f..87c8fdfd890 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -3,7 +3,8 @@ let version = "3.3"; in stdenv.mkDerivation { - name = "gnugrep-${version}"; + pname = "gnugrep"; + inherit version; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index fc43ed0abe2..2c0e2f29d24 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -23,7 +23,8 @@ let }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); in stdenv.mkDerivation rec { - name = "kindlegen-${version}"; + pname = "kindlegen"; + inherit version; src = fetchurl { inherit url; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 5aab4c80d27..7c2543f7219 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -91,7 +91,8 @@ texliveYear = year; core = stdenv.mkDerivation rec { - name = "texlive-bin-${version}"; + pname = "texlive-bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -183,7 +184,8 @@ core = stdenv.mkDerivation rec { inherit (core-big) metafont metapost luatex xetex; core-big = stdenv.mkDerivation { #TODO: upmendex - name = "texlive-core-big.bin-${version}"; + pname = "texlive-core-big.bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -246,7 +248,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex dvisvgm = stdenv.mkDerivation { - name = "texlive-dvisvgm.bin-${version}"; + pname = "texlive-dvisvgm.bin"; + inherit version; inherit (common) src; @@ -263,7 +266,8 @@ dvisvgm = stdenv.mkDerivation { dvipng = stdenv.mkDerivation { - name = "texlive-dvipng.bin-${version}"; + pname = "texlive-dvipng.bin"; + inherit version; inherit (common) src; @@ -315,7 +319,8 @@ latexindent = perlPackages.buildPerlPackage rec { inherit biber; bibtexu = bibtex8; bibtex8 = stdenv.mkDerivation { - name = "texlive-bibtex-x.bin-${version}"; + pname = "texlive-bibtex-x.bin"; + inherit version; inherit (common) src; @@ -332,7 +337,8 @@ bibtex8 = stdenv.mkDerivation { xdvi = stdenv.mkDerivation { - name = "texlive-xdvi.bin-${version}"; + pname = "texlive-xdvi.bin"; + inherit version; inherit (common) src; @@ -360,7 +366,8 @@ xdvi = stdenv.mkDerivation { { xindy = stdenv.mkDerivation { - name = "texlive-xindy.bin-${version}"; + pname = "texlive-xindy.bin"; + inherit version; inherit (common) src; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 178720436a6..76813f4f246 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -3,7 +3,8 @@ let version = "0.7.9"; in pythonPackages.buildPythonApplication rec { - name = "cloud-init-${version}"; + pname = "cloud-init"; + inherit version; namePrefix = ""; src = fetchurl { -- GitLab From 5fe81bf372036ae15ca6aa57c839d0715a0d18b6 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 16 Jul 2019 16:24:12 -0700 Subject: [PATCH 58/92] pythonPackages.sqlalchemy: remove pytest_xdist and fix the tests --- pkgs/development/python-modules/sqlalchemy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 480ee6a67a0..beb19b64f5f 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -2,7 +2,6 @@ , mock , pysqlite , pytest -, pytest_xdist }: buildPythonPackage rec { @@ -17,9 +16,16 @@ buildPythonPackage rec { checkInputs = [ pytest mock - pytest_xdist ] ++ lib.optional (!isPy3k) pysqlite; + postInstall = '' + sed -e 's:--max-worker-restart=5::g' -i setup.cfg + ''; + + checkPhase = '' + pytest test + ''; + meta = with lib; { homepage = http://www.sqlalchemy.org/; description = "A Python SQL toolkit and Object Relational Mapper"; -- GitLab From a21661b3295049110520d7d6c7206cefa225e838 Mon Sep 17 00:00:00 2001 From: Sean Haugh Date: Thu, 15 Aug 2019 08:33:42 -0500 Subject: [PATCH 59/92] pythonPackages.typing: 3.6.6 -> 3.7.4 --- pkgs/development/python-modules/typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index 5c5ecd8949a..51e634d2439 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -5,11 +5,11 @@ let in buildPythonPackage rec { pname = "typing"; - version = "3.6.6"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d"; + sha256 = "1kj4kvkh89psajxlyb72rm5fr7w70yb32zkj2h174arsz325wxjk"; }; # Error for Python3.6: ImportError: cannot import name 'ann_module' -- GitLab From e60f51e9b4f9386773dedbb6837bdf024d1d32aa Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 11 Aug 2019 16:24:18 +0900 Subject: [PATCH 60/92] botocore, boto3, awscli: 1.12.160->1.12.205, 1.9.160->1.9.205, 1.16.170->1.16.215 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- pkgs/development/python-modules/botocore/default.nix | 4 ++-- pkgs/tools/admin/awscli/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 203ef9a4355..34178befebe 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.160"; # N.B: if you change this, change botocore too + version = "1.9.205"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f"; + sha256 = "1zxz1d6w3f4ip04bm26xplpxjhblc2vfmqcs5n63a9y1h43mk171"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e3bbdf22ddf..5c8b00fc6c1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.205"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp"; + sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index b07db447262..33526ba11df 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.170"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.215"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "12kh62imdfy8whvqzdrmdq4zw70gj1g3smqldf4lqpjfzss7cy92"; + sha256 = "13r32z8iyza4gvpf81l6l2ywv37yxi4bb08ry7cli5m6ny9xqlq8"; }; # No tests included -- GitLab From c23ccccd102a8362d73972ad869d7f835785c503 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 15 Aug 2019 19:18:16 +0900 Subject: [PATCH 61/92] pythonPackages.moto: 1.3.10 -> 1.3.13 --- pkgs/development/python-modules/moto/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 04381d73834..876b57dd01f 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch , aws-xray-sdk , backports_tempfile , boto @@ -26,13 +26,21 @@ buildPythonPackage rec { pname = "moto"; - version = "1.3.10"; + version = "1.3.13"; src = fetchPypi { inherit pname version; - sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj"; + sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m"; }; + # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198. + patches = [ + (fetchpatch { + url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff"; + sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb"; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "jsondiff==1.1.2" "jsondiff~=1.1" -- GitLab From 37652735163d9004093e9d78efc18e4291cb56e0 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Thu, 8 Aug 2019 21:00:34 +0800 Subject: [PATCH 62/92] pythonPackages.pygments: 2.3.1 -> 2.4.2 --- pkgs/development/python-modules/Pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 75fceb7deed..cb0986e1d7f 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.3.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a"; + sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748"; }; propagatedBuildInputs = [ docutils ]; -- GitLab From d06cc8a6ae81f5102acd49733d2e706b7b74152f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 1 Aug 2019 11:05:55 -0700 Subject: [PATCH 63/92] pythonPackages.py: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/py/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 20d3eb31b0f..e54fd1521b3 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: + buildPythonPackage rec { pname = "py"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694"; + sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw"; }; # Circular dependency on pytest -- GitLab From 9e6693954aef5515233ee2c8c07cacf19c25aaf0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Jul 2019 08:15:14 -0700 Subject: [PATCH 64/92] python37Packages.pyrsistent: 0.14.11 -> 0.15.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pyrsistent/versions --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index a2b614ba3b8..cabb96d2256 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.14.11"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"; + sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n"; }; propagatedBuildInputs = [ six ]; -- GitLab From fcd2858063ae98eb266a73f921130aa976c35554 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Aug 2019 18:45:12 -0700 Subject: [PATCH 65/92] pythonPackages.delegator-py: init at 0.1.1 --- .../python-modules/delegator-py/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/delegator-py/default.nix diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix new file mode 100644 index 00000000000..3521e8ce129 --- /dev/null +++ b/pkgs/development/python-modules/delegator-py/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, pexpect +, pytest +}: + +buildPythonPackage rec { + version = "0.1.1"; + pname = "delegator.py"; + + src = fetchFromGitHub { + owner = "amitt001"; + repo = "delegator.py"; + rev = "v${version}"; + sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb"; + }; + + propagatedBuildInputs = [ pexpect ]; + + # no tests in github or pypi + doCheck = false; + + meta = with lib; { + description = "Subprocesses for Humans 2.0"; + homepage = "https://github.com/amitt001/delegator.py"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 454e497ad1d..0024e698248 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1384,6 +1384,8 @@ in { gui = false; }; + delegator-py = callPackage ../development/python-modules/delegator-py { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; arrow = callPackage ../development/python-modules/arrow { }; -- GitLab From d5d628f35cd837924d468d1fc0432684ddf2793b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Aug 2019 18:46:56 -0700 Subject: [PATCH 66/92] pythonPackages.num2words: init at 0.5.10 --- .../python-modules/num2words/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/num2words/default.nix diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix new file mode 100644 index 00000000000..bce4c0426e4 --- /dev/null +++ b/pkgs/development/python-modules/num2words/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, lib +, fetchPypi +, docopt +, delegator-py +, pytest +}: + +buildPythonPackage rec { + version = "0.5.10"; + pname = "num2words"; + + src = fetchPypi { + inherit pname version; + sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p"; + }; + + propagatedBuildInputs = [ docopt ]; + + checkInputs = [ delegator-py pytest ]; + + checkPhase = '' + pytest -k 'not cli_with_lang' + ''; + + meta = with lib; { + description = "Modules to convert numbers to words. 42 --> forty-two"; + homepage = "https://github.com/savoirfairelinux/num2words"; + license = licenses.lgpl21; + maintainers = with maintainers; [ jonringer ]; + + longDescription = + "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0024e698248..d0f7e299177 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3899,6 +3899,8 @@ in { ntplib = callPackage ../development/python-modules/ntplib { }; + num2words = callPackage ../development/python-modules/num2words { }; + numba = callPackage ../development/python-modules/numba { }; numcodecs = callPackage ../development/python-modules/numcodecs { }; -- GitLab From 00a4b9d3390defe455ed311234012c2b89180793 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Aug 2019 19:06:12 -0700 Subject: [PATCH 67/92] pythonPackages.bid-validator: init at 1.2.4 --- .../python-modules/bids-validator/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/bids-validator/default.nix diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix new file mode 100644 index 00000000000..ec66124e3c7 --- /dev/null +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.2.4"; + pname = "bids-validator"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg"; + }; + + propagatedBuildInputs = [ ]; + + meta = with lib; { + description = "Validator for the Brain Imaging Data Structure"; + homepage = "https://github.com/bids-standard/bids-validator"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0f7e299177..a74f73275ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1482,6 +1482,8 @@ in { bidict = callPackage ../development/python-modules/bidict { }; + bids-validator = callPackage ../development/python-modules/bids-validator { }; + binwalk = callPackage ../development/python-modules/binwalk { }; binwalk-full = appendToName "full" (self.binwalk.override { -- GitLab From 70127bd216c0a0f4ef8c65972ab8056fbb6b643a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Aug 2019 19:07:10 -0700 Subject: [PATCH 68/92] pythonPackages.pybids: init at 0.9.2 --- .../python-modules/pybids/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/pybids/default.nix diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix new file mode 100644 index 00000000000..8779ad36ca2 --- /dev/null +++ b/pkgs/development/python-modules/pybids/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, lib +, fetchPypi +, isPy27 +, num2words +, numpy +, scipy +, pandas +, nibabel +, patsy +, bids-validator +, sqlalchemy +, pytest +, pathlib +}: + +buildPythonPackage rec { + version = "0.9.2"; + pname = "pybids"; + + src = fetchPypi { + inherit pname version; + sha256 = "16c0v800yklp043prbrx1357vx1mq5gddxz5zqlcnf4akhzcqrxs"; + }; + + propagatedBuildInputs = [ + num2words + numpy + scipy + pandas + nibabel + patsy + bids-validator + sqlalchemy + ]; + + checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python tools for querying and manipulating BIDS datasets"; + homepage = https://github.com/bids-standard/pybids; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a74f73275ff..2acad155128 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -839,6 +839,8 @@ in { pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; + pybids = callPackage ../development/python-modules/pybids { }; + pybind11 = callPackage ../development/python-modules/pybind11 { }; pybullet = callPackage ../development/python-modules/pybullet { }; -- GitLab From 2087bc4bc2c0feda84dfc5114235034186bfc685 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Aug 2019 19:08:14 -0700 Subject: [PATCH 69/92] pythonPackages.nibabel: 2.4.1 -> 2.5.0 --- .../python-modules/nibabel/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 76494c70b2e..365f741c57f 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -2,20 +2,20 @@ , buildPythonPackage , fetchPypi , isPy3k -, numpy -, six , bz2file -, nose , mock +, nose +, numpy +, six }: buildPythonPackage rec { pname = "nibabel"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17"; + sha256 = "07v1gsq1v43v0z06cnp82ij9sqx3972c9bc6vsdj7pa9ddpa2yjw"; }; propagatedBuildInputs = [ @@ -25,16 +25,8 @@ buildPythonPackage rec { checkInputs = [ nose mock ]; - checkPhase = let - excludeTests = lib.optionals isPy3k [ - # https://github.com/nipy/nibabel/issues/691 - "nibabel.gifti.tests.test_giftiio.test_read_deprecated" - "nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays" - "nibabel.tests.test_minc1.test_old_namespace" - ]; - # TODO: Add --with-doctest once all doctests pass - in '' - nosetests ${lib.concatMapStrings (test: "-e '${test}' ") excludeTests} + checkPhase = '' + nosetests ''; meta = with lib; { -- GitLab From f40a1ef0cc07b08b4d481bf9528fdaad717d5a17 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Aug 2019 19:09:01 -0700 Subject: [PATCH 70/92] pythonPackages.nipype: 1.1.9 -> 1.2.0 --- pkgs/development/python-modules/nipype/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 42fb2de9dca..5f33a5fe63c 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -16,6 +16,7 @@ , packaging , prov , psutil +, pybids , pydot , pytest , pytest_xdist @@ -44,11 +45,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.9"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016"; + sha256 = "09azgfmb0992c3xqmi7n93pz95i4v37vc9kqmjh8c9jjxjzszdd5"; }; postPatch = '' @@ -79,6 +80,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pybids codecov glibcLocales mock @@ -89,13 +91,11 @@ buildPythonPackage rec { which ]; + # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest -v --doctest-modules nipype + LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' ''; - # See: https://github.com/nipy/nipype/issues/2839 - doCheck = false; - meta = with stdenv.lib; { homepage = https://nipy.org/nipype/; description = "Neuroimaging in Python: Pipelines and Interfaces"; -- GitLab From dcf786eb232273f1ba9a7eb2e5efb3ecb0b33ea6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Aug 2019 16:33:48 +0200 Subject: [PATCH 71/92] pythonPackages.pytest: remove old version Follow-up to c0dc032e42b42222c82f4ad75e1b1832d91dc6b2 --- .../python-modules/pytest/3.10.nix | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 pkgs/development/python-modules/pytest/3.10.nix diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix deleted file mode 100644 index 2b4dd41bc2e..00000000000 --- a/pkgs/development/python-modules/pytest/3.10.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py -, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock, writeText, pathlib2 -}: -buildPythonPackage rec { - version = "3.10.1"; - pname = "pytest"; - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"; - }; - - checkInputs = [ hypothesis mock ]; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] - ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; - - checkPhase = '' - runHook preCheck - $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py - runHook postCheck - ''; - - # Remove .pytest_cache when using py.test in a Nix build - setupHook = writeText "pytest-hook" '' - pytestcachePhase() { - find $out -name .pytest_cache -type d -exec rm -rf {} + - } - - preDistPhases+=" pytestcachePhase" - ''; - - meta = with stdenv.lib; { - homepage = https://docs.pytest.org; - description = "Framework for writing tests"; - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} -- GitLab From 1615ce80b151f534c2f1807d288ca785c4b2dd21 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Aug 2019 16:34:01 +0200 Subject: [PATCH 72/92] pythonPackages.pytest: 4.6.3 -> 4.6.5 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 96001a2d952..7a43a2e2517 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.3"; + version = "4.6.5"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45"; + sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347"; }; checkInputs = [ hypothesis mock ]; -- GitLab From b3ddab852a5229331553e07be6055fb015966b42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Aug 2019 17:16:43 +0200 Subject: [PATCH 73/92] pythonPackages.pytest: 4.6.5 -> 5.1.0 in case of Python 3 --- pkgs/development/python-modules/pytest/2.nix | 48 +++++++++++++++++++ .../python-modules/pytest/default.nix | 7 +-- pkgs/top-level/python-packages.nix | 15 +++--- 3 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/pytest/2.nix diff --git a/pkgs/development/python-modules/pytest/2.nix b/pkgs/development/python-modules/pytest/2.nix new file mode 100644 index 00000000000..7a43a2e2517 --- /dev/null +++ b/pkgs/development/python-modules/pytest/2.nix @@ -0,0 +1,48 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools +, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy +}: +buildPythonPackage rec { + version = "4.6.5"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347"; + }; + + checkInputs = [ hypothesis mock ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + + preDistPhases+=" pytestcachePhase" + ''; + + meta = with stdenv.lib; { + homepage = https://docs.pytest.org; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7a43a2e2517..7866454a62f 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.5"; + version = "5.1.0"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347"; + sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031"; }; checkInputs = [ hypothesis mock ]; @@ -23,9 +23,10 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py runHook postCheck ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2acad155128..1ea3d6adfb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1949,12 +1949,15 @@ in { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = self.pytest_4; - - pytest_4 = callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; + pytest = if isPy3k then + callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + } + else callPackage ../development/python-modules/pytest/2.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; -- GitLab From 18a3973448bf66072e9e6be325a635bced7c2e0b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Aug 2019 17:24:18 +0200 Subject: [PATCH 74/92] pythonPackages.pathpy: 11.5.2 -> 12.0.1 in case of Python 3 --- pkgs/development/python-modules/path.py/2.nix | 42 +++++++++++++++++++ .../python-modules/path.py/default.nix | 13 +++++- pkgs/top-level/python-packages.nix | 5 ++- 3 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/path.py/2.nix diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix new file mode 100644 index 00000000000..318642a393a --- /dev/null +++ b/pkgs/development/python-modules/path.py/2.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytest-flake8 +, glibcLocales +, packaging +, isPy27 +, backports_os +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "path.py"; + version = "11.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; + }; + + checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + importlib-metadata + ] ++ lib.optional isPy27 backports_os + ; + + LC_ALL = "en_US.UTF-8"; + + meta = { + description = "A module wrapper for os.path"; + homepage = https://github.com/jaraco/path.py; + license = lib.licenses.mit; + }; + + checkPhase = '' + # ignore performance test which may fail when the system is under load + py.test -v -k 'not TestPerformance' + ''; +} diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 318642a393a..d3c3206faba 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -9,15 +9,16 @@ , isPy27 , backports_os , importlib-metadata +, fetchpatch }: buildPythonPackage rec { pname = "path.py"; - version = "11.5.2"; + version = "12.0.1"; src = fetchPypi { inherit pname version; - sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; + sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f"; }; checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; @@ -39,4 +40,12 @@ buildPythonPackage rec { # ignore performance test which may fail when the system is under load py.test -v -k 'not TestPerformance' ''; + + patches = [ + (fetchpatch { + url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch; + sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9"; + }) + ]; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ea3d6adfb2..2853583e3b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4086,7 +4086,10 @@ in { pathlib2 = callPackage ../development/python-modules/pathlib2 { }; - pathpy = callPackage ../development/python-modules/path.py { }; + pathpy = if isPy3k then + callPackage ../development/python-modules/path.py { } + else + callPackage ../development/python-modules/path.py/2.nix { }; paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; -- GitLab From a97728543c948ca2aa42f86a4f750dc9a78f5dc4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Aug 2019 17:35:33 +0200 Subject: [PATCH 75/92] python2Packages.scipy: 1.2.1 -> 1.2.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2853583e3b2..8cc0d980318 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4763,10 +4763,10 @@ in { scipy = let scipy_ = callPackage ../development/python-modules/scipy { }; scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec { - version = "1.2.1"; + version = "1.2.2"; src = oldAttrs.src.override { inherit version; - sha256 = "0g5a03jkjiqlh6h9yz508p5c9ni43735m01fivjvn6dlpjxd31g0"; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; }; }); in if pythonOlder "3.5" then scipy_1_2 else scipy_; -- GitLab From 2c8ed5fd7d84754440d499f97f3ca119314b39b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 17 Aug 2019 17:35:44 +0200 Subject: [PATCH 76/92] python3Packages.scipy: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index a69ab0d27a3..93488917017 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a"; + sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5"; }; checkInputs = [ nose pytest ]; -- GitLab From 0cae5859c2cb62c8440d4a3dc66694e481af4f68 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 08:41:11 +0200 Subject: [PATCH 77/92] python3Packages.apipkg: disable several tests --- .../python-modules/apipkg/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index a2a026e74d5..22bddb252c8 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest, setuptools_scm, isPy3k }: buildPythonPackage rec { pname = "apipkg"; @@ -19,8 +19,18 @@ buildPythonPackage rec { --replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')" ''; - checkPhase = '' - py.test + # Failing tests on Python 3 + # https://github.com/pytest-dev/apipkg/issues/17 + checkPhase = let + disabledTests = stdenv.lib.optionals isPy3k [ + "test_error_loading_one_element" + "test_aliasmodule_proxy_methods" + "test_eagerload_on_bython" + ]; + testExpression = stdenv.lib.optionalString (disabledTests != []) + "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'"; + in '' + py.test ${testExpression} ''; meta = with stdenv.lib; { -- GitLab From 33f2b5cc6f2a6a517b672392f87316354f1ac46f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 09:16:47 +0200 Subject: [PATCH 78/92] python: execnet: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/execnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 4e1b78f80be..c7766802e4e 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "execnet"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm"; + sha256 = "3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2"; }; checkInputs = [ pytest ]; -- GitLab From f3a74b9c994a6dd56f2f46b72d3d6c32f44d46d3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 09:19:08 +0200 Subject: [PATCH 79/92] python3Packages.pytest_xdist: disable tests --- pkgs/development/python-modules/pytest-xdist/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b61bc8d5fa5..a2796fba5d8 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }: +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +, setuptools_scm, pytest-forked, filelock, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; @@ -13,6 +14,10 @@ buildPythonPackage rec { checkInputs = [ pytest filelock ]; propagatedBuildInputs = [ execnet pytest-forked six ]; + # Encountered a memory leak + # https://github.com/pytest-dev/pytest-xdist/issues/462 + doCheck = !isPy3k; + checkPhase = '' # Excluded tests access file system py.test testing -k "not test_distribution_rsyncdirs_example \ -- GitLab From 78559b5a161b39e29612f086d58017d7b0654f26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 09:20:39 +0200 Subject: [PATCH 80/92] python: autobahn: 19.1.1 -> 19.8.1 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 0ccf3da7bec..1a050537b22 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "19.1.1"; + version = "19.8.1"; src = fetchPypi { inherit pname version; - sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff"; + sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ -- GitLab From 556248d35ffa5f55809603515713a3d6442bcc4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 10:08:15 +0200 Subject: [PATCH 81/92] pythonPackages.autobahn: disable tests --- pkgs/development/python-modules/autobahn/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 1a050537b22..7d1e365b243 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, six, txaio, twisted, zope_interface, cffi, trollius, futures, - mock, pytest + mock, pytest, cryptography, pynacl }: buildPythonPackage rec { pname = "autobahn"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304"; }; - propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ + propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ (lib.optionals (!isPy3k) [ trollius futures ]); checkInputs = [ mock pytest ]; @@ -21,6 +21,10 @@ buildPythonPackage rec { runHook postCheck ''; + # Tests do no seem to be compatible yet with pytest 5.1 + # https://github.com/crossbario/autobahn-python/issues/1235 + doCheck = false; + meta = with lib; { description = "WebSocket and WAMP in Python for Twisted and asyncio."; homepage = "https://crossbar.io/autobahn"; -- GitLab From f4a296912f1d0fd2208bb7f7614c0274a95c9fb4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 10:08:31 +0200 Subject: [PATCH 82/92] pythonPackages.pynacl: disable a failing test --- pkgs/development/python-modules/pynacl/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index fb2e9abe065..1561c3c4d6d 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -35,6 +35,9 @@ buildPythonPackage rec { py.test ''; + # https://github.com/pyca/pynacl/issues/550 + PYTEST_ADDOPTS = "-k 'not test_wrong_types'"; + meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; -- GitLab From ea299c926f5b33ac4a7686155e6c606b470f0e92 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 10:33:13 +0200 Subject: [PATCH 83/92] python: Werkzeug: 0.15.4 -> 0.15.5 --- pkgs/development/python-modules/werkzeug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index cbf82ca7ca3..b3d397b97b4 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.4"; + version = "0.15.5"; src = fetchPypi { inherit pname version; - sha256 = "a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6"; + sha256 = "a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6"; }; propagatedBuildInputs = [ itsdangerous ]; -- GitLab From 25ad6d0f0f5fc73fbdf168a074f17fd57614b0c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 10:47:55 +0200 Subject: [PATCH 84/92] pythonPackages.python-jose: disable several tests --- pkgs/development/python-modules/python-jose/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 4eb2daaf26d..a9377c4a1c2 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -25,6 +25,9 @@ buildPythonPackage rec { py.test ''; + # https://github.com/mpdavis/python-jose/issues/149 + PYTEST_ADDOPTS = "-k 'not test_invalid_claims_json and not test_invalid_claims'"; + propagatedBuildInputs = [ future six ecdsa rsa ]; meta = with stdenv.lib; { -- GitLab From 9f6df9d960452ee31bc4c1c83f0ff55c3692e328 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 10:51:24 +0200 Subject: [PATCH 85/92] pythonPackages.datashape: disable several tests --- pkgs/development/python-modules/datashape/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index bb2e65125b7..27665c689c4 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -38,6 +38,9 @@ in buildPythonPackage rec { --ignore datashape/tests/test_user.py ''; + # https://github.com/blaze/datashape/issues/238 + PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'"; + meta = { homepage = https://github.com/ContinuumIO/datashape; description = "A data description language"; -- GitLab From 57ef737629c3b88606345f51d5b87ef34158123a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 10:54:46 +0200 Subject: [PATCH 86/92] pythonPackages.bleach: disable a test --- pkgs/development/python-modules/bleach/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index c2b0db61cbb..7de124267f0 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { substituteInPlace setup.py --replace ",<3dev" "" ''; + # Disable a test + # https://github.com/mozilla/bleach/issues/467 + checkPhase = '' + pytest -k "not test_only_text_is_cleaned" + ''; + meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' -- GitLab From fb1be839e46223dd1d4ecc2e51c6ac35d1cb4564 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 11:00:56 +0200 Subject: [PATCH 87/92] pythonPackages.pyjwt: remove pytest constraints --- pkgs/development/python-modules/pyjwt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index c02c0361cf2..10bfb0d72b6 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytestcov pytest ]; + postPatch = '' + substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" + ''; + meta = with lib; { description = "JSON Web Token implementation in Python"; homepage = https://github.com/jpadilla/pyjwt; -- GitLab From 7272b0feba25e47727c965b4dc726c7a718bb0b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 11:06:23 +0200 Subject: [PATCH 88/92] pythonPackages.lz4: 2.1.6 -> 2.1.10 --- pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index c7709c4886d..e967ba9934d 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "2.1.6"; + version = "2.1.10"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1gx228946c2w645sh190m7ixfd0zfkdl3i8ybga77jz2sn1chzdi"; + sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; }; buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; -- GitLab From 8ea496330bc91b22c6150513fd9875c1a13c9bbb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 11:35:14 +0200 Subject: [PATCH 89/92] pythonPackages.gunicorn: disable tests --- pkgs/development/python-modules/gunicorn/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 85c5c011dfd..58d5c414cf0 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { --replace "coverage>=4.0,<4.4" "coverage" ''; + # Test failures but patch does not apply cleanly + # https://github.com/benoitc/gunicorn/commit/f38f717539b1b7296720805b8ae3969c3509b9c1 + doCheck = false; + meta = with stdenv.lib; { homepage = https://pypi.python.org/pypi/gunicorn; description = "WSGI HTTP Server for UNIX"; -- GitLab From 33263a7efb1df45edab92d97d7f4ad45aedcc1cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 11:35:45 +0200 Subject: [PATCH 90/92] python3Packages.aiohttp: fix tests --- pkgs/development/python-modules/aiohttp/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 5769109f774..049ceb124ea 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -40,14 +40,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; - # Don't error on cryptography deprecation warning - postPatch = '' - substituteInPlace pytest.ini --replace "filterwarnings = error" "" + checkPhase = '' + pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms" ''; - # coroutine 'noop2' was never awaited - doCheck = false; - meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; -- GitLab From d92d210c84c566b2d2083584b93ce092fb214154 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 18 Aug 2019 11:46:49 +0200 Subject: [PATCH 91/92] appdaemon: fix build --- pkgs/servers/home-assistant/appdaemon.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 5f8884cbd3b..5d4d88e1cda 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -58,6 +58,10 @@ in python.pkgs.buildPythonApplication rec { # no tests implemented doCheck = false; + postPatch = '' + substituteInPlace setup.py --replace "pyyaml==5.1" "pyyaml" + ''; + meta = with lib; { description = "Sandboxed python execution environment for writing automation apps for Home Assistant"; homepage = https://github.com/home-assistant/appdaemon; -- GitLab From 6ff8958beff01de79240170cacfd9ac2d9c7c30b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 17 Aug 2019 13:32:50 +0200 Subject: [PATCH 92/92] openblas: 0.3.6 -> 0.3.7 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index d5ba7053de8..f8d392691ab 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -87,12 +87,12 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1"; + sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz"; }; inherit blas64; -- GitLab