diff options
author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/servers | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/servers')
246 files changed, 321 insertions, 328 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 9538747da6d10..14a0df2574712 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "rabbitmq-server-${version}"; + pname = "rabbitmq-server"; version = "3.7.17"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { - url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr"; }; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index dca2c07218562..0c1c69982fa1b 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -50,7 +50,7 @@ with versionMap.${majorVersion}; stdenv.mkDerivation rec { version = "${scalaVersion}-${kafkaVersion}"; - name = "apache-kafka-${version}"; + pname = "apache-kafka"; src = fetchurl { url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 47ef9934a5e84..6e47fce3e4862 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -8,7 +8,7 @@ let common = {version, sha256, externals}: stdenv.mkDerivation rec { inherit version; - name = "asterisk-${version}"; + pname = "asterisk"; buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite dmidecode libuuid newt diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 2f7a7c80cb682..f6b24f6de3594 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "atlassian-confluence-${version}"; + pname = "atlassian-confluence"; version = "6.15.6"; src = fetchurl { - url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; + url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; sha256 = "0bb404d5i8jdry1jw8qdrcpgp9lvdkyxry58331pwpw16mlh0r2m"; }; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 1d0e28ac9f28e..81b90091e669e 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -2,11 +2,11 @@ , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: stdenv.mkDerivation rec { - name = "atlassian-crowd-${version}"; + pname = "atlassian-crowd"; version = "3.4.5"; src = fetchurl { - url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; + url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3"; }; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 5bd91b14f32c2..a863ae6a0e5bf 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "atlassian-jira-${version}"; + pname = "atlassian-jira"; version = "8.3.0"; src = fetchurl { diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 528dc8a48a0b4..58ebbf88f78a8 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.11"; - name = "beanstalkd-${version}"; + pname = "beanstalkd"; installPhase=''make install "PREFIX=$out"''; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 61316d0a60a17..675f1beb891d3 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "caddy-${version}"; + pname = "caddy"; version = "1.0.0"; goPackagePath = "github.com/mholt/caddy"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index befa36edd9e26..f9532d48a11de 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cayley-${version}"; + pname = "cayley"; version = "0.6.1"; goPackagePath = "github.com/cayleygraph/cayley"; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 8530d8cb068e5..e48dec7d20c8c 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "clickhouse-${version}"; + pname = "clickhouse"; version = "19.13.1.11"; src = fetchFromGitHub { diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 21a5bad72fc87..bf8623f0a893f 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -8,7 +8,7 @@ # - https://github.com/Mic92/dotfiles/blob/ba2a01144cfdc71c829d872a3fc816c64663ad7f/nixos/vms/matchbox/modules/cloud-print-connector.nix buildGoPackage rec { - name = "cloud-print-connector-unstable-${version}"; + pname = "cloud-print-connector-unstable"; version = "1.16"; rev = "481ad139cc023a3ba65e769f08f277368fa8a5de"; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c18e71977d87a..bba33d99aa2de 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "slurm-${version}"; + pname = "slurm"; version = "19.05.1.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "SchedMD"; repo = "slurm"; # The release tags use - instead of . - rev = "${builtins.replaceStrings ["."] ["-"] name}"; + rev = "${builtins.replaceStrings ["."] ["-"] "${pname}-${version}"}"; sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k"; }; diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 84985b8f0eb3c..93794ce7052ee 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -2,7 +2,7 @@ , jre, makeWrapper, bash, gnused }: stdenv.mkDerivation rec { - name = "confluent-platform-${version}"; + pname = "confluent-platform"; version = "5.3.0"; scalaVersion = "2.12"; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d364c2a5bcdfc..4c8877e92de44 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-${version}"; + pname = "consul"; version = "1.5.2"; rev = "v${version}"; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index ad15db070f412..e1d02d2f9d742 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, libevent }: stdenv.mkDerivation rec { - name = "coturn-${version}"; + pname = "coturn"; version = "4.5.1.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix index 8b2895392bec1..a528cd2ca26e9 100644 --- a/pkgs/servers/couchpotato/default.nix +++ b/pkgs/servers/couchpotato/default.nix @@ -3,7 +3,7 @@ with pythonPackages; buildPythonApplication rec { - name = "couchpotato-${version}"; + pname = "couchpotato"; version = "3.0.1"; disabled = isPy3k; diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 1c093facde5cb..24e607f4b00cd 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }: stdenv.mkDerivation rec { - name = "dante-${version}"; + pname = "dante"; version = "1.4.2"; src = fetchurl { - url = "https://www.inet.no/dante/files/${name}.tar.gz"; + url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz"; sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms"; }; diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 5056df06e5981..8e89b6f980fa1 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dgraph-${version}"; + pname = "dgraph"; version = "0.8.2"; goPackagePath = "github.com/dgraph-io/dgraph"; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index c45098b2ae09e..b4ad70f8277f4 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }: stdenv.mkDerivation rec { - name = "dictd-${version}"; + pname = "dictd"; version = "1.12.1"; src = fetchurl { diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index 13e4757fe89e4..b7dbf04026d2f 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "20161001"; - name = "dict-db-wiktionary-${version}"; + pname = "dict-db-wiktionary"; data = fetchurl { url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m"; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 8a1bb6313ad2d..2c97101d9cbb6 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "542"; - name = "dict-db-wordnet-${version}"; + pname = "dict-db-wordnet"; buildInputs = [python wordnet]; convert = ./wordnet_structures.py; diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index f5c0cf230af3e..d9f831c862fb0 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.2"; - name = "libmaa-${version}"; + pname = "libmaa"; src = fetchurl { url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz"; diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index 2199d62b4dd73..cfa6e34fa4c78 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "diod-${version}"; + pname = "diod"; version = "1.0.24"; src = fetchurl { - url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/chaos/diod/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl"; }; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 214c3e91f0ef0..def78223f1270 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "coredns-${version}"; + pname = "coredns"; version = "1.3.1"; goPackagePath = "github.com/coredns/coredns"; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 6757542050af2..cb004a596d22c 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, systemd , boost, libsodium, libedit, re2 , net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec { - name = "dnsdist-${version}"; + pname = "dnsdist"; version = "1.3.2"; src = fetchurl { diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 718028b2bc0c2..8191bf5acbf11 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -6,7 +6,7 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { - name = "knot-dns-${version}"; + pname = "knot-dns"; version = "2.8.3"; src = fetchurl { diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1d8896bfc10f7..22b1f2a67e2cf 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -22,11 +22,11 @@ exportLuaPathsFor = luaPkgs: '' ''; unwrapped = stdenv.mkDerivation rec { - name = "knot-resolver-${version}"; + pname = "knot-resolver"; version = "4.2.0"; src = fetchurl { - url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; + url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4"; }; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index fcddd569b361a..0a584ce1acaab 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -7,7 +7,7 @@ assert enableProtoBuf -> protobuf != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "pdns-recursor-${version}"; + pname = "pdns-recursor"; version = "4.2.0"; src = fetchurl { diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 105e9f232c16c..d363eb715d6e0 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "powerdns-${version}"; + pname = "powerdns"; version = "4.1.10"; src = fetchurl { diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index e71abb8bc00f0..0a0b6c0e1d1ab 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "echoip-${version}"; + pname = "echoip"; version = "unstable-2018-11-20"; goPackagePath = "github.com/mpolden/echoip"; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index d52fdd14301d4..5293b18368e7b 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "elasticmq-server"; version = "0.14.6"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar"; + url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar"; sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz"; }; diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index d3c5555fa6ad4..5a693fd75291e 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "etcd-${version}"; + pname = "etcd"; version = "3.3.13"; # After updating check that nixos tests pass rev = "v${version}"; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 5e2381ada1d10..1e05c856ab5eb 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }: stdenv.mkDerivation rec { - name = "exhibitor-${version}"; + pname = "exhibitor"; version = "1.5.6"; src = fetchFromGitHub { diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 8bab12116b023..c8ddcf438f7b7 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name = "fcgiwrap-${version}"; + pname = "fcgiwrap"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 5ce680e36460e..7be7416d04d59 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "apache-felix-${version}"; + pname = "apache-felix"; version = "5.6.1"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix index 3ac3c98718f79..2fe628db0466b 100644 --- a/pkgs/servers/felix/remoteshell.nix +++ b/pkgs/servers/felix/remoteshell.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.2"; - name = "apache-felix-remoteshell-bundle-${version}"; + pname = "apache-felix-remoteshell-bundle"; src = fetchurl { url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar"; sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq"; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index caf7d8360f076..31de592591614 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { version = "2.5.7.27050-0"; - name = "firebird-${version}"; + pname = "firebird"; # enableParallelBuilding = false; build fails diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 87e4a22b0514f..e8a1a633e4db4 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -22,7 +22,7 @@ let , officialRelease ? true , patches ? [] }: stdenv.mkDerivation rec { - name = "foundationdb-${version}"; + pname = "foundationdb"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 0eb71492be3e4..34b9f6ecaf0d1 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -46,7 +46,7 @@ let , patches ? [] }: stdenv.mkDerivation rec { - name = "foundationdb-${version}"; + pname = "foundationdb"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index ed36b33bdebc1..6c6eb2b0c0910 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -42,7 +42,7 @@ assert withRest -> curl != null && withJson; with stdenv.lib; stdenv.mkDerivation rec { - name = "freeradius-${version}"; + pname = "freeradius"; version = "3.0.19"; src = fetchurl { diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix index e8e08271b3bce..1bb2ebc4f8681 100644 --- a/pkgs/servers/gnatsd/default.nix +++ b/pkgs/servers/gnatsd/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "gnatsd-${version}"; + pname = "gnatsd"; version = "1.4.0"; rev = "v${version}"; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index 754cba5882583..1bec32e5125bc 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "gofish-${version}"; + pname = "gofish"; version = "1.2"; src = fetchurl { - url = "mirror://sourceforge/project/gofish/gofish/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz"; sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s"; }; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index ebade244bdf7e..da24b0a0e26e8 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gotty-${version}"; + pname = "gotty"; version = "0.0.13"; rev = "v${version}"; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index c4be1f3c3b34a..ff127e705e50b 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "h2-${version}"; + pname = "h2"; version = "1.4.193"; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 6a33ac638d215..3d05933f51306 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "hbase-${version}"; + pname = "hbase"; version = "0.98.24"; src = fetchurl { diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 58033edb07d7f..7bc2da8b02399 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, docutils, libev, openssl, pkgconfig }: stdenv.mkDerivation rec { version = "1.5.0"; - name = "hitch-${version}"; + pname = "hitch"; src = fetchurl { - url = "https://hitch-tls.org/source/${name}.tar.gz"; + url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz"; sha256 = "02sd2p3jsbnqmldsjwzk5qcjc45k9n1x4ygjkx0kxxwjj9lm9hhf"; }; diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix index 664953ca34dc3..6e4be4a36fea9 100644 --- a/pkgs/servers/http/4store/default.nix +++ b/pkgs/servers/http/4store/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { - name = "4store-${version}"; + pname = "4store"; version = "1.1.6"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 3c3d4c20df1b2..4ffbb0100167a 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -17,7 +17,7 @@ assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { version = "2.4.39"; - name = "apache-httpd-${version}"; + pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 8a773631ee6c3..6bad43a62f0ae 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "mod_auth_mellon-${version}"; + pname = "mod_auth_mellon"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index ff71e460b2ac4..568b6ecd174d3 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, apacheHttpd, python2 }: stdenv.mkDerivation rec { - name = "mod_wsgi-${version}"; + pname = "mod_wsgi"; version = "4.6.7"; src = fetchurl { diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index aa826a9c528b3..65ec2510d342e 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "apt-cacher-ng-${version}"; + pname = "apt-cacher-ng"; version = "3.2"; src = fetchurl { diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index cb630c2668801..538584e147aa1 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -2,13 +2,13 @@ , coreutils, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "couchdb-${version}"; + pname = "couchdb"; version = "2.3.0"; # when updating this, please consider bumping the OTP version # in all-packages.nix src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; + url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b"; }; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 2299f732a76e0..f2e5e67dd7ac9 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -2,11 +2,11 @@ , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { - name = "couchdb-${version}"; + pname = "couchdb"; version = "1.7.1"; src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; + url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; }; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 3efc97f6296bf..42de9904f90a2 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "darkhttpd-${version}"; + pname = "darkhttpd"; version = "1.12"; src = fetchurl { - url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2"; + url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2"; sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155"; }; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index ceffd3e0260d1..2a26af537098e 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -6,7 +6,7 @@ with builtins; stdenv.mkDerivation rec { - name = "h2o-${version}"; + pname = "h2o"; version = "2.2.5"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 742db5567075e..a3bcb64e6c057 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation rec { - name = "hiawatha-${version}"; + pname = "hiawatha"; version = "10.9"; src = fetchFromGitLab { diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 80a3d6b105cb9..5ce44322e92f5 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jetty-${version}"; + pname = "jetty"; version = "9.4.16.v20190411"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 878211ebf024d..f692832e882be 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "lwan"; version = "0.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "lpereira"; diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 479c9e41aa91d..bef7f43ea71f0 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -3,7 +3,7 @@ , lighttpd, iproute }: stdenv.mkDerivation rec { version = "2014-06-29-1"; - name = "nix-binary-cache-${version}"; + pname = "nix-binary-cache"; phases = ["installPhase"]; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 6bb4ce46a43b3..3990c5de81850 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -4,7 +4,7 @@ gd, geoip, perl }: with stdenv.lib; stdenv.mkDerivation rec { - name = "openresty-${version}"; + pname = "openresty"; version = "1.15.8.1"; src = fetchurl { diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index c38ca046a35b7..19d0b9a2641cb 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }: stdenv.mkDerivation rec { - name = "pshs-${version}"; + pname = "pshs"; version = "0.3.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index b5d5d5f7992d3..d118e8af66d4d 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn, autoconf, automake }: stdenv.mkDerivation rec { - name = "spawn-fcgi-${version}"; + pname = "spawn-fcgi"; version = "1.6.4"; src = fetchsvn { diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index cac31ed9d5959..a7ea61de04202 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.3.1"; - name = "tengine-${version}"; + pname = "tengine"; src = fetchurl { url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz"; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 6e012c98737e1..b72439bc37a25 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "thttpd-${version}"; + pname = "thttpd"; version = "2.29"; src = fetchurl { - url = "https://acme.com/software/thttpd/${name}.tar.gz"; + url = "https://acme.com/software/thttpd/${pname}-${version}.tar.gz"; sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r"; }; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 5da89200816fa..59a4ab6e5b491 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, apacheAnt, jdk, unzip }: stdenv.mkDerivation rec { - name = "axis2-${version}"; + pname = "axis2"; version = "1.7.9"; src = fetchurl { - url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; + url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index fded6bdfafba9..38b4974e1554d 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -3,11 +3,11 @@ let common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { - name = "apache-tomcat-${version}"; + pname = "apache-tomcat"; version = "${versionMajor}.${versionMinor}"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 39b9b31f7f0a8..eaa15d4f46bc4 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.9.0"; - name = "unit-${version}"; + pname = "unit"; src = fetchFromGitHub { owner = "nginx"; diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index 3fb3890f9c4e9..79c7d9e9eca1c 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -7,11 +7,11 @@ let }; in stdenv.mkDerivation rec { - name = "webfs-${version}"; + pname = "webfs"; version = "1.21"; src = fetchurl { - url = "https://www.kraxel.org/releases/webfs/${name}.tar.gz"; + url = "https://www.kraxel.org/releases/webfs/${pname}-${version}.tar.gz"; sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a"; }; diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index 5d6b47d28b5d1..707b48786483a 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "webhook-${version}"; + pname = "webhook"; version = "2.6.8"; goPackagePath = "github.com/adnanh/webhook"; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 827f6122b5732..109f7bc06dcdc 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, erlang, pam, perl }: stdenv.mkDerivation rec { - name = "yaws-${version}"; + pname = "yaws"; version = "2.0.6"; src = fetchurl { - url = "http://yaws.hyber.org/download/${name}.tar.gz"; + url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz"; sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9"; }; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 912e520180e6d..075226f36078d 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -2,7 +2,7 @@ , quicktemplate, go-bindata, easyjson }: buildGoPackage rec { - name = "hydron-unstable-${version}"; + pname = "hydron-unstable"; version = "2019-02-17"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 9216464f1e49a..bdfc6d7096b41 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { - name = "icingaweb2-${version}"; + pname = "icingaweb2"; version = "2.7.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index fdad63d67af4b..8171f61c112da 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "nullidentdmod-${version}"; + pname = "nullidentdmod"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 81eeae804d25c..8e0395529bc8c 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "oidentd-${version}"; + pname = "oidentd"; version = "2.3.2"; nativeBuildInputs = [ bison flex ]; src = fetchurl { - url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; + url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "10c5jkhirkvm1s4v3zdj4micfi6rkfjj32q4k7wjwh1fnzrwyb5n"; }; diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index f57c94cd10849..9823a36d7545f 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -3,7 +3,7 @@ , buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "interlock-${version}"; + pname = "interlock"; version = "2016.04.13"; rev = "v${version}"; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 002760ff0fd3b..e7d6d9ac52a59 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -2,7 +2,7 @@ , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: stdenv.mkDerivation rec { - name = "irker-${version}"; + pname = "irker"; version = "2017-02-12"; src = fetchFromGitLab { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index d2ead585e7d0e..c70f3d4de6129 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, curl, makeWrapper }: stdenv.mkDerivation rec { - name = "jackett-${version}"; + pname = "jackett"; version = "0.11.559"; src = fetchurl { @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/${name}} - cp -r * $out/share/${name} + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ - --add-flags "$out/share/${name}/JackettConsole.exe" \ + --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib" ''; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index bbf39e5be4663..2f8241e7b09d1 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { - name = "youtrack-${version}"; + pname = "youtrack"; version = "2018.2.44329"; jar = fetchurl { - url = "https://download.jetbrains.com/charisma/${name}.jar"; + url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 3ebcaf7286b46..bec8ccbbf18dc 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -60,10 +60,10 @@ let }; in stdenv.mkDerivation rec { - name = "kippo-${version}"; + pname = "kippo"; version = "0.8"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz"; sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d"; }; buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ]; diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix index 7c7755dee482b..4eb0b26c30665 100644 --- a/pkgs/servers/kwakd/default.nix +++ b/pkgs/servers/kwakd/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "kwakd-${version}"; + pname = "kwakd"; version = "0.5"; src = fetchFromGitHub { diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index fc88d645f27aa..43ddc5f7b0f49 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: stdenv.mkDerivation rec { - name = "lidarr-${version}"; + pname = "lidarr"; version = "0.6.2.883"; src = fetchurl { diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 2e17001abc50e..798bda8e306e5 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -3,7 +3,7 @@ }: buildGoPackage rec { - name = "livepeer-${version}"; + pname = "livepeer"; version = "0.2.4"; goPackagePath = "github.com/livepeer/go-livepeer"; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 080cbc8977568..5a318c311af83 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, openssl, perl, zlib, jam }: stdenv.mkDerivation rec { version = "3.2.0"; - name = "archiveopteryx-${version}"; + pname = "archiveopteryx"; src = fetchurl { - url = "http://archiveopteryx.org/download/${name}.tar.bz2"; + url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2"; sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx"; }; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 30c6f2f44dd55..ede01bff07478 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dovecot, openssl }: stdenv.mkDerivation rec { - name = "dovecot-pigeonhole-${version}"; + pname = "dovecot-pigeonhole"; version = "0.5.7.1"; src = fetchurl { diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 019c84d2898bd..429d735ffcd0b 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "MailHog-${version}"; + pname = "MailHog"; version = "1.0.0"; rev = "v${version}"; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 91445afa97df8..e9f66b92be29f 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "mailman-${version}"; + pname = "mailman"; version = "2.1.29"; src = fetchurl { - url = "mirror://gnu/mailman/${name}.tgz"; + url = "mirror://gnu/mailman/${pname}-${version}.tgz"; sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243"; }; diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 98b270ad7d413..2c1c07e502a7c 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "mlmmj-${version}"; + pname = "mlmmj"; version = "1.3.0"; src = fetchurl { - url = "http://mlmmj.org/releases/${name}.tar.gz"; + url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz"; sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; }; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 4b753bdf0cdb1..7738c4eb3d4ad 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -5,7 +5,7 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { version = "2.2"; - name = "nullmailer-${version}"; + pname = "nullmailer"; src = fetchurl { url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index cd48ab12e24e3..7dc3968139f74 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "opensmtpd-${version}"; + pname = "opensmtpd"; version = "6.4.1p2"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn"; }; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 1d4ad63c37d2a..71b27facbab67 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "opensmtpd-extras-${version}"; + pname = "opensmtpd-extras"; version = "6.4.0"; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb"; }; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 10d3b397b26bc..c537724704619 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { - name = "postfix-${version}"; + pname = "postfix"; version = "3.4.6"; src = fetchurl { - url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; + url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n"; }; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index f13c57e3b35d5..49854927e57f8 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, help2man }: stdenv.mkDerivation rec { - name = "postsrsd-${version}"; + pname = "postsrsd"; version = "1.6"; src = fetchFromGitHub { diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix index d5e410a86c1f5..5da94ca80269e 100644 --- a/pkgs/servers/mail/pypolicyd-spf/default.nix +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonApplication, fetchurl, pyspf }: buildPythonApplication rec { - name = "pypolicyd-spf-${version}"; + pname = "pypolicyd-spf"; majorVersion = "2.0"; version = "${majorVersion}.2"; src = fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; }; diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix index 739270326e5b6..9d7730e399f3a 100644 --- a/pkgs/servers/mail/rmilter/default.nix +++ b/pkgs/servers/mail/rmilter/default.nix @@ -7,7 +7,7 @@ let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { in stdenv.mkDerivation rec { - name = "rmilter-${version}"; + pname = "rmilter"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 25e7807659df7..f4f2e616dc7dd 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -13,7 +13,7 @@ let libmagic = file; # libmagic provided by file package ATM in stdenv.mkDerivation rec { - name = "rspamd-${version}"; + pname = "rspamd"; version = "1.9.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 9e5a9ffe780d1..673d3f1f21bbf 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchurl }: buildGoPackage rec { - name = "matterbridge-${version}"; + pname = "matterbridge"; version = "1.11.0"; goPackagePath = "github.com/42wim/matterbridge"; diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 6707055eaa6bf..bb6d1584a670b 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "matterircd-${version}"; + pname = "matterircd"; version = "0.18.2"; src = fetchFromGitHub { diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 824f8ea202592..3d79d8421dd21 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mautrix-unstable-${version}"; + pname = "mautrix-unstable"; version = "2019-07-04"; goPackagePath = "maunium.net/go/mautrix-whatsapp"; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 33b7674cf9e52..33151c4063b3d 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -3,7 +3,7 @@ , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "mediatomb-${version}"; + pname = "mediatomb"; version = "0.12.1"; src = fetchgit { diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index d983c0677191b..3318b6fa5ef59 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -3,7 +3,7 @@ , nodePackages, emscripten, opencv, statik }: buildGoPackage rec { - name = "meguca-unstable-${version}"; + pname = "meguca-unstable"; version = "2019-03-12"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index f30b5af6cad51..a9873261d78e4 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5.16"; - name = "memcached-${version}"; + pname = "memcached"; src = fetchurl { - url = "https://memcached.org/files/${name}.tar.gz"; + url = "https://memcached.org/files/${pname}-${version}.tar.gz"; sha256 = "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5"; }; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index fe1f1c6760d8a..8430f2d61e8e9 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mesos-dns-${version}"; + pname = "mesos-dns"; version = "0.1.2"; rev = "v${version}"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index a20793a849cf4..b6a70864cc5c1 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "minio-${version}"; + pname = "minio"; version = "2019-02-26T19-51-46Z"; src = fetchFromGitHub { diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 10c8811c548fa..48817f76bdae2 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -2,7 +2,7 @@ , pkgconfig, zlib, geoip }: buildGoPackage rec { - name = "mirrorbits-${version}"; + pname = "mirrorbits"; version = "0.4"; rev = "v${version}"; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index d0ce73f5410f7..34601ed708bc3 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "airsonic-${version}"; + pname = "airsonic"; version = "10.3.1"; src = fetchurl { diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index 50e754791e6d6..be5188f177ac1 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "subsonic-${version}"; + pname = "subsonic"; version = "6.1.5"; src = fetchurl { @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { # for a directory to be created in the unpack phase. unpackPhase = '' runHook preUnpack - mkdir ${name} - tar -C ${name} -xzf $src + mkdir ${pname}-${version} + tar -C ${pname}-${version} -xzf $src runHook postUnpack ''; installPhase = '' runHook preInstall mkdir $out - cp -r ${name}/* $out + cp -r ${pname}-${version}/* $out runHook postInstall ''; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index f15b7ca2e8216..0ab921a6f6f8c 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }: stdenv.mkDerivation rec { - name = "taskserver-${version}"; + pname = "taskserver"; version = "1.1.0"; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index c8eb07319245e..957bb59b12144 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "bosun-${version}"; + pname = "bosun"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 502a3026b2aed..66b848a1975e9 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,7 +1,7 @@ { stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cadvisor-${version}"; + pname = "cadvisor"; version = "0.33.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index a888549bb6aa9..707d0129f70b3 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-alerts-${version}"; + pname = "consul-alerts"; version = "0.5.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index efa62e261b747..e5f30f4e61466 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -2,7 +2,7 @@ , go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }: stdenv.mkDerivation rec { - name = "facette-${version}"; + pname = "facette"; version = "0.4.1"; src = fetchFromGitHub { owner = "facette"; diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 1004947d5b122..502ff10b0929a 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "reporter-${version}"; + pname = "reporter"; version = "2.1.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c9e6da89d93e9..570dd0ff20e5f 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "6.3.2"; - name = "grafana-${version}"; + pname = "grafana"; goPackagePath = "github.com/grafana/grafana"; excludedPackages = [ "release_publisher" ]; diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 969a58aff85d9..f33a418fe5cea 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "kapacitor-${version}"; + pname = "kapacitor"; version = "1.5.1"; goPackagePath = "github.com/influxdata/kapacitor"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index af5f2880a0f89..cc67bdfa56db6 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -2,7 +2,7 @@ , doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: stdenv.mkDerivation rec { - name = "lcdproc-${version}"; + pname = "lcdproc"; version = "0.5.9"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 223026c3b4112..ed37c7f39871c 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "0.2.0"; - name = "grafana-loki-${version}"; + pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; doCheck = true; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 45e380379d2f4..5459d58ceb9f8 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.5"; - name = "longview-${version}"; + pname = "longview"; src = fetchFromGitHub { owner = "linode"; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 5044aef2bb533..31a6501ea3a55 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, gotools, buildGoPackage }: buildGoPackage rec { - name = "mtail-${version}"; + pname = "mtail"; version = "3.0.0-rc4"; goPackagePath = "github.com/google/mtail"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 34beada87e82b..183cc3a2b955f 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.0.49"; - name = "munin-${version}"; + pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 92713a43ea22b..475d79a090afa 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }: stdenv.mkDerivation rec { - name = "nagios-${version}"; + pname = "nagios"; version = "4.4.4"; src = fetchurl { - url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57"; }; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index cdfd8ab9beeb6..35d02a5f9e2c7 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }: stdenv.mkDerivation rec { - name = "check_ssl_cert-${version}"; + pname = "check_ssl_cert"; version = "1.80.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 401f9ffc40664..2dc1bdf9681c4 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "newrelic-sysmond-${version}"; + pname = "newrelic-sysmond"; version = "2.3.0.132"; src = fetchurl { diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 9f03c9ea96f61..79303849156a5 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "check-uptime-${version}"; + pname = "check-uptime"; version = "20161112"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index e104f31a74dee..95e2822d65ba5 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "alertmanager-${version}"; + pname = "alertmanager"; version = "0.16.2"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index db58c7e14e5f6..07c8a14ce0b32 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "bind_exporter-${version}"; + pname = "bind_exporter"; version = "20161221-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 9803ba09e16aa..970f49713a3b8 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "blackbox_exporter-${version}"; + pname = "blackbox_exporter"; version = "0.14.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 0d6fbac60e5d8..ce4bacfc9b7c2 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "collectd-exporter-${version}"; + pname = "collectd-exporter"; version = "0.3.1"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 47abcb33ee795..aaee2e8d770d0 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul_exporter-${version}"; + pname = "consul_exporter"; version = "0.3.0"; goPackagePath = "github.com/prometheus/consul_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e43488bbaaeba..b01fa0024de52 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dnsmasq_exporter-${version}"; + pname = "dnsmasq_exporter"; version = "0.1.0"; goPackagePath = "github.com/google/dnsmasq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 5a3fd23ec22e2..6f6370ce14df8 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dovecot_exporter-${version}"; + pname = "dovecot_exporter"; version = "0.1.3"; goPackagePath = "github.com/kumina/dovecot_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 071035b2a4ac6..95b0db7dbc608 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "fritzbox-exporter-${version}"; + pname = "fritzbox-exporter"; version = "v1.0-32-g90fc0c5"; rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index b2a0e38758913..4a84db38f78d9 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "haproxy_exporter-${version}"; + pname = "haproxy_exporter"; version = "0.8.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index aeb7b7445a5d2..f126b8a7da1c2 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -2,7 +2,7 @@ { buildGoPackage, fetchFromGitHub, fetchpatch, lib }: buildGoPackage rec { - name = "prometheus-json-exporter-${version}"; + pname = "prometheus-json-exporter"; version = "unstable-2017-10-06"; goPackagePath = "github.com/kawamuray/prometheus-json-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 129c2b3337231..21c6c8da64393 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mailexporter-${version}"; + pname = "mailexporter"; version = "2019-07-14"; goPackagePath = "github.com/cherti/mailexporter"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ade9bb87d9933..04fbc7fbed93c 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mesos_exporter-${version}"; + pname = "mesos_exporter"; version = "0.1.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 8b6c54d41f91b..7d46077380274 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "minio-exporter-${version}"; + pname = "minio-exporter"; version = "0.2.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 9180a5113492c..a7934227ffab2 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mysqld_exporter-${version}"; + pname = "mysqld_exporter"; version = "0.10.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 963315f00c121..c51574610e87a 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "nginx_exporter-${version}"; + pname = "nginx_exporter"; version = "0.4.2"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 80ad4a32be75f..d0f55226d2fff 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "node_exporter-${version}"; + pname = "node_exporter"; version = "0.17.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index eac962f75606a..5dfada4f55d71 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "openvpn_exporter-unstable-${version}"; + pname = "openvpn_exporter-unstable"; version = "2017-05-15"; rev = "a2a179a222144fa9a10030367045f075375a2803"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 97df26aea4e55..01d9ec0283381 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { - name = "postfix_exporter-${version}"; + pname = "postfix_exporter"; version = "0.1.2"; goPackagePath = "github.com/kumina/postfix_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index ffa71f3ad0c17..57574481cf68c 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "postgres_exporter-${version}"; + pname = "postgres_exporter"; version = "0.5.1"; goPackagePath = "github.com/wrouesnel/postgres_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 5e4ebb581400b..efe146c843fbd 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "prom2json-${version}"; + pname = "prom2json"; version = "0.1.0"; rev = "${version}"; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1c00f734c19e3..48afc610c615b 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "pushgateway-${version}"; + pname = "pushgateway"; version = "0.8.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 34120ad3fdaee..331503dfe7d40 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "rabbitmq_exporter-${version}"; + pname = "rabbitmq_exporter"; version = "0.25.2"; goPackagePath = "github.com/kbudde/rabbitmq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index be8fbd3d85cb3..cbafabb18b52e 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { - name = "snmp_exporter-${version}"; + pname = "snmp_exporter"; version = "0.13.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 792e0b33aee1c..f4aa8344f7779 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "statsd_exporter-${version}"; + pname = "statsd_exporter"; version = "0.9.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 0c5cc62676594..07b5055831e7b 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "surfboard_exporter-${version}"; + pname = "surfboard_exporter"; version = "2.0.0"; goPackagePath = "github.com/ipstatic/surfboard_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 18fa3f98db234..cd72f98ecfba2 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "unifi-exporter-${version}"; + pname = "unifi-exporter"; version = "0.4.0+git1"; rev = "9a4e69fdea91dd0033bda4842998d751b40a6130"; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 50325144fcacf..9de6e6923e364 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "riemann-${version}"; + pname = "riemann"; version = "0.3.3"; src = fetchurl { - url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq"; }; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index ab8365c23f818..eb98e45c36c3e 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "seyren-${version}"; + pname = "seyren"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index ee3b9d818ce1a..dfe2bdb71b28c 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "telegraf-${version}"; + pname = "telegraf"; version = "1.10.2"; goPackagePath = "github.com/influxdata/telegraf"; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index 4c3479d8662ea..fe90d4d6408b5 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, jre}: stdenv.mkDerivation rec { version = "1.28.1"; - name = "zipkin-server-${version}"; + pname = "zipkin-server"; src = fetchurl { url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index d8aed78e28aed..76b00b4cb29c9 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.16"; - name = "libmpdclient-${version}"; + pname = "libmpdclient"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 740fd4739ab79..7fcb5f945791b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -39,7 +39,7 @@ let minor = "23"; in stdenv.mkDerivation rec { - name = "mpd-${version}"; + pname = "mpd"; version = "${major}${if minor == "" then "" else "." + minor}"; src = fetchFromGitHub { diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 04daa2f4a8554..bfcc7aeacff8a 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -3,7 +3,7 @@ , systemd ? null, withSystemd ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "mosquitto-${version}"; + pname = "mosquitto"; version = "1.6.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index cc73b2e1f6f29..079c877ab7a3f 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "nats-streaming-server-${version}"; + pname = "nats-streaming-server"; version = "0.11.2"; rev = "v${version}"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a78d2e26bf764..b3adb4007f477 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nextcloud-${version}"; + pname = "nextcloud"; version = "16.0.3"; src = fetchurl { - url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; + url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; sha256 = "1ww1517i05gaf71szx0qpdc87aczllcb39cvc8c26dm18z76hgx1"; }; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index d7c36b0cb4165..a89604c4e7cda 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, stdenv }: buildGoPackage rec { - name = "nginx-sso-${version}"; + pname = "nginx-sso"; version = "0.16.1"; rev = "v${version}"; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index c5290709b6253..ccd8a9b02377e 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }: stdenv.mkDerivation rec { - name = "aerospike-server-${version}"; + pname = "aerospike-server"; version = "4.2.0.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 05f572c8caaa4..fd0a97d029d5f 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { - name = "cassandra-${version}"; + pname = "cassandra"; inherit version; src = fetchurl { inherit sha256; - url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${pname}-${version}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper coreutils ]; @@ -30,16 +30,16 @@ stdenv.mkDerivation rec { mv * $out # Clean up documentation. - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} mv $out/CHANGES.txt \ $out/LICENSE.txt \ $out/NEWS.txt \ $out/NOTICE.txt \ $out/javadoc \ - $out/share/doc/${name} + $out/share/doc/${pname}-${version} if [[ -d $out/doc ]]; then - mv "$out/doc/"* $out/share/doc/${name} + mv "$out/doc/"* $out/share/doc/${pname}-${version} rmdir $out/doc fi diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f3035e131409f..ff4a7f07ec039 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { - name = "EventStore-${version}"; + pname = "EventStore"; version = "5.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 9b173e538d346..f471017a3367e 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "neo4j-${version}"; + pname = "neo4j"; version = "3.5.8"; src = fetchurl { diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 0ce948c715e0b..94c58096f163b 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "5.0.5"; - name = "redis-${version}"; + pname = "redis"; src = fetchurl { - url = "http://download.redis.io/releases/${name}.tar.gz"; + url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91"; }; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index d6ee407e3418c..e000eb8ba4d26 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "rethinkdb-${version}"; + pname = "rethinkdb"; version = "2.3.6"; src = fetchurl { - url = "https://download.rethinkdb.com/dist/${name}.tgz"; + url = "https://download.rethinkdb.com/dist/${pname}-${version}.tgz"; sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4"; }; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index d48587c924e78..19352984712a1 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "nsq-${version}"; + pname = "nsq"; version = "0.3.5"; rev = "v${version}"; diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 22f09994ebf0d..6fbabc3d0030a 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -7,7 +7,7 @@ with (import ./srcs.nix { inherit fetchurl; }); stdenv.mkDerivation rec { - name = "openafs-${version}"; + pname = "openafs"; inherit version srcs; nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ]; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index c77bef6ad24e8..23e1cfae47ce0 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -8,7 +8,7 @@ with (import ./srcs.nix { inherit fetchurl; }); stdenv.mkDerivation rec { - name = "openafs-${version}"; + pname = "openafs"; inherit version srcs; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 8eca1fb7790b2..c0018529ea8bf 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { - name = "osrm-backend-${version}"; + pname = "osrm-backend"; version = "5.22.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index 1f58c309aa5e5..67e125d7a8cc3 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "p910nd-${version}"; + pname = "p910nd"; version = "0.97"; src = fetchurl { sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa"; - url = "mirror://sourceforge/p910nd/${name}.tar.bz2"; + url = "mirror://sourceforge/p910nd/${pname}-${version}.tar.bz2"; }; postPatch = '' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 84d4d04cac75f..588483b8343cb 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { version = "1.16.3.1402-22929c8a2"; pname = "plexmediaserver"; - name = "${pname}-${version}"; # Fetch the source src = fetchurl { diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index a7a0791b85207..a6b65cde89f9f 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "polipo-${version}"; + pname = "polipo"; version = "1.1.1"; src = fetchurl { - url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${name}.tar.gz"; + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz"; sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2"; }; diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 6aaaf95fae164..86a96dde54062 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "ps3netsrv-${version}"; + pname = "ps3netsrv"; version = "1.1.0"; enableParallelBuilding = true; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 1d8f0c36caece..fc130965cf10d 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -2,11 +2,11 @@ pkgconfig, c-ares }: stdenv.mkDerivation rec { - name = "quagga-${version}"; + pname = "quagga"; version = "1.2.4"; src = fetchurl { - url = "mirror://savannah/quagga/${name}.tar.gz"; + url = "mirror://savannah/quagga/${pname}-${version}.tar.gz"; sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73"; }; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index a293643a6f6d5..854f73be18718 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: stdenv.mkDerivation rec { - name = "radarr-${version}"; + pname = "radarr"; version = "0.2.0.1358"; src = fetchurl { @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/${name}} - cp -r * $out/share/${name}/. + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/. makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ - --add-flags "$out/share/${name}/Radarr.exe" \ + --add-flags "$out/share/${pname}-${version}/Radarr.exe" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 13db868845a00..bfc681c921b9d 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "radicale-${version}"; + pname = "radicale"; version = "1.1.6"; src = fetchurl { diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 3dcb6605a61eb..4000c25aceaee 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -100,7 +100,7 @@ let fetchSubmodules = false; }; in stdenv.mkDerivation rec { - name = "rippled-${version}"; + pname = "rippled"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index fc28f621959bd..c8fd5c059a88a 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -2,7 +2,7 @@ , useSystemd ? true, systemd }: stdenv.mkDerivation rec { - name = "rpcbind-${version}"; + pname = "rpcbind"; version = "1.2.5"; src = fetchgit { diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index b2e40a8ede0eb..4d8ead30add6e 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -31,12 +31,12 @@ # # Good luck. stdenv.mkDerivation rec { - name = "rt-${version}"; + pname = "rt"; version = "4.4.4"; src = fetchurl { - url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; + url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz"; sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl"; }; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 364fcb118ce4e..57c774ebcb05a 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -6,7 +6,6 @@ let in stdenv.mkDerivation rec { version = "2.3.9"; pname = "sabnzbd"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2a4093d412ff7..4ec00506b3385 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -19,11 +19,11 @@ with lib; stdenv.mkDerivation rec { - name = "samba-${version}"; + pname = "samba"; version = "4.10.6"; src = fetchurl { - url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; + url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy"; }; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 6142d751dab1f..c64687054ab51 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -5,10 +5,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = elk5Version; - name = "elasticsearch-${version}"; + pname = "elasticsearch"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz"; sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb"; }; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index f86596150eab9..cf7caed398466 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { - name = "groonga-${version}"; + pname = "groonga"; version = "9.0.5"; src = fetchurl { - url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; + url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; sha256 = "15y5dddvziw9lbl24z4j5yf1ibv79bn052lmx08rbxh78777csw3"; }; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 4c5f71cb37d66..585fc2b73ef9c 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "serf-${version}"; + pname = "serf"; version = "0.8.1"; rev = "v${version}"; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 2ab3bf6668571..03d86c209f07d 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "serviio-${version}"; + pname = "serviio"; version = "2.0"; src = fetchurl { - url = "http://download.serviio.org/releases/${name}-linux.tar.gz"; + url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz"; sha256 = "1zq1ax0pdxfn0nw0vm7s23ik47w8nwh1n83a7yka8dnknxjf5nng"; }; diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index e5312b92902ec..1c726c477648d 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -2,7 +2,7 @@ , avahi, libao }: stdenv.mkDerivation rec { - name = "shairplay-unstable-${version}"; + pname = "shairplay-unstable"; version = "2018-08-24"; src = fetchFromGitHub { diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 639fa322525b5..40b88c34e8d6f 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.3.2"; - name = "shairport-sync-${version}"; + pname = "shairport-sync"; src = fetchFromGitHub { sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w"; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 70bf5c32b3d42..af1992fc86990 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.20"; - name = "shellinabox-${version}"; + pname = "shellinabox"; src = fetchFromGitHub { owner = "shellinabox"; diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index 083a224d15582..3ac32509ba3b4 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "simplehttp2server-${version}"; + pname = "simplehttp2server"; version = "3.1.3"; goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server"; diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index deeeabda7451a..b6a24e94ee002 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: stdenv.mkDerivation rec { - name = "sks-${version}"; + pname = "sks"; version = "1.1.6"; src = fetchFromBitbucket { diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 82d79785b11ce..340ef36ac5934 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "skydns-${version}"; + pname = "skydns"; version = "2.5.3a"; rev = "${version}"; diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 3409fc00066fb..730d1bbdddce1 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: stdenv.mkDerivation rec { - name = "smcroute-${version}"; + pname = "smcroute"; version = "2.4.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index 7eaa5b3e8a05c..2b21bef7d6f65 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "softether-${version}"; + pname = "softether"; version = "4.25"; build = "9656"; compiledDate = "2018.01.15"; diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix index e26e8f057b6d6..1d80752a41a56 100644 --- a/pkgs/servers/softether/4.29.nix +++ b/pkgs/servers/softether/4.29.nix @@ -3,7 +3,7 @@ , dataDir ? "/var/lib/softether" }: stdenv.mkDerivation rec { - name = "softether-${version}"; + pname = "softether"; version = "4.29"; build = "9680"; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 12cd3bfaad938..afaa8edcc14ee 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: stdenv.mkDerivation rec { - name = "sonarr-${version}"; + pname = "sonarr"; version = "2.0.0.5322"; src = fetchurl { diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 22ec301bceda8..a34b7f03be889 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -12,7 +12,7 @@ let in buildGoPackage rec { - name = "cockroach-${version}"; + pname = "cockroach"; version = "19.1.1"; goPackagePath = "github.com/cockroachdb/cockroach"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7d34dd8d63bee..ac14015c4cf3e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -218,7 +218,7 @@ server = stdenv.mkDerivation (common // { }); connector-c = stdenv.mkDerivation rec { - name = "mariadb-connector-c-${version}"; + pname = "mariadb-connector-c"; version = "2.3.7"; src = fetchurl { @@ -259,7 +259,7 @@ connector-c = stdenv.mkDerivation rec { }; galera = stdenv.mkDerivation rec { - name = "mariadb-galera-${version}"; + pname = "mariadb-galera"; version = "25.3.26"; src = fetchFromGitHub { @@ -286,7 +286,7 @@ galera = stdenv.mkDerivation rec { installPhase = '' # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${name}" + GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} install -m 555 "garb/garbd" "$out/bin/garbd" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index a50d623acbce7..062de0c2368c9 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "oracle-xe-${version}"; + pname = "oracle-xe"; version = "11.2.0"; src = requireFile { - name = "${name}-1.0.x86_64.rpm"; + name = "${pname}-${version}-1.0.x86_64.rpm"; sha256 = "0s2jj2xn56v5ys6hxb7l7045hw9c1mm1lhj4p2fvqbs02kqchab6"; url = "http://www.oracle.com/technetwork/" @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; unpackCmd = '' - (mkdir -p "${name}" && cd "${name}" && + (mkdir -p "${pname}-${version}" && cd "${pname}-${version}" && ${rpmextract}/bin/rpmextract "$curSrc") ''; diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index c77330bd2ace7..7f8f0786e038b 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }: stdenv.mkDerivation rec { - name = "percona-server-${version}"; + pname = "percona-server"; version = "5.6.43-84.3"; src = fetchurl { diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 3b4a0543e189c..ccf8ac264e997 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, libevent }: stdenv.mkDerivation rec { - name = "pgbouncer-${version}"; + pname = "pgbouncer"; version = "1.10.0"; src = fetchurl { - url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; + url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q"; }; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 3db62aa491ce7..6a9423bc4e4c2 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -3,11 +3,10 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; version = "4.0.5"; - name = "${pname}-${version}"; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz"; sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 711ad35bcc1b5..ca3c3af74f200 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -20,11 +20,11 @@ let icuEnabled = atLeast "10"; in stdenv.mkDerivation rec { - name = "postgresql-${version}"; + pname = "postgresql"; inherit version; src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index f2e814543dbf1..71fe9a72b561d 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, protobufc }: stdenv.mkDerivation rec { - name = "cstore_fdw-${version}"; + pname = "cstore_fdw"; version = "1.6.2"; nativeBuildInputs = [ protobufc ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index bccec1107b9a0..c7978aa6860a0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { - name = "pg_hll-${version}"; + pname = "pg_hll"; version = "2.12"; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 381a174838e58..7b64de381f3eb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { - name = "pg_repack-${version}"; + pname = "pg_repack"; version = "1.4.4"; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 1a5aa91ae6ec3..e25a6d0d54f90 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { - name = "pg_topn-${version}"; + pname = "pg_topn"; version = "2.2.2"; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index c68ba9b172883..ac79c1b3b3815 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pgjwt-${version}"; + pname = "pgjwt"; version = "unstable-2017-04-24"; src = fetchFromGitHub { diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 7dd6a5882b259..804356e9f6be6 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: stdenv.mkDerivation rec { - name = "pgtap-${version}"; + pname = "pgtap"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 63b8a39b0e272..33d050497da5f 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -13,7 +13,7 @@ , libiconv }: stdenv.mkDerivation rec { - name = "postgis-${version}"; + pname = "postgis"; version = "2.5.2"; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 77da47b00e0db..5f99599582061 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -7,7 +7,7 @@ # } stdenv.mkDerivation rec { - name = "timescaledb-${version}"; + pname = "timescaledb"; version = "1.4.1"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 7be23003b5847..9e3fe74aa6ce0 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, postgresql }: stdenv.mkDerivation rec { - name = "tsearch-extras-${version}"; + pname = "tsearch-extras"; version = "0.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index 4e40d87615269..f5444bb068368 100644 --- a/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/pkgs/servers/sql/sqlite/jdbc/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "sqlite-jdbc"; - name = "${pname}-${version}"; version = "3.25.2"; src = fetchMavenArtifact { @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar" + install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 4554095575920..f7b4dd84d3290 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }: stdenv.mkDerivation rec { - name = "sslh-${version}"; + pname = "sslh"; version = "1.20"; src = fetchurl { diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index d074ddf4d72e7..67d441e76c743 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "2.1.33"; pname = "Tautulli"; - name = "${pname}-${version}"; pythonPath = [ python.pkgs.setuptools ]; buildInputs = [ python.pkgs.setuptools ]; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index 967eea25d3fb1..ac3dccdab738f 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "tegola-${version}"; + pname = "tegola"; version = "0.8.1"; rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index e645ef2dc3545..121983e70315e 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, zip, fetchFromGitHub }: buildGoPackage rec { - name = "teleport-${version}"; + pname = "teleport"; version = "4.0.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index a65bf5bd916cf..c740e0036942f 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}: buildGoPackage rec { - name = "traefik-${version}"; + pname = "traefik"; version = "1.7.12"; goPackagePath = "github.com/containous/traefik"; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index fcea0f398e4ef..fc7d104a480ff 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "trezord-go-${version}"; + pname = "trezord-go"; version = "2.0.27"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index ce8947bcdda6d..c1694316f3eda 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tt-rss-${version}"; + pname = "tt-rss"; version = "2019-01-29"; rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac"; diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 6fad061ce9961..0600640155be8 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { - name = "tt-rss-plugin-auth-ldap-${version}"; + pname = "tt-rss-plugin-auth-ldap"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 27416537e3316..7ddc3abb0b4ee 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "tt-rss-plugin-ff-instagram-${version}"; + pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 src = fetchFromGitHub { diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 702b95b3f0e3a..7c3d6a5b57e21 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "tt-rss-plugin-tumblr-gdpr-${version}"; + pname = "tt-rss-plugin-tumblr-gdpr"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index d0b279eb859b7..c35667546c660 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "tt-rss-theme-feedly-${version}"; + pname = "tt-rss-theme-feedly"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index bae43412e784a..720d277d0d2cb 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - name = "ttyd-${version}"; + pname = "ttyd"; version = "1.4.2_pre${toString revCount}_${substring 0 8 src.rev}"; inherit src; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index 9e9816c941d98..12f2a08c7f487 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }: stdenv.mkDerivation rec { - name = "udpt-${version}"; + pname = "udpt"; version = "2017-09-27"; enableParallelBuilding = true; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index ba628360aaa78..0dfec772a1884 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "uftp-${version}"; + pname = "uftp"; version = "4.10"; src = fetchurl { diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 52866784faa9a..6483973546c63 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -4,7 +4,7 @@ assert tlsSupport -> openssl != null; stdenv.mkDerivation rec { - name = "uhub-${version}"; + pname = "uhub"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 9bccd5b99fb0f..3fb2817277aa1 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "ums-${version}"; + pname = "ums"; version = "6.2.2"; src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz"; + url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz"; sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15"; - name = "${name}.tgz"; + name = "${pname}-${version}.tgz"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 1e84648747276..76efdc3170584 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -48,11 +48,11 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else " in stdenv.mkDerivation rec { - name = "uwsgi-${version}"; + pname = "uwsgi"; version = "2.0.18"; src = fetchurl { - url = "https://projects.unbit.it/downloads/${name}.tar.gz"; + url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz"; sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9"; }; diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index e4dd9b0f2dc7c..3d43862cbe0eb 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "morty-${version}"; + pname = "morty"; version = "0.2.0"; goPackagePath = "github.com/asciimoo/morty"; diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index c4f49b36bf808..ef2b3b653bf16 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lib } : stdenv.mkDerivation rec { - name = "pgpkeyserver-lite-${version}"; + pname = "pgpkeyserver-lite"; version = "2017-07-18"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 946606e37013f..5c105e85a8729 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "rstya-board-${version}"; + pname = "rstya-board"; version = "0.6"; src = fetchurl { diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 615efa3b36720..f6000fc421177 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "selfoss-${version}"; + pname = "selfoss"; version = "2.18"; src = fetchurl { - url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip"; + url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip"; sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b"; }; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 64ae1dbbe1d5e..33db6fb6e6561 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "shaarli-${version}"; + pname = "shaarli"; version = "0.11.0"; src = fetchurl { diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 5fd941e9467ce..ef0a4331d41dd 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "shaarli-material-${version}"; + pname = "shaarli-material"; version = "0.10.4"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 0c51b6b13cddb..4be14b37bd2bd 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -2,7 +2,7 @@ , qtbase, libvirt, cutelyst, grantlee }: stdenv.mkDerivation rec { - name = "virtlyst-${version}"; + pname = "virtlyst"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index eafe916d02cad..a105531ff4e6b 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wallabag-${version}"; + pname = "wallabag"; version = "2.3.8"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 0a008227b9fb8..af526730ca97a 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "xcb-util-xrm-${version}"; + pname = "xcb-util-xrm"; src = fetchurl { - url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"; }; diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index b0d3dccf30f24..c25c4baf13b80 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -2,7 +2,7 @@ libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : stdenv.mkDerivation rec { - name = "biboumi-${version}"; + pname = "biboumi"; version = "8.3"; src = fetchurl { diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5db000e7a4a2d..2fa31fff2996a 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -25,10 +25,10 @@ let in stdenv.mkDerivation rec { version = "19.05"; - name = "ejabberd-${version}"; + pname = "ejabberd"; src = fetchurl { - url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; + url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz"; sha256 = "1lczck2760bcsl7vqc5xv4rizps0scdmss2zc4b1l59wzlmnfg7h"; }; diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index 0e6fcd5e9896b..ab377e3d53b13 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "openfire-${version}"; + pname = "openfire"; version = "3_6_3"; src = fetchurl { diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 928c48329656e..7bf21cbf22f2f 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -15,10 +15,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.11.2"; # also update communityModules - name = "prosody-${version}"; + pname = "prosody"; src = fetchurl { - url = "https://prosody.im/downloads/source/${name}.tar.gz"; + url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9"; }; diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 8df8499d11eb6..f5bdfd9fe8530 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : stdenv.mkDerivation rec { - name = "pyIRCt-${version}"; + pname = "pyIRCt"; version = "0.4"; src = fetchurl { @@ -19,18 +19,18 @@ stdenv.mkDerivation rec { # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; installPhase = '' - mkdir -p $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${pname}-${version} sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/${name} + cp * $out/share/${pname}-${version} cat > $out/bin/pyIRCt <<EOF #!${runtimeShell} - cd $out/share/${name} + cd $out/share/${pname}-${version} ./irc.py \"$@\" EOF - chmod a+rx $out/bin/pyIRCt $out/share/${name}/irc.py + chmod a+rx $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py wrapPythonPrograms ''; diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 76861ab842b54..719acfd3a66e6 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -1,7 +1,7 @@ { stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : stdenv.mkDerivation rec { - name = "pyMAILt-${version}"; + pname = "pyMAILt"; version = "20090101"; src = fetchcvs { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { /* doConfigure should be removed if not needed */ installPhase = '' cd mail-transport - mkdir -p $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${pname}-${version} sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { cp * $out/share/$name cat > $out/bin/pyMAILt <<EOF #!${runtimeShell} - cd $out/share/${name} + cd $out/share/${pname}-${version} ./mail.py \"$@\" EOF - chmod a+rx $out/bin/pyMAILt $out/share/${name}/mail.py + chmod a+rx $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py wrapPythonPrograms ''; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 5a052df9e0a56..c10721ee78b73 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -77,7 +77,7 @@ let perlBin = "${perl}/bin/perl"; in stdenv.mkDerivation rec { - name = "zoneminder-${version}"; + pname = "zoneminder"; version = "1.32.3"; src = fetchFromGitHub { diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 5bacaf2982e9e..44b96d4209a6c 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }: stdenv.mkDerivation rec { - name = "zookeeper-${version}"; + pname = "zookeeper"; version = "3.4.13"; src = fetchurl { - url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; + url = "mirror://apache/zookeeper/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -R conf docs lib ${name}.jar $out + cp -R conf docs lib ${pname}-${version}.jar $out mkdir -p $out/bin cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin patchShebangs $out/bin @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { chmod -x $out/bin/zkEnv.sh mkdir -p $out/share/zooinspector - cp -r contrib/ZooInspector/{${name}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector + cp -r contrib/ZooInspector/{${pname}-${version}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector - classpath="$out/${name}.jar:$out/share/zooinspector/${name}-ZooInspector.jar" + classpath="$out/${pname}-${version}.jar:$out/share/zooinspector/${pname}-${version}-ZooInspector.jar" for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do classpath="$classpath:$jar" done |