From b0e9fc131ca777b24b97e21154ff66bb4f312eb6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 5 Nov 2018 00:32:52 +0100 Subject: [PATCH] treewide: Fix packages using name where they should use pname --- pkgs/applications/altcoins/mist.nix | 4 ++-- pkgs/applications/audio/cadence/default.nix | 2 +- pkgs/applications/graphics/vimiv/default.nix | 2 +- pkgs/applications/misc/omegat.nix | 2 +- pkgs/applications/networking/browsers/brave/default.nix | 2 +- pkgs/development/compilers/graalvm/default.nix | 2 +- pkgs/development/libraries/elf-header/default.nix | 2 +- pkgs/development/libraries/igraph/default.nix | 4 ++-- pkgs/development/libraries/libsignal-protocol-c/default.nix | 2 +- pkgs/development/libraries/libxl/default.nix | 4 ++-- pkgs/development/libraries/yojimbo/default.nix | 2 +- pkgs/development/python-modules/pyinputevent/default.nix | 2 +- pkgs/development/python-modules/pymaging/default.nix | 2 +- pkgs/development/python-modules/pymaging_png/default.nix | 2 +- pkgs/development/python-modules/rbtools/default.nix | 2 +- pkgs/development/python-modules/repocheck/default.nix | 2 +- pkgs/development/python-modules/snappergui/default.nix | 2 +- pkgs/development/python-modules/svg2tikz/default.nix | 2 +- pkgs/development/python-modules/urwidtrees/default.nix | 2 +- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- pkgs/development/tools/icr/default.nix | 2 +- pkgs/development/tools/kubectx/default.nix | 4 ++-- pkgs/development/tools/pyre/default.nix | 2 +- pkgs/development/tools/scry/default.nix | 2 +- pkgs/servers/web-apps/fileshelter/default.nix | 2 +- pkgs/tools/misc/hid-listen/default.nix | 2 +- pkgs/tools/networking/quickserve/default.nix | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index 194c004f9c7..2990b44c7f4 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -2,7 +2,7 @@ let version = "0.11.1"; - name = "mist"; + pname = "mist"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -26,7 +26,7 @@ let }; mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation { - inherit name version meta; + inherit pname version meta; src = { i686-linux = fetchurl { diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 87dbb310995..cc4f5cae2de 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "cadence"; + pname = "cadence"; src = fetchurl { url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 538931c1040..e790ef49acb 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -6,7 +6,7 @@ }: python3Packages.buildPythonApplication rec { - name = "vimiv"; + pname = "vimiv"; version = "0.7.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index e6a6be88b6c..660b5db6105 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.1.5.2"; - name = "omegat"; + pname = "omegat"; src = fetchurl { # their zip has repeated files or something, so no fetchzip url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d097e0b448c..379180357a2 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -69,7 +69,7 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { - name = "brave"; + pname = "brave"; version = "0.25.2"; src = fetchurl { diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index a35143b4349..513f082dcf5 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -65,7 +65,7 @@ in rec { mx = stdenv.mkDerivation rec { version = "5.192.0"; - name = "mx"; + pname = "mx"; src = fetchFromGitHub { owner = "graalvm"; repo = "mx"; diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index ab8c217dce4..47b39eeb7e9 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -12,7 +12,7 @@ let in stdenvNoCC.mkDerivation { - name = "elf-header"; + pname = "elf-header"; inherit (libc) version; src = null; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 4ac3ebc0988..aab64b941ca 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -3,12 +3,12 @@ flex, yacc, zlib, libxml2 }: stdenv.mkDerivation rec { - name = "igraph"; + pname = "igraph"; version = "0.7.1"; src = fetchFromGitHub { owner = "igraph"; - repo = name; + repo = pname; rev = version; sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; }; diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix index 379361a7031..f3549d52f69 100644 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { - name = "libsignal-protocol-c"; + pname = "libsignal-protocol-c"; version = "2.3.2"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 035bfa8d6dc..471789d3e0f 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxl"; + pname = "libxl"; version = "3.8.1"; src = fetchurl { - url = "http://www.libxl.com/download/${name}-lin-${version}.tar.gz"; + url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm"; }; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index 9a3416a368b..9bd20ee2607 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: stdenv.mkDerivation rec { - name = "yojimbo"; + pname = "yojimbo"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 4709cf0d116..6eeeeb20c00 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - name = "pyinputevent"; + pname = "pyinputevent"; version = "2016-10-18"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 34620c55c80..234aee8436d 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - name = "pymaging"; + pname = "pymaging"; version = "unstable-2016-11-16"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 6756f9deee3..fb92739776d 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - name = "pymaging-png"; + pname = "pymaging-png"; version = "unstable-2016-11-16"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 127188ac3fb..3be8bb99bbe 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - name = "rbtools"; + pname = "rbtools"; version = "0.7.2"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix index 17dea17105e..88437ae9032 100644 --- a/pkgs/development/python-modules/repocheck/default.nix +++ b/pkgs/development/python-modules/repocheck/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - name = "repocheck"; + pname = "repocheck"; version = "2015-08-05"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix index 43e942a9588..db1a75ab7f2 100644 --- a/pkgs/development/python-modules/snappergui/default.nix +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - name = "Snapper-GUI"; + pname = "Snapper-GUI"; version = "0.1"; src = fetchgit { diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index c3308bf229c..36f6dc06850 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage { - name = "svg2tikz"; + pname = "svg2tikz"; version = "1.0.0"; disabled = ! isPy27; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index ac9cf73cab1..da5501f50ba 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - name = "urwidtrees"; + pname = "urwidtrees"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index b5aa0933c2e..52f176fae94 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -29,7 +29,7 @@ let v8 = v8_3_16_14; rainbow_rake = buildRubyGem { - name = "rake"; + pname = "rake"; gemName = "rake"; source.sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; type = "gem"; diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 3c6eb6a98b0..8fb79a9eabe 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -2,7 +2,7 @@ , openssl, readline }: stdenv.mkDerivation rec { - name = "icr"; + pname = "icr"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 959bb869868..e70cf409197 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { - name = "kubectx"; + pname = "kubectx"; version = "0.6.1"; src = fetchFromGitHub { owner = "ahmetb"; - repo = "${name}"; + repo = pname; rev = "v${version}"; sha256 = "1507g8sm73mqfsxl3fabmj37pk9l4jddsdi4qlpf0ixhk3z1lfkg"; }; diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index 382e733cb98..02772f9f791 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -82,7 +82,7 @@ let }; }; typeshed = stdenv.mkDerivation { - name = "typeshed"; + pname = "typeshed"; version = pyre-version; src = fetchFromGitHub { owner = "python"; diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index ab810a2ae9f..03e7c64f549 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, crystal, shards, which }: stdenv.mkDerivation rec { - name = "scry"; + pname = "scry"; # 0.7.1 doesn't work with crystal > 0.25 version = "0.7.1.20180919"; diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index d0be4f575dd..01fb8c62482 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libzip, boost, wt3, libconfig, pkgconfig } : stdenv.mkDerivation rec { - name = "fileshelter"; + pname = "fileshelter"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix index 0ebad4f7117..6bbe4888d1b 100644 --- a/pkgs/tools/misc/hid-listen/default.nix +++ b/pkgs/tools/misc/hid-listen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "hid-listen"; + pname = "hid-listen"; version = "1.01"; src = fetchzip { diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index 06e5918dccd..7269eb7b80a 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -12,7 +12,7 @@ let }; wrappedPython = python3.withPackages (_: [ threaded_servers ]); in stdenv.mkDerivation { - name = "quickserve"; + pname = "quickserve"; version = "2018"; unpackPhase = ":";