aboutsummaryrefslogtreecommitdiff
path: root/pkgs/servers/felix
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-15 12:41:18 +0000
committerJörg Thalheim <Mic92@users.noreply.github.com>2019-08-15 13:41:18 +0100
commit46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch)
tree46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/servers/felix
parentcff9e6429a4341e924594f5e057b03ca8101b314 (diff)
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/servers/felix')
-rw-r--r--pkgs/servers/felix/default.nix2
-rw-r--r--pkgs/servers/felix/remoteshell.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
index 5ce680e36460..7be7416d04d5 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 3ac3c98718f7..2fe628db0466 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";