diff options
author | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
---|---|---|
committer | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
commit | af9d10a91b5ef0518ee12b220470735076974210 (patch) | |
tree | ef7ede43a31b0b5998799f33dc8f0e8fdf254db3 /pkgs/tools | |
parent | f0d6411c22d91723fef3f935adf35c7884a4dc76 (diff) |
treewide: fix derivation names
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/xinput_calibrator/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/blink1-tool/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/docker-ls/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/profile-sync-daemon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/smenu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/http-prompt/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/networking/ssldump/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/conda/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/nixops-dns.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/neopg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/nitrokey-app/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/stoken/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/jumanpp/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/text/xml/xmloscopy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/virtualization/xe-guest-utilities/default.nix | 13 |
15 files changed, 36 insertions, 32 deletions
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 8376b2041b306..1ed1530306920 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { + pname = "xinput_calibrator"; version = "0.7.5"; - name = "xinput_calibrator"; + name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/tias/${name}/archive/v${version}.tar.gz"; + url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz"; sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9"; }; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 9a09fba93e69f..e87987aa0835e 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "blink1-${version}"; - version = "v1.98"; + version = "1.98"; src = fetchurl { - url = "https://github.com/todbot/blink1/archive/${version}.tar.gz"; + url = "https://github.com/todbot/blink1/archive/v${version}.tar.gz"; sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; }; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index fdc1a86883460..359b450b5fe3b 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { name = "docker-ls-${version}"; - version = "v0.3.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mayflower"; repo = "docker-ls"; - rev = version; + rev = "v${version}"; sha256 = "1dhadi1s3nm3r8q5a0m59fy4jdya8p7zvm22ci7ifm3mmw960xly"; }; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index d3f017171cb68..670f706776549 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, rsync, glibc, gawk }: stdenv.mkDerivation rec { - version = "v5.53"; + version = "5.53"; name = "profile-sync-daemon-${version}"; src = fetchurl { - url = "http://github.com/graysky2/profile-sync-daemon/archive/${version}.tar.gz"; + url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx"; }; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 3db0ee9af2674..77622ce8a1ead 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "v0.9.11"; + version = "0.9.11"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; - rev = version; + rev = "v${version}"; sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d"; }; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 37f4f96a3172c..7521a9a13bc27 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { + pname = "http-prompt"; version = "0.11.1"; - name = "http-prompt"; + name = "${pname}-${version}"; src = fetchFromGitHub { rev = "v${version}"; @@ -21,7 +22,7 @@ pythonPackages.buildPythonApplication rec { ]; checkPhase = '' - $out/bin/${name} --version | grep -q "${version}" + $out/bin/${pname} --version | grep -q "${version}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index dcc78560fa365..adda38c184d98 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation rec { - name = "ssldump"; + name = "ssldump-${version}"; version = "0.9b3"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 4589cfcec8802..f3021b111d10b 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -48,7 +48,7 @@ let ''; in buildFHSUserEnv { - name = "conda-shell"; + name = "conda-shell-${version}"; targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]); profile = '' # Add conda to PATH diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index afb0353e687dd..27edfa890fcf0 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -4,7 +4,7 @@ , fetchFromGitHub }: buildGoPackage rec { - name = "nixops-dns"; + name = "nixops-dns-${version}"; version = "1.0"; goDeps = ./deps.nix; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 10efe0e7f21dd..84c4a68aba0a6 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -11,19 +11,19 @@ , gnutls }: stdenv.mkDerivation rec { - name = "neopg"; + name = "neopg-${version}"; version = "0.0.4"; # no fetchFromGitHub, as repo contains submodules src = fetchgit { url = "https://github.com/das-labor/neopg.git"; - rev = "refs/tags/v${version}"; + rev = "v${version}"; sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; + buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1396e9b94c9aa..4407d5abbfa1b 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # We use fetchgit instead of fetchFromGitHub because of necessary git submodules src = fetchgit { url = "https://github.com/Nitrokey/nitrokey-app.git"; - rev = "refs/tags/v${version}"; + rev = "v${version}"; sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi"; }; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 464f6d215841d..a9902fe504226 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "stoken"; - version = "v0.90"; + version = "0.90"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "cernekee"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af"; }; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index c4af67b3b481f..5eea33d13a47d 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cmake, protobuf }: stdenv.mkDerivation rec { - name = "jumanpp-${version}"; + pname = "jumanpp"; + name = "${pname}-${version}"; version = "2.0.0-rc2"; src = fetchurl { - url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; buildInputs = [ cmake protobuf ]; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 337aa61af13ac..9703bd1ecea55 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -6,7 +6,7 @@ docbook5 }: stdenv.mkDerivation rec { name = "xmloscopy-${version}"; - version = "v0.1.2"; + version = "0.1.2"; buildInputs = [ makeWrapper @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "grahamc"; repo = "xmloscopy"; - rev = version; + rev = "v${version}"; sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456"; }; installPhase = '' - sed -i "s/hard to say/${version}/" ./xmloscopy + sed -i "s/hard to say/v${version}/" ./xmloscopy type -P shellcheck && shellcheck ./xmloscopy chmod +x ./xmloscopy patchShebangs ./xmloscopy diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index 9c783023d66fb..dfb1467b54d59 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { - name = "xe-guest-utilities"; + pname = "xe-guest-utilities"; + name = "${pname}-${version}"; version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; @@ -17,14 +18,14 @@ stdenv.mkDerivation (rec { buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; patches = [ ./ip-address.patch ]; postPatch = '' - tar xf "$NIX_BUILD_TOP/$name-$version/xenstore-sources.tar.bz2" + tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" ''; buildPhase = '' export CC=gcc export CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' export PYTHON=python2 - cd "$NIX_BUILD_TOP/$name-$version/uclibc-sources" + cd "$NIX_BUILD_TOP/$name/uclibc-sources" for file in Config.mk tools/libxc/Makefile tools/misc/Makefile tools/misc/lomount/Makefile tools/xenstore/Makefile; do substituteInPlace "$file" --replace -Werror "" done @@ -39,12 +40,12 @@ stdenv.mkDerivation (rec { export LIBLEAFDIR_x86_64=lib fi for f in include libxc xenstore; do - [[ ! -d $NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f ]] && continue - make -C "$NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install + [[ ! -d $NIX_BUILD_TOP/$name/uclibc-sources/tools/$f ]] && continue + make -C "$NIX_BUILD_TOP/$name/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install done rm -r "$out"/var - cd "$NIX_BUILD_TOP/$name-$version" + cd "$NIX_BUILD_TOP/$name" install -Dm755 xe-update-guest-attrs "$out/bin/xe-update-guest-attrs" install -Dm755 xe-daemon "$out/bin/xe-daemon" install -Dm644 xen-vcpu-hotplug.rules "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" |