From c313e0798fa1be186e8b4024e31e7496108f802e Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 6 Jun 2018 22:04:35 +0200 Subject: [PATCH 01/20] make-derivation: use pname-version as default name if both are present --- pkgs/stdenv/generic/make-derivation.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index dce715a6a53ec..424fb1cbf4f86 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -12,7 +12,9 @@ rec { # * https://nixos.org/nix/manual/#ssec-derivation # Explanation about derivations in general mkDerivation = - { name ? "" + { name ? if builtins.hasAttr "pname" attrs && builtins.hasAttr "version" attrs + then "${attrs.pname}-${attrs.version}" + else "" # These types of dependencies are all exhaustively documented in # the "Specifying Dependencies" section of the "Standard From b5d7bb429204c2f420628a4d49fe5bdd9cc214bc Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 6 Jun 2018 22:07:04 +0200 Subject: [PATCH 02/20] treewide: removed name from a few pythonpackages defining pname and version --- pkgs/applications/audio/pithos/default.nix | 1 - pkgs/applications/graphics/dosage/default.nix | 1 - pkgs/applications/misc/jrnl/default.nix | 1 - pkgs/applications/misc/khal/default.nix | 1 - pkgs/applications/misc/tzupdate/default.nix | 1 - pkgs/applications/office/fava/default.nix | 2 -- pkgs/development/python-modules/gssapi/default.nix | 1 - pkgs/development/python-modules/html5-parser/default.nix | 1 - .../development/python-modules/markdownsuperscript/default.nix | 1 - pkgs/development/python-modules/pelican/default.nix | 1 - pkgs/development/python-modules/persistent/default.nix | 1 - pkgs/development/python-modules/pycrypto/default.nix | 1 - pkgs/development/python-modules/pyfftw/default.nix | 1 - pkgs/development/python-modules/requests_download/default.nix | 1 - pkgs/development/python-modules/scikitlearn/default.nix | 1 - pkgs/development/python-modules/smart_open/default.nix | 1 - pkgs/development/python-modules/sphinx/default.nix | 3 +-- pkgs/development/tools/build-managers/meson/default.nix | 1 - pkgs/development/tools/flootty/default.nix | 1 - pkgs/development/tools/misc/gdbgui/default.nix | 1 - pkgs/development/tools/misc/lit/default.nix | 1 - pkgs/tools/admin/mycli/default.nix | 1 - pkgs/tools/misc/bepasty/default.nix | 3 +-- 23 files changed, 2 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 55b9435baaa5f..1d3fffb549d79 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -4,7 +4,6 @@ pythonPackages.buildPythonApplication rec { pname = "pithos"; version = "1.1.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 4bc0e93a3b460..7667b674fcec6 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,7 +1,6 @@ { stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "dosage"; version = "2018.04.08"; PBR_VERSION = version; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index fc8b8043b94c9..d5576ccbeb7ce 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -7,7 +7,6 @@ with python.pkgs; buildPythonApplication rec { pname = "jrnl"; version = "1.9.8"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 9dd466c442aa4..60f6deefb0100 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -3,7 +3,6 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "khal"; version = "0.9.9"; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 7eb0f2d41b551..3a723907c925d 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -4,7 +4,6 @@ let inherit (python.pkgs) buildPythonApplication fetchPypi requests; in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "tzupdate"; version = "1.2.0"; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 9c8f39d52f1d3..29ea9ff2910fb 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -6,7 +6,6 @@ in buildPythonApplication rec { pname = "fava"; version = "1.7"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -26,4 +25,3 @@ buildPythonApplication rec { maintainers = with stdenv.lib.maintainers; [ ]; }; } - diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index bab965b5a9c1a..08f547d835daa 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -4,7 +4,6 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; version = "1.4.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index ae036d33f9ed8..63c7188f03ac6 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "html5-parser"; version = "0.4.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 2e05ee621e2aa..9f0ce1b21534f 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "MarkdownSuperscript"; version = "2.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index c13be981f0958..3b15e7a30279f 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "pelican"; - name = "${pname}-${version}"; version = "3.7.1"; disabled = isPy26; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 4940a8b2e046d..b861797c4a8f2 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "persistent"; version = "4.2.4.2"; - name = "${pname}-${version}"; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 1ecf0bf6b339b..af975e333f0f2 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { version = pycryptodome.version; pname = "pycrypto"; - name = "${pname}-${version}"; # Cannot build wheel otherwise (zip 1980 issue) SOURCE_DATE_EPOCH=315532800; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index 973a2e84ffa7f..fdc76493da8c0 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { version = "0.10.4"; pname = "pyFFTW"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 91ab82a7a30e4..6d1264dee67e5 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "requests_download"; version = "0.1.1"; - name = "${pname}-${version}"; format = "wheel"; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 00bdcae1b9a83..dc63fe7d104df 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "scikit-learn"; version = "0.19.1"; - name = "${pname}-${version}"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index c4992eb9d9bb6..006f52f1d38b7 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -13,7 +13,6 @@ buildPythonPackage rec { pname = "smart_open"; - name = "${pname}-${version}"; version = "1.5.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 3ccccdbf77d83..1596b276b0afa 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -25,7 +25,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Sphinx"; version = "1.7.4"; src = fetchPypi { @@ -70,4 +69,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nand0p ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 6022b645172c1..f14f6adf5fef9 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -4,7 +4,6 @@ in python3Packages.buildPythonApplication rec { version = "0.46.1"; pname = "meson"; - name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 9535ba86dd060..796c3dc79a09c 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -7,7 +7,6 @@ in buildPythonApplication rec { pname = "Flootty"; version = "3.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index de66bf5da14ef..12d3f97dfc41f 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -3,7 +3,6 @@ let deps = import ./requirements.nix { inherit pkgs; }; in python27Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "gdbgui"; version = "0.11.1.2"; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 05229e4be7b2a..42824d1a543e8 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -3,7 +3,6 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; version = "0.5.1"; - name = "${pname}-${version}"; src = python2.pkgs.fetchPypi { inherit pname version; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index bd0f051bd8458..1a85bf21b2248 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,7 +7,6 @@ with python.pkgs; buildPythonApplication rec { pname = "mycli"; version = "1.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index f69f654cda3d1..ae88b7e99c658 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -10,7 +10,6 @@ with python.pkgs; buildPythonPackage rec { pname = "bepasty"; version = "0.4.0"; - name = "${pname}-${version}"; propagatedBuildInputs = [ flask @@ -39,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; }; -} \ No newline at end of file +} From ef6ece0e1bb543acc06ff0204674aad297c3e377 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 6 Jun 2018 23:01:25 +0200 Subject: [PATCH 03/20] treewide: removed name from packages that already defined pname and version --- pkgs/applications/altcoins/stellar-core.nix | 5 +---- pkgs/applications/audio/cantata/default.nix | 7 +++---- pkgs/applications/audio/minimodem/default.nix | 2 -- pkgs/applications/audio/pulseaudio-ctl/default.nix | 3 +-- pkgs/applications/audio/ssrc/default.nix | 1 - pkgs/applications/editors/android-studio/common.nix | 3 +-- pkgs/applications/editors/atom/default.nix | 4 +--- pkgs/applications/editors/bonzomatic/default.nix | 1 - .../editors/emacs-modes/idris/default.nix | 1 - pkgs/applications/editors/ghostwriter/default.nix | 1 - pkgs/applications/editors/texmacs/default.nix | 11 +++++------ pkgs/applications/editors/texstudio/default.nix | 1 - .../networking/feedreaders/feedreader/default.nix | 4 +--- pkgs/applications/science/biology/raxml/default.nix | 1 - pkgs/applications/science/logic/hol/default.nix | 2 +- pkgs/applications/science/math/gap/default.nix | 1 - .../git-and-tools/gitflow/default.nix | 1 - pkgs/development/libraries/libdazzle/default.nix | 5 +---- pkgs/development/libraries/linbox/default.nix | 1 - .../libraries/science/math/lcalc/default.nix | 1 - .../libraries/science/math/rubiks/default.nix | 11 +++++------ pkgs/misc/themes/arc/default.nix | 3 +-- pkgs/misc/themes/blackbird/default.nix | 3 +-- pkgs/misc/themes/greybird/default.nix | 3 +-- pkgs/misc/themes/vertex/default.nix | 1 - pkgs/tools/package-management/nix-bundle/default.nix | 1 - pkgs/tools/security/krunner-pass/default.nix | 6 ++---- 27 files changed, 25 insertions(+), 59 deletions(-) diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 4a4665291d6e8..0764584227f85 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -1,13 +1,10 @@ { stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git , bison, flex, postgresql }: -let +stdenv.mkDerivation rec { pname = "stellar-core"; version = "0.5.1"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchgit { url = "https://github.com/stellar/stellar-core.git"; rev = "refs/tags/v${version}"; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35214502e09a5..927945d2c612c 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -28,19 +28,18 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.2.0"; - pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); withUdisks = (withTaglib && withDevices); in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "2.2.0"; + pname = "cantata"; src = fetchFromGitHub { owner = "CDrummond"; - repo = "cantata"; + repo = pname; rev = "v${version}"; sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 8d179e8eed118..9762b2daa5f35 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { version = "0.24-1"; pname = "minimodem"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "kamalmostafa"; @@ -39,4 +38,3 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ relrod ]; }; } - diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6e1e576043d18..4f0442ce88987 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -3,10 +3,9 @@ let path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ]; - pname = "pulseaudio-ctl"; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "pulseaudio-ctl"; version = "1.66"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 19386b4779426..9eb71835caa92 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/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index a165fad370ecd..d70e688d75a66 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -36,8 +36,7 @@ let androidStudio = stdenv.mkDerivation { - name = "${pname}-${version}"; - + inherit pname version; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; sha256 = sha256Hash; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index f80a14c1e0f3d..5da73ed713458 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,12 +2,10 @@ let common = pname: {version, sha256}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; - inherit version; + inherit pname version; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - name = "${name}.deb"; inherit sha256; }; diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index 9f1db1464482b..a12ccd257f8a1 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/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 2e168b3abf7fc..18e2e8ec16856 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/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 7a0399ea0f845..403266d0c4694 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "ghostwriter"; version = "1.6.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index d3d95e5886a59..f4b5b5bdaf299 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -9,17 +9,16 @@ koreanFonts ? false }: let - pname = "TeXmacs"; - version = "1.99.2"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in -stdenv.mkDerivation { - name = "${pname}-${version}"; +stdenv.mkDerivation rec { + pname = "TeXmacs"; + version = "1.99.2"; src = fetchurl { - url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; + url = "http://www.texmacs.org/Download/ftp/tmftp/source/${pname}-${version}-src.tar.gz"; sha256 = "0l48g9746igiaxw657shm8g3xxk565vzsviajlrxqyljbh6py0fs"; }; @@ -34,7 +33,7 @@ stdenv.mkDerivation { inherit (common) postPatch; postFixup = '' - bin="$out/libexec/TeXmacs/bin/texmacs.bin" + bin="$out/libexec/${pname}/bin/texmacs.bin" rpath=$(patchelf --print-rpath "$bin") patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin" ''; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 938f381747966..d11fd34949c05 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.8"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "${pname}-org"; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 505afd25d04fa..5262db749a471 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -3,11 +3,9 @@ , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite }: -let +stdenv.mkDerivation rec { pname = "FeedReader"; version = "2.2"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jangernert"; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 0bac6c778049a..94016954b7cf4 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { pname = "RAxML"; version = "8.2.11"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stamatak"; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 5eb33daefe807..f5b324a499132 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -20,7 +20,7 @@ let in stdenv.mkDerivation { - name = "${pname}-${version}"; + inherit pname version; src = fetchurl { url = "mirror://sourceforge/hol/hol/${longVersion}/${holsubdir}.tar.gz"; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 2927701dbd715..643d6f9d44b30 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { # newer versions (4.9.0) are available, but still considered beta (https://github.com/gap-system/gap/wiki/GAP-4.9-release-notes) version = "4r8p10"; pkgVer = "2018_01_15-13_02"; - name = "${pname}-${version}"; src = let # 4r8p10 -> 48 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 698de486b5be7..8f050ce99d022 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.11.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "petervanderdoes"; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index faa8b483a7804..028de0acd1092 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,12 +1,9 @@ { stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: -let +stdenv.mkDerivation rec { version = "3.28.1"; pname = "libdazzle"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 0f5442bd63b6c..19206292a962f 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -12,7 +12,6 @@ , withSage ? false # sage support }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "linbox"; version = "1.5.2"; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 90393cff001c8..a33bdeaf86eaa 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/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index fe448106b15d5..f46d105e949cc 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -7,10 +7,9 @@ stdenv.mkDerivation rec { pname = "rubiks"; version = "20070912"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://mirrors.mit.edu/sage/spkg/upstream/rubiks/rubiks-${version}.tar.bz2"; + url = "http://mirrors.mit.edu/sage/spkg/upstream/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq"; }; @@ -29,19 +28,19 @@ stdenv.mkDerivation rec { # Fix makefiles which use all the variables in all the wrong ways and # hardcode values for some variables. (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/patches/dietz-cu2-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "1ry3w1mk9q4jqd91zlaa1bdiiplld4hpfjaldbhlmzlgrrc99qmq"; }) (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/patches/dietz-mcube-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0zsbh6k3kqdg82fv0kzghr1x7pafisv943gmssqscp107bhg77bz"; }) (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/patches/dietz-solver-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0vhw70ylnmydgjhwx8jjlb2slccj4pfqn6vzirkyz1wp8apsmfhp"; }) (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/reid-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/patches/reid-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "1r311sn012xs135s0d21qwsig2kld7rdcq19nm0zbnklviid57df"; }) ]; diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index b9c0d0d4436f3..950de5e01bde6 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -3,11 +3,10 @@ let # treat versions newer than 3.22 as 3.22 gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version; - pname = "arc-theme"; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "arc-theme"; version = "2017-05-12"; src = fetchFromGitHub { diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 4b7702ed6359b..7ffefb1d67f6c 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "Blackbird"; version = "2017-12-13"; - name = "${pname}-${version}"; src = fetchFromGitHub { - repo = "${pname}"; + repo = pname; owner = "shimmerproject"; rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4"; sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw"; diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 1221c6606872f..681bc48a108e7 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, sass, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "greybird"; version = "3.22.7"; src = fetchFromGitHub { owner = "shimmerproject"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "118k0bb780h54i2vn5my5r6vbkk134899xwp4aigw5a289xzryvb"; }; diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 86a6b4883acf6..07890f826683c 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "theme-vertex"; version = "20170128"; diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index 7c02d2d9a638c..cd90e50d70eb0 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/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index dac6df56a7964..66ce0586c094f 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -4,12 +4,10 @@ pass, pass-otp ? null, krunner, }: -let + +mkDerivation rec { pname = "krunner-pass"; version = "1.3.0"; -in -mkDerivation rec { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "akermu"; From af1b4f497283ab3fd2418ba579ec0d3ba2c5fdd7 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 6 Jun 2018 23:02:41 +0200 Subject: [PATCH 04/20] gnome3: don't re-define lib.versions.majorMinor and implement fetchGnomeSource --- pkgs/desktops/gnome-3/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d0c6558a611b3..2568e01f61593 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -15,7 +15,13 @@ let # Convert a version to branch (3.26.18 → 3.26) # Used for finding packages on GNOME mirrors - versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version)); + versionBranch = lib.versions.majorMinor; + + fetchGnomeSource = {pname, version, sha256, name ? "${pname}-${version}"}: + pkgs.fetchurl { + inherit sha256; + url = "mirror://gnome/sources/${pname}/${versionBranch version}/${name}.tar.xz"; + }; updateScript = callPackage ./update.nix { }; From e3d99782e02bd8aaa0dcbd5e314e024282823b0e Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 01:04:20 +0200 Subject: [PATCH 05/20] gnome3: make some refinements to fetchGnomeSource --- pkgs/desktops/gnome-3/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 2568e01f61593..4f4e371cca7d2 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -17,10 +17,13 @@ let # Used for finding packages on GNOME mirrors versionBranch = lib.versions.majorMinor; - fetchGnomeSource = {pname, version, sha256, name ? "${pname}-${version}"}: + fetchGnomeSource = {pname, version, sha256, name ? "${pname}-${version}", shortenVersion ? true}: + let + shortVersion = if shortenVersion then versionBranch version else version; + in pkgs.fetchurl { inherit sha256; - url = "mirror://gnome/sources/${pname}/${versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${shortVersion}/${name}.tar.xz"; }; updateScript = callPackage ./update.nix { }; From 02f45b63ecb8c7ceca6d5e31b2e2a1800f576a77 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 01:04:59 +0200 Subject: [PATCH 06/20] Make fetchGnomeSource availabable as top-level pkg infra --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7800301fde5..1e50915e950f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19789,6 +19789,7 @@ with pkgs; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); + inherit (gnome3) fetchGnomeSource; gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; From 0c1d5d15c3adf5d458a4356d1d4b8e94516104b1 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 16:16:14 +0200 Subject: [PATCH 07/20] make-derivation: get position info from version --- pkgs/stdenv/generic/make-derivation.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 424fb1cbf4f86..cb1afc8057845 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -66,6 +66,8 @@ rec { , pos ? # position used in error messages and for meta.position (if attrs.meta.description or null != null then builtins.unsafeGetAttrPos "description" attrs.meta + else if attrs.version or null != null + then builtins.unsafeGetAttrPos "version" attrs else builtins.unsafeGetAttrPos "name" attrs) , separateDebugInfo ? false , outputs ? [ "out" ] From e0d2348bd3290534f46925d56a13815b6fd431d2 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 16:40:14 +0200 Subject: [PATCH 08/20] make-derivation: add check that the name is consistent with pname and version --- pkgs/stdenv/generic/make-derivation.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cb1afc8057845..fb1e2aac591e2 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -81,6 +81,10 @@ rec { , ... } @ attrs: + # Check that the name is consistent with pname and version: + assert lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"] + -> attrs.name == "${attrs.pname}-${attrs.version}"; + # TODO(@Ericson2314): Make this more modular, and not O(n^2). let supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; From 6bc5d26ec0faa56f7cf5add8b065080232f4ff12 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 18:55:35 +0200 Subject: [PATCH 09/20] make-derivation: fix for python packages --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- pkgs/development/python-modules/setuptools/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 63ffdbb8c0ac4..581a26fe69a73 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -65,7 +65,7 @@ then throw "${name} not supported for interpreter ${python.executable}" else toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ - "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" + "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pname" "version" ] // { name = namePrefix + name; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 972d8e90bf63b..647b15f37a5ef 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -6,9 +6,10 @@ }: # Should use buildPythonPackage here somehow -stdenv.mkDerivation rec { +let pname = "setuptools"; version = "39.0.1"; +in stdenv.mkDerivation rec { name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { From 0f5c2ae0ec6b6a98b4bad3cca20b5567e208e8c0 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 19:20:13 +0200 Subject: [PATCH 10/20] fictx: remove `name` from all derivations, add a consistent way to fetch source --- .../inputmethods/fcitx-engines/fcitx-anthy/default.nix | 8 ++++---- .../fcitx-engines/fcitx-chewing/default.nix | 8 ++++---- .../fcitx-engines/fcitx-cloudpinyin/default.nix | 8 ++++---- .../fcitx-engines/fcitx-hangul/default.nix | 8 ++++---- .../fcitx-engines/fcitx-libpinyin/default.nix | 10 +++++----- .../inputmethods/fcitx-engines/fcitx-m17n/default.nix | 8 ++++---- .../inputmethods/fcitx-engines/fcitx-mozc/default.nix | 4 ++-- .../inputmethods/fcitx-engines/fcitx-rime/default.nix | 8 ++++---- .../inputmethods/fcitx-engines/fcitx-skk/default.nix | 2 +- .../fcitx-engines/fcitx-table-other/default.nix | 8 ++++---- .../fcitx-engines/fcitx-unikey/default.nix | 8 ++++---- pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix | 7 +++---- pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 6 +++--- 13 files changed, 46 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 7f09b488c2893..b85ed230a07d3 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, fetchFcitxSource, cmake, fcitx, anthy, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-anthy-${version}"; + pname = "fcitx-anthy"; version = "0.2.2"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz"; + src = fetchFcitxSource { + inherit pname version; sha256 = "0ayrzfx95670k86y19bzl6i6w98haaln3x8dxpb39a5dwgz59pf8"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index 361355d1d6887..9a75617d07465 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, fetchFcitxSource, cmake, fcitx, gettext, libchewing, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-chewing-${version}"; + pname = "fcitx-chewing"; version = "0.2.2"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz"; + src = fetchFcitxSource { + inherit pname version; sha256 = "0l548xdx2fvjya1ixp37pn382yak0m4kwfh9lgh7l3y2sblqw9zs"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index ebb6627dccae0..584da11c3b386 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, fetchFcitxSource, cmake, pkgconfig, fcitx, gettext, curl }: stdenv.mkDerivation rec { - name = "fcitx-cloudpinyin-${version}"; + pname = "fcitx-cloudpinyin"; version = "0.3.4"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz"; + src = fetchFcitxSource { + inherit pname version; sha256 = "143x9gbswzfngvgfy77zskrzrpywj8qg2d19kisgfwfisk7yhcf1"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index 41560227bca07..87e90a95df381 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, fetchFcitxSource, cmake, fcitx, libhangul, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-hangul-${version}"; + pname = "fcitx-hangul"; version = "0.3.0"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz"; + src = fetchFcitxSource { + inherit pname version; sha256 = "1jq78nczliw6pnhfac8hspffybrry6syk17y0wwcq05j3r3nd2lp"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 4468f1fa263a6..2f3df84887e11 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, fetchFcitxSource, 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"; + src = fetchFcitxSource { + inherit pname version; sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { preBuild = let ZHUYIN_DATA_FILE_NAME = "model.text.20161206.tar.gz"; - store_path = fetchurl { + store_path = fetchFcitxSource { url = "https://download.fcitx-im.org/data/${ZHUYIN_DATA_FILE_NAME}"; sha256 = "017p11si1b7bkwx36xaybq5a9icq1pd7x1jbymqw92akfgjj8w2w"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index c0c921f7b18dc..ad4658e9849dc 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, fetchFcitxSource, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-m17n-${version}"; + pname = "fcitx-m17n"; version = "0.2.3"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz"; + src = fetchFcitxSource { + inherit pname version; sha256 = "0ffyhsg7bc6525k94kfhnja1h6ajlfprq72d286dp54cksnakyc4"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 170ac4c6a26fc..586825dfdb026 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, +{ clangStdenv, fetchFromGitHub, fetchFcitxSource, fetchpatch, gyp, which, ninja, python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let @@ -8,7 +8,7 @@ let rev = "e5b3425575734c323e1d947009dd74709437b684"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; }; - icons = fetchurl { + icons = fetchFcitxSource { url = "http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz"; sha256 = "10bdjn481jsh32vll7r756l392anz44h6207vjqwby3rplk31np1"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 2bd4bf1c878c8..bd63caa3add81 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, fetchFcitxSource, 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"; + src = fetchFcitxSource { + inherit pname version; 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 c2e8837f5d13a..cf0a0f1fa17e9 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-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 929cdb30b919e..933e55f83facb 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, fetchFcitxSource, 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"; + src = fetchFcitxSource { + inherit pname version; 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 ddfa41dda3188..1847a8b20684d 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, fetchFcitxSource, 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"; + src = fetchFcitxSource { + inherit pname version; sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf"; }; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index b5b394c5b6cb0..b1b1a8c5eb0bd 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ stdenv, fetchFcitxSource, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.9"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cdepillabout ]; }; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + src = fetchFcitxSource { + inherit pname version; sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; }; @@ -24,4 +24,3 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"; ''; } - diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 1a3352676b15d..c591a19d7dd57 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: +{ stdenv, lib, fetchFcitxSource, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; version = "1.2.1"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; + src = fetchFcitxSource { + inherit pname version; sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; }; From 33932e3737127552cca6145670e77443406ae384 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 19:30:51 +0200 Subject: [PATCH 11/20] mk-python-derivation: re-add version as argument to mkDerivation --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 581a26fe69a73..a858eb36672ca 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -65,7 +65,7 @@ then throw "${name} not supported for interpreter ${python.executable}" else toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ - "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pname" "version" + "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pname" ] // { name = namePrefix + name; From b03d631747d6a3287645b9e6e8fe8789827a6b8e Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 19:51:20 +0200 Subject: [PATCH 12/20] fcitx-unikey: split name into pname and version --- pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix | 3 ++- pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index b1b1a8c5eb0bd..d82841f2efda7 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,7 +1,8 @@ { stdenv, fetchFcitxSource, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { - name = "fcitx-configtool-0.4.9"; + pname = "fcitx-configtool"; + version = "0.4.9"; meta = with stdenv.lib; { description = "GTK-based config tool for Fcitx"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e50915e950f9..68fb0fc42c324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2295,6 +2295,12 @@ with pkgs; plugins = []; }; + fetchFcitxSource = {pname, version, sha256}: + fetchurl { + inherit sha256; + url = "http://download.fcitx-im.org/${pname}/${pname}-${version}.tar.xz"; + }; + fcitx-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/fcitx-engines/fcitx-anthy { }; From 7cd80344c6d4d724d91f14efd6a5b9c9acb6d996 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 20:17:17 +0200 Subject: [PATCH 13/20] pip: fix bootstrapped-pip --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 240dd5513e85c..ee368737c06a3 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -14,9 +14,9 @@ let sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926"; }; -in stdenv.mkDerivation rec { pname = "pip"; version = "10.0.1"; +in stdenv.mkDerivation rec { name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { From a2d4ae25c1cae17f846dd151704b01d4d800a995 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 20:29:17 +0200 Subject: [PATCH 14/20] fcitx-qt5: fix --- pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index c591a19d7dd57..cc6fc63845823 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFcitxSource, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: stdenv.mkDerivation rec { - name = "fcitx-qt5-${version}"; + pname = "fcitx-qt5"; version = "1.2.1"; src = fetchFcitxSource { From b6d8df3174ec62ecb4cf514ed8e54b42cdd1ffd2 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 20:39:17 +0200 Subject: [PATCH 15/20] fcitx-libpinyin: fix too greedy find-replace --- .../inputmethods/fcitx-engines/fcitx-libpinyin/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 2f3df84887e11..46fdc31e22216 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFcitxSource, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: +{ stdenv, fetchFcitxSource, fetchurl, cmake, pkgconfig, fcitx, gettext +, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: stdenv.mkDerivation rec { pname = "fcitx-libpinyin"; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { preBuild = let ZHUYIN_DATA_FILE_NAME = "model.text.20161206.tar.gz"; - store_path = fetchFcitxSource { + store_path = fetchurl { url = "https://download.fcitx-im.org/data/${ZHUYIN_DATA_FILE_NAME}"; sha256 = "017p11si1b7bkwx36xaybq5a9icq1pd7x1jbymqw92akfgjj8w2w"; }; From 44be91f0b64cd92402f8416d3afafa7e8015a09e Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 21:07:20 +0200 Subject: [PATCH 16/20] fcitx-mozc: fix --- .../tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 586825dfdb026..10b65336370a6 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchFromGitHub, fetchFcitxSource, fetchpatch, gyp, which, ninja, +{ clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let @@ -8,12 +8,12 @@ let rev = "e5b3425575734c323e1d947009dd74709437b684"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; }; - icons = fetchFcitxSource { + icons = fetchurl { url = "http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz"; sha256 = "10bdjn481jsh32vll7r756l392anz44h6207vjqwby3rplk31np1"; }; in clangStdenv.mkDerivation rec { - name = "fcitx-mozc-${version}"; + pname = "fcitx-mozc"; version = "2.20.2673.102"; src = fetchFromGitHub { From ee16a1de73e97f44f2da14e814c60f11061d4de5 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 7 Jun 2018 21:43:56 +0200 Subject: [PATCH 17/20] mk-python-derivation: try a different fix --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- pkgs/stdenv/generic/make-derivation.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index a858eb36672ca..63ffdbb8c0ac4 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -65,7 +65,7 @@ then throw "${name} not supported for interpreter ${python.executable}" else toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ - "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pname" + "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" ] // { name = namePrefix + name; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index fb1e2aac591e2..97190c0fb5265 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -83,7 +83,7 @@ rec { # Check that the name is consistent with pname and version: assert lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"] - -> attrs.name == "${attrs.pname}-${attrs.version}"; + -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name; # TODO(@Ericson2314): Make this more modular, and not O(n^2). let From 26adf6fe3ad00242f465740f36acc79e4415dcc6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 8 Jun 2018 13:09:38 +0200 Subject: [PATCH 18/20] ibus: fix build --- .../ibus-engines/ibus-anthy/default.nix | 16 +++++++++------- .../ibus-engines/ibus-hangul/default.nix | 12 +++++++----- .../ibus-engines/ibus-kkc/default.nix | 11 ++++++----- .../ibus-engines/ibus-libpinyin/default.nix | 4 ++-- .../ibus-engines/ibus-m17n/default.nix | 4 ++-- .../ibus-engines/ibus-mozc/default.nix | 2 +- .../ibus-engines/ibus-table-others/default.nix | 12 +++++++----- .../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 | 12 +++++++----- pkgs/tools/inputmethods/ibus/wrapper.nix | 2 +- 12 files changed, 46 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index c7f7369ba88d5..b5c0d71af1fb2 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -1,11 +1,18 @@ -{ stdenv, fetchurl, intltool, pkgconfig +{ stdenv, fetchFromGitHub, intltool, pkgconfig , anthy, ibus, glib, gobjectIntrospection, gtk3, python3 }: stdenv.mkDerivation rec { - name = "ibus-anthy-${version}"; + pname = "ibus-anthy"; version = "1.5.10"; + src = fetchFromGitHub { + owner = "ibus"; + repo = pname; + rev = version; + sha256 = "07qyfdra2lc91jn35inraxbjqzni6yzx59a17k968pspx8lzdx02"; + }; + meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; @@ -27,9 +34,4 @@ stdenv.mkDerivation rec { wrapPythonPrograms substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out ''; - - src = fetchurl { - url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "0jpqz7pb9brlqiwrbr3i6wvj3b39a9bs9lljl3qa3r77mz8y0cyc"; - }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index f70c7d02e9f06..8cb96dc7abfbd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, intltool, pkgconfig +{ stdenv, fetchFromGitHub, intltool, pkgconfig , gtk3, ibus, libhangul, librsvg, python3 }: stdenv.mkDerivation rec { - name = "ibus-hangul-${version}"; + pname = "ibus-hangul"; version = "1.5.0"; - src = fetchurl { - url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; - sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; + src = fetchFromGitHub { + owner = "choehwanjin"; + repo = pname; + rev = version; + sha256 = "12l2spr32biqdbz01bzkamgq5gskbi6cd7ai343wqyy1ibjlkmp8"; }; buildInputs = [ gtk3 ibus libhangul python3 ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 19d862e030850..f8efad26507aa 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub , vala, intltool, pkgconfig , libkkc, ibus, skk-dicts , gtk3 @@ -7,11 +7,12 @@ 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"; - sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2"; + src = fetchFromGitHub { + owner = "ueno"; + repo = pname; + rev = "v${version}"; + sha256 = "1w5dpska0ps3jwqnhvxic7lmhlba2vyj85nkfngj84b9agpf7f3r"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 3bdb69391cc42..267915fef89e5 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "ibus-libpinyin-${version}"; + pname = "ibus-libpinyin"; version = "1.10.0"; src = fetchFromGitHub { owner = "libpinyin"; - repo = "ibus-libpinyin"; + repo = pname; rev = version; sha256 = "0zkzz6ig74nws8phqxbsggnpf5g5f2hxi0mdyn2m3s4nm14q3ma6"; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index c53f766cb7d3e..06198dc6582f3 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "ibus-m17n-${version}"; + pname = "ibus-m17n"; version = "1.3.4"; src = fetchFromGitHub { owner = "ibus"; - repo = "ibus-m17n"; + repo = pname; rev = version; sha256 = "1n0bvgc4jyksgvzrw5zs2pxcpxcn3gcc0j2kasbznm34fpv3frsr"; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index fd924cdd2a2b1..52aa1c12be9cc 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -9,7 +9,7 @@ let sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; }; in clangStdenv.mkDerivation rec { - name = "ibus-mozc-${version}"; + pname = "ibus-mozc"; version = "2.20.2673.102"; meta = with clangStdenv.lib; { 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 ff01c8419260a..378cf710f9d7f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }: +{ stdenv, fetchFromGitHub, 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"; - sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3"; + src = fetchFromGitHub { + owner = "moebiuscurve"; + repo = pname; + rev = version; + sha256 = "0iyhfb9261q4g1ldvddiqsf03fhpagailbxw3a7pig1858v15izf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 0d467a6875b9b..e5883d393a1aa 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.20"; 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 e31d1ddfaa80d..107c8c60271ed 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 d3507b57cbd02..72f124969fc78 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -39,7 +39,7 @@ let ''; }; cldrEmojiAnnotation = stdenv.mkDerivation rec { - name = "cldr-emoji-annotation-${version}"; + pname = "cldr-emoji-annotation"; version = "31.90.0_1"; src = fetchFromGitHub { owner = "fujiwarat"; @@ -61,7 +61,7 @@ let in stdenv.mkDerivation rec { - name = "ibus-${version}"; + pname = "ibus"; version = "1.5.17"; src = fetchFromGitHub { diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 8d02d4edde8e2..fd38910a30049 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: +{ stdenv, fetchFromGitHub, 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"; - sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; + src = fetchFromGitHub { + owner = "ibus"; + repo = pname; + rev = version; + sha256 = "1q3p4p1harzn920j8anwmq9ag60nwvlavl01vl2icd2nd110717s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 2b93274b79a20..92f22c528dab2 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -3,7 +3,7 @@ }: let - name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version; + name = "ibus-with-plugins-" + ibus.version; env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; From f8e3964fef5b8b5d2497732fb4a54218fbca9b07 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 8 Jun 2018 13:54:09 +0200 Subject: [PATCH 19/20] pkgs/applications/altcoins: fixup names --- pkgs/applications/altcoins/aeon/default.nix | 6 ++---- pkgs/applications/altcoins/dapp.nix | 2 +- pkgs/applications/altcoins/dashpay.nix | 2 +- pkgs/applications/altcoins/dero.nix | 2 +- pkgs/applications/altcoins/freicoin.nix | 2 +- pkgs/applications/altcoins/masari.nix | 2 +- pkgs/applications/altcoins/monero-gui/default.nix | 2 +- pkgs/applications/altcoins/nano-wallet/default.nix | 2 +- pkgs/applications/altcoins/particl/particl-core.nix | 2 +- pkgs/applications/altcoins/seth.nix | 2 +- pkgs/applications/altcoins/sumokoin.nix | 2 +- 11 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix index 0489c8b649f54..b736aec56798c 100644 --- a/pkgs/applications/altcoins/aeon/default.nix +++ b/pkgs/applications/altcoins/aeon/default.nix @@ -3,11 +3,9 @@ , zeromq, pcsclite, readline }: -let +stdenv.mkDerivation rec { + pname = "aeon"; version = "0.12.0.0"; -in -stdenv.mkDerivation { - name = "aeon-${version}"; src = fetchFromGitHub { owner = "aeonix"; diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix index a89725f6e30f0..a4f200dfb1405 100644 --- a/pkgs/applications/altcoins/dapp.nix +++ b/pkgs/applications/altcoins/dapp.nix @@ -2,7 +2,7 @@ , seth, git, solc, shellcheck, nodejs, hevm }: stdenv.mkDerivation rec { - name = "dapp-${version}"; + pname = "dapp"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index b2f2a457a99d6..03dcd6cb54e6d 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/dero.nix b/pkgs/applications/altcoins/dero.nix index dff7bc0b0dc41..902bc709dc36c 100644 --- a/pkgs/applications/altcoins/dero.nix +++ b/pkgs/applications/altcoins/dero.nix @@ -2,7 +2,7 @@ , libunwind, 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 b753e2d48c977..f4c0d411cad01 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/masari.nix b/pkgs/applications/altcoins/masari.nix index 02a6d25df5164..dfa005abb6ec2 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 2aff86ae1d380..12727c49ea8e7 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "monero-gui-${version}"; + pname = "monero-gui"; version = "0.12.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 8c4722bd99171..887e52ca454e2 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 = "12.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index f47b04c1daea2..1d8a110ae998a 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -18,7 +18,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "particl-core-${version}"; + pname = "particl-core"; version = "0.16.0.5"; src = fetchurl { diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index 334ec9277e1b5..f8b78d6f07b8f 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "seth-${version}"; + pname = "seth"; version = "0.6.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix index 026008b2761a9..ad65da057aeca 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 { From 07869759aa9825334a6a6f970fa409c7df2908e4 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 8 Jun 2018 14:48:33 +0200 Subject: [PATCH 20/20] pkgs/applications/audio: fixup names --- pkgs/applications/audio/MMA/default.nix | 2 +- pkgs/applications/audio/a2jmidid/default.nix | 2 +- pkgs/applications/audio/abcde/default.nix | 111 +++++++++--------- pkgs/applications/audio/airwave/default.nix | 3 +- pkgs/applications/audio/ams-lv2/default.nix | 2 +- pkgs/applications/audio/artyFX/default.nix | 2 +- pkgs/applications/audio/audacious/default.nix | 2 +- pkgs/applications/audio/audacious/qt-5.nix | 2 +- pkgs/applications/audio/audacity/default.nix | 2 +- pkgs/applications/audio/axoloti/default.nix | 2 +- pkgs/applications/audio/banshee/default.nix | 2 +- pkgs/applications/audio/baudline/default.nix | 2 +- .../audio/bitwig-studio/bitwig-studio1.nix | 2 +- .../audio/bitwig-studio/bitwig-studio2.nix | 2 +- pkgs/applications/audio/caps/default.nix | 2 +- pkgs/applications/audio/caudec/default.nix | 7 +- pkgs/applications/audio/cava/default.nix | 2 +- pkgs/applications/audio/chuck/default.nix | 2 +- .../applications/audio/clementine/default.nix | 10 +- pkgs/applications/audio/cmus/default.nix | 2 +- pkgs/applications/audio/csound/default.nix | 2 +- .../audio/deadbeef/plugins/opus.nix | 2 +- pkgs/applications/audio/denemo/default.nix | 2 +- pkgs/applications/audio/dfasma/default.nix | 2 +- .../audio/dr14_tmeter/default.nix | 2 +- pkgs/applications/audio/ecasound/default.nix | 2 +- pkgs/applications/audio/elisa/default.nix | 2 +- pkgs/applications/audio/espeak-ng/default.nix | 2 +- pkgs/applications/audio/faust/faust1.nix | 3 +- pkgs/applications/audio/faust/faust2.nix | 4 +- pkgs/applications/audio/flacon/default.nix | 2 +- .../applications/audio/fluidsynth/default.nix | 2 +- pkgs/applications/audio/fmit/default.nix | 2 +- pkgs/applications/audio/fmsynth/default.nix | 2 +- pkgs/applications/audio/foo-yc20/default.nix | 2 +- .../audio/freewheeling/default.nix | 2 +- pkgs/applications/audio/gmpc/default.nix | 2 +- .../default.nix | 7 +- pkgs/applications/audio/gpodder/default.nix | 2 +- pkgs/applications/audio/gradio/default.nix | 7 +- pkgs/applications/audio/guitarix/default.nix | 2 +- 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 +- .../audio/infamousPlugins/default.nix | 2 +- .../audio/keyfinder-cli/default.nix | 2 +- pkgs/applications/audio/keyfinder/default.nix | 2 +- .../audio/ladspa-plugins/default.nix | 2 +- .../applications/audio/ladspa-sdk/default.nix | 2 +- .../audio/lastfmsubmitd/default.nix | 2 +- pkgs/applications/audio/lastwatch/default.nix | 2 +- pkgs/applications/audio/lmms/default.nix | 2 +- pkgs/applications/audio/lv2bm/default.nix | 2 +- .../CharacterCompressor/default.nix | 2 +- .../audio/magnetophonDSP/CompBus/default.nix | 2 +- .../ConstantDetuneChorus/default.nix | 2 +- .../magnetophonDSP/LazyLimiter/default.nix | 2 +- .../magnetophonDSP/MBdistortion/default.nix | 2 +- .../magnetophonDSP/RhythmDelay/default.nix | 2 +- .../magnetophonDSP/VoiceOfFaust/default.nix | 2 +- .../magnetophonDSP/pluginUtils/default.nix | 2 +- .../magnetophonDSP/shelfMultiBand/default.nix | 2 +- .../applications/audio/mhwaveedit/default.nix | 2 +- .../audio/milkytracker/default.nix | 2 +- pkgs/applications/audio/mimms/default.nix | 51 ++++---- pkgs/applications/audio/moc/default.nix | 2 +- .../audio/mod-distortion/default.nix | 2 +- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/audio/mopidy/gmusic.nix | 2 +- .../audio/mopidy/local-images.nix | 2 +- .../audio/mopidy/local-sqlite.nix | 2 +- .../audio/mopidy/musicbox-webclient.nix | 2 +- pkgs/applications/audio/mopidy/soundcloud.nix | 2 +- .../audio/mopidy/spotify-tunigo.nix | 2 +- pkgs/applications/audio/mopidy/spotify.nix | 2 +- pkgs/applications/audio/mopidy/youtube.nix | 2 +- pkgs/applications/audio/morituri/default.nix | 2 +- .../applications/audio/mp3blaster/default.nix | 2 +- pkgs/applications/audio/mpc/default.nix | 2 +- pkgs/applications/audio/mpg321/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/ncpamixer/default.nix | 2 +- pkgs/applications/audio/non/default.nix | 2 +- .../audio/nova-filters/default.nix | 2 +- .../applications/audio/openmpt123/default.nix | 5 +- 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/pianobooster/default.nix | 2 +- pkgs/applications/audio/picard/default.nix | 6 +- pkgs/applications/audio/playbar2/default.nix | 2 +- .../audio/plugin-torture/default.nix | 2 +- pkgs/applications/audio/pmidi/default.nix | 3 +- pkgs/applications/audio/ponymix/default.nix | 2 +- pkgs/applications/audio/praat/default.nix | 2 +- pkgs/applications/audio/puddletag/default.nix | 2 +- pkgs/applications/audio/puredata/default.nix | 2 +- .../audio/qtscrobbler/default.nix | 2 +- .../audio/radiotray-ng/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/audio/rhvoice/default.nix | 5 +- .../applications/audio/rubyripper/default.nix | 2 +- pkgs/applications/audio/sayonara/default.nix | 6 +- pkgs/applications/audio/setbfree/default.nix | 2 +- pkgs/applications/audio/shntool/default.nix | 2 +- pkgs/applications/audio/sonata/default.nix | 2 +- pkgs/applications/audio/sonic-pi/default.nix | 2 +- .../audio/sooperlooper/default.nix | 2 +- pkgs/applications/audio/sorcer/default.nix | 2 +- .../audio/soundscape-renderer/default.nix | 2 +- pkgs/applications/audio/spotify/default.nix | 3 +- pkgs/applications/audio/sunvox/default.nix | 2 +- pkgs/applications/audio/svox/default.nix | 2 +- pkgs/applications/audio/swh-lv2/default.nix | 2 +- .../audio/timemachine/default.nix | 2 +- .../applications/audio/transcribe/default.nix | 2 +- pkgs/applications/audio/uade123/default.nix | 5 +- pkgs/applications/audio/vimpc/default.nix | 2 +- pkgs/applications/audio/ympd/default.nix | 2 +- .../audio/zam-plugins/default.nix | 2 +- .../audio/zynaddsubfx/default.nix | 2 +- 129 files changed, 227 insertions(+), 235 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index dfa27aa9f2ebe..22d2406394441 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 = "http://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 d09a10a15b2c9..c0211ef1ff7fd 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -4,7 +4,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/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index b74d85b9dbfa0..2b92357917abd 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -3,60 +3,59 @@ , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: -let version = "2.8.1"; -in - stdenv.mkDerivation { - name = "abcde-${version}"; - src = fetchurl { - url = "http://abcde.einval.com/download/abcde-${version}.tar.gz"; - sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; - }; - - # FIXME: This package does not support `distmp3', `eject', etc. - - patches = [ ./abcde.patch ]; - - configurePhase = '' - sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; - s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; - s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ - "Makefile"; - - # We use `cd-paranoia' from GNU libcdio, which contains a hyphen - # in its name, unlike Xiph's cdparanoia. - sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ; - s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \ - "abcde" - - substituteInPlace "abcde" \ - --replace "/etc/abcde.conf" "$out/etc/abcde.conf" - +stdenv.mkDerivation rec { + pname = "abcde"; + version = "2.8.1"; + src = fetchurl { + url = "http://abcde.einval.com/download/abcde-${version}.tar.gz"; + sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; + }; + + # FIXME: This package does not support `distmp3', `eject', etc. + + patches = [ ./abcde.patch ]; + + configurePhase = '' + sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; + s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; + s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ + "Makefile"; + + # We use `cd-paranoia' from GNU libcdio, which contains a hyphen + # in its name, unlike Xiph's cdparanoia. + sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ; + s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \ + "abcde" + + substituteInPlace "abcde" \ + --replace "/etc/abcde.conf" "$out/etc/abcde.conf" + + ''; + + buildInputs = [ makeWrapper ]; + + propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ]; + + installFlags = [ "sysconfdir=$(out)/etc" ]; + + postFixup = '' + for cmd in abcde cddb-tool abcde-musicbrainz-tool; do + wrapProgram "$out/bin/$cmd" --prefix PATH ":" \ + ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} + done + ''; + + meta = { + homepage = http://abcde.einval.com/wiki/; + license = stdenv.lib.licenses.gpl2Plus; + description = "Command-line audio CD ripper"; + + longDescription = '' + abcde is a front-end command-line utility (actually, a shell + script) that grabs tracks off a CD, encodes them to + Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack) + format, and tags them, all in one go. ''; - - buildInputs = [ makeWrapper ]; - - propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ]; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - postFixup = '' - for cmd in abcde cddb-tool abcde-musicbrainz-tool; do - wrapProgram "$out/bin/$cmd" --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} - done - ''; - - meta = { - homepage = http://abcde.einval.com/wiki/; - license = stdenv.lib.licenses.gpl2Plus; - description = "Command-line audio CD ripper"; - - longDescription = '' - abcde is a front-end command-line utility (actually, a shell - script) that grabs tracks off a CD, encodes them to - Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack) - format, and tags them, all in one go. - ''; - platforms = stdenv.lib.platforms.linux; - }; - } + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index c37963c77f3ef..8cba203842a1f 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -37,7 +37,8 @@ let in multiStdenv.mkDerivation { - name = "airwave-${version}"; + pname = "airwave"; + inherit version; src = airwave-src; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index bc72c3e13144e..fe6329672991f 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: stdenv.mkDerivation rec { - name = "ams-lv2-${version}"; + pname = "ams-lv2"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 9a9095d2fc120..751cfb6425331 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/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6e411c8448f6f..8dc64392bae9d 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/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 019bde7cc64aa..beb758a8b84cc 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -31,7 +31,7 @@ in mkDerivation { inherit version; - name = "audacious-qt5-${version}"; + pname = "audacious-qt5"; sourceFiles = lib.attrValues sources; sourceRoots = lib.attrNames sources; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index b0c47972e3856..be4daa5f5b596 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.2.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/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 986e476779cb2..c790265693ec4 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.0.12-1"; - name = "axoloti-${version}"; + pname = "axoloti"; src = fetchFromGitHub { owner = "axoloti"; diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index d1c0c2afa83b9..5f8ed910ea0e6 100644 --- a/pkgs/applications/audio/banshee/default.nix +++ b/pkgs/applications/audio/banshee/default.nix @@ -5,7 +5,7 @@ , libmtp, libgpod, mono-zeroconf }: stdenv.mkDerivation rec { - name = "banshee-${version}"; + pname = "banshee"; version = "2.6.2"; src = fetchurl { diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index deaa3f98e52ea..ef69a87f351c5 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/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 8b26ba0959d43..c4b6879af8f3c 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/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 5d9fe0edece50..fe9f071ffbff8 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -2,7 +2,7 @@ xdg_utils, zenity, ffmpeg }: bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; + pname = "bitwig-studio"; version = "2.3.2"; src = fetchurl { diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 2d90599346fb4..5c43073aa7e9e 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.24"; src = fetchurl { url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 04f0f9d302593..42529898bb919 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: -let - version = "1.7.5"; -in - stdenv.mkDerivation rec { - name = "caudec-${version}"; + pname = "caudec"; + version = "1.7.5"; src = fetchurl { url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 439175b090a8a..5c5c262056ec6 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/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index e94172b0f879d..87f9b3c2694b4 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.3.5.2"; - name = "chuck-${version}"; + pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 6379975e951c4..37ca245ac8b4c 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -21,7 +21,7 @@ let patches = [ ./clementine-spotify-blob.patch - # Required so as to avoid adding libspotify as a build dependency (as it is + # Required so as to avoid adding libspotify as a build dependency (as it is # unfree and thus would prevent us from having a free package). ./clementine-spotify-blob-remove-from-build.patch (fetchpatch { @@ -69,8 +69,8 @@ let ''; free = stdenv.mkDerivation { - name = "clementine-free-${version}"; - inherit src patches nativeBuildInputs postPatch; + pname = "clementine-free"; + inherit version src patches nativeBuildInputs postPatch; buildInputs = buildInputs ++ [ makeWrapper ]; @@ -96,9 +96,9 @@ let # Unfree Spotify blob for Clementine unfree = stdenv.mkDerivation { - name = "clementine-blob-${version}"; + pname = "clementine-blob"; # Use the same patches and sources as Clementine - inherit src nativeBuildInputs postPatch; + inherit version src nativeBuildInputs postPatch; patches = [ ./clementine-spotify-blob.patch diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index f8c5a4e5acff8..891a69862c19e 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -99,7 +99,7 @@ let in stdenv.mkDerivation rec { - name = "cmus-${version}"; + pname = "cmus"; version = "2.7.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index c8ac0a938efa8..e4611ea67aff9 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"; version = "6.11.0"; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/deadbeef/plugins/opus.nix b/pkgs/applications/audio/deadbeef/plugins/opus.nix index 55db00c15bf63..3677e5d20ae9e 100644 --- a/pkgs/applications/audio/deadbeef/plugins/opus.nix +++ b/pkgs/applications/audio/deadbeef/plugins/opus.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }: stdenv.mkDerivation rec { - name = "deadbeef-opus-plugin-${version}"; + pname = "deadbeef-opus-plugin"; version = "0.8"; src = fetchFromBitbucket { diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index be941bc3db292..8c6c1a452c1e1 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.2.0"; src = fetchurl { diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index d16534b03d326..1785ca60060c7 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/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 3e315e2d1a75f..ea0ce8cb5f30d 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages, pkgs }: python3Packages.buildPythonApplication rec { - name = "dr14_tmeter-${version}"; + pname = "dr14_tmeter"; version = "1.0.16"; disabled = !python3Packages.isPy3k; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 36ce40490222d..89754f226f854 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.1"; src = fetchurl { diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 4ef1f1dd20207..fc004ba658167 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -6,7 +6,7 @@ }: mkDerivation rec { - name = "elisa-${version}"; + pname = "elisa"; version = "0.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index f4160ff6f8081..d0b90c5066e0c 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/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index bf5bb7815856e..763240f6bb046 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 961ef71356971..2250bbae1c1bd 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -36,9 +36,9 @@ let faust = stdenv.mkDerivation { - name = "faust-${version}"; + pname = "faust"; - inherit src; + inherit version src; nativeBuildInputs = [ makeWrapper pkgconfig vim ]; buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd ]; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index a16593d4d1b0b..d8f5a4d12df24 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 = "4.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 27ca539850e25..ffcc2d9044bf6 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "fluidsynth-${version}"; + pname = "fluidsynth"; version = "1.1.10"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index f1bdcd8c52425..e01a7f24ec78c 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 58d095080fe53..dc163de8ade75 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/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 28b2cd98e02c3..330ae56f13f0f 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 4266b8c69bb85..ec22d350a544d 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.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 099e4428016e5..66e9b6545a4a0 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/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 6c7d6dba455c9..efee0697bc6dc 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -4,8 +4,6 @@ }: let - version = "4.5.0"; - deps = [ alsaLib atk @@ -41,8 +39,9 @@ let in -stdenv.mkDerivation { - name = "google-play-music-desktop-player-${version}"; +stdenv.mkDerivation rec { + pname = "google-play-music-desktop-player"; + version = "4.5.0"; 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/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0cf5a3610038d..95ae58b47b76c 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -4,7 +4,7 @@ }: python3Packages.buildPythonApplication rec { - name = "gpodder-${version}"; + pname = "gpodder"; version = "3.10.1"; format = "other"; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index d111502651ed2..2d043ab5072bd 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -16,11 +16,10 @@ , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: -let - version = "7.1"; -in stdenv.mkDerivation rec { - name = "gradio-${version}"; +stdenv.mkDerivation rec { + pname = "gradio"; + version = "7.1"; src = fetchFromGitHub { owner = "haecker-felix"; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 62bc2fa6f36fa..47d0a04e36353 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.37.0"; src = fetchurl { diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index fa76a1a26e823..d32c55122c5fe 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 d68bfbf2ae4e1..50093f8a61dee 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 69fc4b419c064..2cc39e649434a 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 c26980e1bb263..1fd8531fb7f3d 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/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index cae40929f95a7..9cb9c9575adc9 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.2.04"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 344e6894baf5d..4bb1d63a1e715 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 55039e8508bc0..d47fc3b6190da 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/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index a60b3db2fb86a..44186abc3c46c 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 d0ffbf29bcb22..8eaa400628219 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.13"; src = fetchurl { url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index d0c3eab69154f..2fe8f22edaa85 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "lastfmsubmitd-${version}"; + pname = "lastfmsubmitd"; namePrefix = ""; version = "1.0.6"; diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index fff1664933393..8a609fc009f88 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, python2Packages }: python2Packages.buildPythonApplication rec { - name = "lastwatch-${version}"; + pname = "lastwatch"; namePrefix = ""; version = "0.4.1"; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 25d7f2ed015b3..543b4e9679f6c 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -4,7 +4,7 @@ , qtbase, qttools, SDL ? null }: stdenv.mkDerivation rec { - name = "lmms-${version}"; + pname = "lmms"; version = "1.2.0-rc4"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index d3821c51fbc6a..7288d39ce7791 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 f355c540f301b..6488d1bd65e56 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 90e4eabeef0b7..c5728b6e8b7bc 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 73dd7b48e9c42..331e58c4bd294 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 39065db6edeb5..046ee70e990c9 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 362451988d38e..aa7da17dafd18 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 3f809aa784749..ae05866e57d09 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 d7cc88905c535..e627ce4238119 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgs, callPackage, 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 6237628e600c8..356e95bf97c84 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 cb9247fd3d084..292cd3dfd8606 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/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 3a77c7bbbf246..32983b165263c 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.23"; src = fetchurl { diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 6a71971c5fdff..1f90d8857cb65 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.01"; - name = "milkytracker-${version}"; + pname = "milkytracker"; src = fetchurl { url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz"; diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index cee3469e3f532..458559aba9921 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -1,31 +1,30 @@ { fetchurl, stdenv, pythonPackages, libmms }: -let version = "3.2"; -in - pythonPackages.buildPythonApplication { - name = "mimms-${version}"; - src = fetchurl { - url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; - sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; - }; +pythonPackages.buildPythonApplication rec { + pname = "mimms"; + version = "3.2"; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; + sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; + }; - postInstall = '' - wrapProgram $out/bin/mimms \ - --prefix LD_LIBRARY_PATH : ${libmms}/lib - ''; + postInstall = '' + wrapProgram $out/bin/mimms \ + --prefix LD_LIBRARY_PATH : ${libmms}/lib + ''; - meta = { - homepage = https://savannah.nongnu.org/projects/mimms/; - license = stdenv.lib.licenses.gpl3; - description = "An mms (e.g. mms://) stream downloader"; + meta = { + homepage = https://savannah.nongnu.org/projects/mimms/; + license = stdenv.lib.licenses.gpl3; + description = "An mms (e.g. mms://) stream downloader"; - longDescription = '' - mimms is a program designed to allow you to download streams - using the MMS protocol and save them to your computer, as - opposed to watching them live. Similar functionality is - available in full media player suites such as Xine, MPlayer, - and VLC, but mimms is quick and easy to use and, for the time - being, remains a useful program. - ''; - }; - } + longDescription = '' + mimms is a program designed to allow you to download streams + using the MMS protocol and save them to your computer, as + opposed to watching them live. Similar functionality is + available in full media player suites such as Xine, MPlayer, + and VLC, but mimms is quick and easy to use and, for the time + being, remains a useful program. + ''; + }; +} diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index ea83a1012ebb2..2a98f59ca0e63 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -4,7 +4,7 @@ }: 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 c66f78373228c..3fbe927be4bad 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/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index ad280d382d02f..92dd044adf34a 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -3,7 +3,7 @@ }: pythonPackages.buildPythonApplication rec { - name = "mopidy-${version}"; + pname = "mopidy"; version = "2.1.0"; diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index e58cddd42942e..e9c5198092d56 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-gmusic-${version}"; + pname = "mopidy-gmusic"; version = "2.0.0"; src = fetchurl { diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix index 063821544aed4..cddc543e80566 100644 --- a/pkgs/applications/audio/mopidy/local-images.nix +++ b/pkgs/applications/audio/mopidy/local-images.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { - name = "mopidy-local-images-${version}"; + pname = "mopidy-local-images"; version = "1.0.0"; diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix index 7aebc43dabbb5..ae89e2b7ef53c 100644 --- a/pkgs/applications/audio/mopidy/local-sqlite.nix +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-local-sqlite-${version}"; + pname = "mopidy-local-sqlite"; version = "1.0.0"; diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index d2f525bffd1dc..5d4511d3ed64b 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-musicbox-webclient-${version}"; + pname = "mopidy-musicbox-webclient"; version = "2.3.0"; diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 098812961649e..f6d46de5cc98a 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-soundcloud-${version}"; + pname = "mopidy-soundcloud"; version = "2.0.2"; diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 034a07bf027d2..b62820f3194b6 100644 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-tunigo-${version}"; + pname = "mopidy-spotify-tunigo"; version = "1.0.0"; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 64b5ee629b339..9a6e1bef994c3 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-${version}"; + pname = "mopidy-spotify"; version = "3.1.0"; src = fetchurl { diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index d3eb8539a19c0..5741d61aca2c8 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, mopidy }: pythonPackages.buildPythonApplication rec { - name = "mopidy-youtube-${version}"; + pname = "mopidy-youtube"; version = "2.0.2"; diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index d4c67bb5622c7..d21d7e2ca0615 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -5,7 +5,7 @@ let inherit (pythonPackages) python; in stdenv.mkDerivation rec { - name = "morituri-${version}"; + pname = "morituri"; version = "0.2.3.20151109"; namePrefix = ""; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index eb5aa7c036cc2..727133be78df0 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/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 220e72b568afa..b13e1cc037a0f 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 3ffc5265f7a03..65dfe3484b666 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/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index e14594ae3b2d3..6f81ebbb8f1e7 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 7ed9021e3e09b..93ec3339c13bf 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "musescore-${version}"; + pname = "musescore"; version = "2.2.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index ffd5b9a585824..116ed8d22040a 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -2,7 +2,7 @@ , mpd_clientlib, gettext }: stdenv.mkDerivation rec { - name = "ncmpc-${version}"; + pname = "ncmpc"; version = "0.30"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index c3449ed3a4f4c..fd3d721afa485 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.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index c28c711d618e9..a46db01488ccf 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/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 6b50ee1426ce5..3bb06beba038e 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 = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 5d13aa7daf42a..698340252a6ba 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }: -let +stdenv.mkDerivation rec { + pname = "openmpt123"; version = "0.2.7025-beta20.1"; -in stdenv.mkDerivation rec { - name = "openmpt123-${version}"; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index cc4a781ef66c0..2507f08e9e599 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 322a4e2384619..2d518aad285c2 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 8425b48166e67..a019945a63bca 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 ae43bad5b2c29..6440f6e787ffa 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 0eb75d77c68c9..21ba375200bc6 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 972a162b73f44..9e7de39218d53 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 4f285552576c6..273e41544b318 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 f2e54b327fcee..fa9660fbbf61a 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/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index d013a26277e81..e52bf26d22526 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/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 677c60399e521..1b49145785ebf 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,10 +1,10 @@ { stdenv, python2Packages, fetchurl, gettext, chromaprint }: let - version = "1.4.2"; pythonPackages = python2Packages; -in pythonPackages.buildPythonApplication { - name = "picard-${version}"; +in pythonPackages.buildPythonApplication rec { + pname = "picard"; + version = "1.4.2"; namePrefix = ""; src = fetchurl { diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index 16d5eb69cb979..8c21dc8f2ad71 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 5529998803cfd..346387be7e3cf 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/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 9f51d30082593..f9b3fbae21370 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/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index 5cfbb7bf5a483..6d168ec566187 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 8d49c49f0c6cd..5f89aadac04df 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.40"; src = fetchurl { diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 00f58750408b3..558267239ef80 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: python2Packages.buildPythonApplication rec { - name = "puddletag-${version}"; + pname = "puddletag"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 73f50e45d3df8..4f3e05b5cf69e 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.48-0"; src = fetchurl { diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index 453da89953e0f..68e8e6402acf5 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/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 2ce82eb6a0a05..d25d2bfb1f452 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -39,7 +39,7 @@ let pythonInputs = with python2.pkgs; [ python2 lxml ]; in stdenv.mkDerivation rec { - name = "radiotray-ng-${version}"; + pname = "radiotray-ng"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 5ec7375056ec4..1cb836b67ed68 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { - name = "renoise-${version}"; + pname = "renoise"; version = "3.1.0"; src = diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index 65cb7dab34a1f..c3dc3458312ea 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, pkgconfig, fetchFromGitHub, scons, python, glibmm, libpulseaudio, libao }: -let +stdenv.mkDerivation rec { + pname = "rhvoice"; version = "unstable-2018-02-10"; -in stdenv.mkDerivation rec { - name = "rhvoice-${version}"; src = fetchFromGitHub { owner = "Olga-Yakovleva"; diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index 9e0a3712c9715..82aa86f795bb4 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/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index 1bf1a8b2c49e2..10a298f219047 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }: -let +stdenv.mkDerivation rec { + pname = "sayonara-player"; version = "1.0.0-git5-20180115"; -in -stdenv.mkDerivation { - name = "sayonara-player-${version}"; src = fetchurl { url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 4d8435454239f..0a4a91877454b 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.5"; src = fetchurl { diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index 8645251b384d2..dc8d95d2c490d 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/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 55c3dfa92e301..a3d418cd4fe43 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -4,7 +4,7 @@ let inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2; in buildPythonApplication rec { - name = "sonata-${version}"; + pname = "sonata"; version = "1.7b1"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index d1c48ce44ed83..ac2cd4f59bcb5 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.0.1"; - name = "sonic-pi-${version}"; + pname = "sonic-pi"; src = fetchFromGitHub { owner = "samaaron"; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index bf4d96c6fc4ec..8dcca85a25c40 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 cf0b5db81f620..5d8ae0928c907 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 babe4edff9df6..01f0708d1157e 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/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index b8495465db55c..0b4f18e4de1b9 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -47,7 +47,8 @@ let in stdenv.mkDerivation { - name = "spotify-${version}"; + pname = "spotify"; + inherit version; src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 47b0bf2e736ca..c4fbbc5c60fb5 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.3b"; src = fetchurl { diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 5e26b6c1cdb8f..d25e61c37f5d2 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 6fa0eb7f8f2b0..b59752d7cc3e5 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/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 8837566b13d09..7bd1aea08203d 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "timemachine-${version}"; + pname = "timemachine"; version = "0.3.1"; src = fetchFromGitHub { owner = "swh"; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 5ec5087b9f26e..d11664947279b 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -4,7 +4,7 @@ , libpng12, pango, zlib }: stdenv.mkDerivation rec { - name = "transcribe-${version}"; + pname = "transcribe"; version = "8.40"; src = if stdenv.system == "i686-linux" then diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 7db3b7ec23768..15caf565e293d 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, which, libao, pkgconfig }: -let +stdenv.mkDerivation rec { + pname = "uade123"; version = "2.13"; -in stdenv.mkDerivation rec { - name = "uade123-${version}"; src = fetchurl { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 96a6081c4d8fc..43f8c27e97b9f 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.1"; - name = "vimpc-${version}"; + pname = "vimpc"; src = fetchFromGitHub { owner = "boysetsfrog"; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index c3e8efae7fe9d..e605bdba579ef 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, llvmPackages, pkgconfig, mpd_clientlib, openssl }: stdenv.mkDerivation rec { - name = "ympd-${version}"; + pname = "ympd"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 210d0f7e989d3..c9e7be930116f 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.10"; src = fetchgit { diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 1b3429f39d7f8..3d52925d433ce 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.3"; src = fetchurl {