summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix Buehler <account@buehler.rocks>2021-07-27 19:38:37 +0200
committerFelix Buehler <account@buehler.rocks>2021-07-28 16:42:26 +0200
commite170c652440db5976bf44efe723c8e9e736a90ca (patch)
tree9ba3d80765319c7f1727d0658d126c6fa210e4a8
parent16b7e4900ebb66db4414694f91a7c22214a16440 (diff)
downloadnixpkgs-e170c652440db5976bf44efe723c8e9e736a90ca.tar
nixpkgs-e170c652440db5976bf44efe723c8e9e736a90ca.tar.gz
nixpkgs-e170c652440db5976bf44efe723c8e9e736a90ca.tar.bz2
nixpkgs-e170c652440db5976bf44efe723c8e9e736a90ca.tar.lz
nixpkgs-e170c652440db5976bf44efe723c8e9e736a90ca.tar.xz
nixpkgs-e170c652440db5976bf44efe723c8e9e736a90ca.tar.zst
nixpkgs-e170c652440db5976bf44efe723c8e9e736a90ca.zip
tools/system: replace name with pname&version
-rw-r--r--pkgs/tools/system/stress/default.nix5
-rw-r--r--pkgs/tools/system/ts/default.nix6
-rw-r--r--pkgs/tools/system/undaemonize/default.nix4
3 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix
index 33fbd15c5e6..10aa285085f 100644
--- a/pkgs/tools/system/stress/default.nix
+++ b/pkgs/tools/system/stress/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "stress-1.0.4";
+  pname = "stress";
+  version = "1.0.4";
 
   src = fetchurl {
-    url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz";
+    url = "https://people.seas.harvard.edu/~apw/stress/stress-${version}.tar.gz";
     sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5";
   };
 
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index b954b1adc01..df19955b607 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -3,8 +3,8 @@
 }:
 
 stdenv.mkDerivation rec {
-
-  name = "ts-1.0";
+  pname = "ts";
+  version = "1.0";
 
   installPhase=''make install "PREFIX=$out"'';
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "http://viric.name/~viric/soft/ts/${name}.tar.gz";
+    url = "https://viric.name/~viric/soft/ts/ts-${version}.tar.gz";
     sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg";
   };
 
diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix
index 45e7a8d6d62..50ae366d10b 100644
--- a/pkgs/tools/system/undaemonize/default.nix
+++ b/pkgs/tools/system/undaemonize/default.nix
@@ -1,7 +1,9 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "undaemonize-2017-07-11";
+  pname = "undaemonize";
+  version = "unstable-2017-07-11";
+
   src = fetchFromGitHub {
     repo = "undaemonize";
     owner = "nickstenning";