diff options
Diffstat (limited to 'pkgs/os-specific/linux')
54 files changed, 169 insertions, 108 deletions
diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 57f8ba0d33b32..b67d737034e48 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "915resolution-0.5.3"; + pname = "915resolution"; + version = "0.5.3"; src = fetchurl { - url = "http://915resolution.mango-lang.org/${name}.tar.gz"; + url = "http://915resolution.mango-lang.org/915resolution-${version}.tar.gz"; sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; }; diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index d28ff447681ed..2b8dac0c8e43e 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "acpid-2.0.32"; + pname = "acpid"; + version = "2.0.32"; src = fetchurl { - url = "mirror://sourceforge/acpid2/${name}.tar.xz"; + url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz"; sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj"; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 4a3d1a36bd747..d494e95e3db67 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -7,10 +7,11 @@ let }; in stdenv.mkDerivation rec { - name = "acpitool-0.5.1"; + pname = "acpitool"; + version = "0.5.1"; src = fetchurl { - url = "mirror://sourceforge/acpitool/${name}.tar.bz2"; + url = "mirror://sourceforge/acpitool/acpitool-${version}.tar.bz2"; sha256 = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f"; }; diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 75c44e111725a..5bf32fbe66612 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }: -stdenv.mkDerivation { - name = "afuse-0.4.1"; +stdenv.mkDerivation rec { + pname = "afuse"; + version = "0.4.1"; - src = fetchurl { - url = "https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz"; - sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; + src = fetchFromGitHub { + owner = "pcarrier"; + repo = "afuse"; + rev = "v${version}"; + sha256 = "06i855h8a1w2jfly2gfy7vwhb2fp74yxbf3r69s28lki2kzwjar6"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index a627a7762a895..8ad48c41408bd 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "alsa-firmware-1.2.1"; + pname = "alsa-firmware"; + version = "1.2.1"; src = fetchurl { - url = "mirror://alsa/firmware/${name}.tar.bz2"; + url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2"; sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 30327fb1082eb..6fa7ba28d8e32 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -8,10 +8,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.5"; # at the next release, remove the patches below! + pname = "audit"; + version = "2.8.5"; # at the next release, remove the patches below! src = fetchurl { - url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + url = "https://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz"; sha256 = "1dzcwb2q78q7x41shcachn7f4aksxbxd470yk38zh03fch1l2p8f"; }; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 12655c3bed66a..92e7606c9bdbd 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "bridge-utils-1.5"; + pname = "bridge-utils"; + version = "1.5"; src = fetchurl { - url = "mirror://sourceforge/bridge/${name}.tar.gz"; + url = "mirror://sourceforge/bridge/bridge-utils-${version}.tar.gz"; sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; }; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 6f94d0f892545..d64996c4961ed 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libtool, gettext }: stdenv.mkDerivation rec { - name = "cpufrequtils-008"; + pname = "cpufrequtils"; + version = "008"; src = fetchurl { - url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/${name}.tar.gz"; + url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${version}.tar.gz"; sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0"; }; diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index 86f6f916cefc7..fbf47204b3e6f 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "devmem2-2004-08-05"; + pname = "devmem2"; + version = "unstable-2004-08-05"; src = fetchurl { urls = [ diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index f754882ccd010..8a083b8b894df 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libX11 }: stdenv.mkDerivation { - name = "disk-indicator-2014-05-19"; + pname = "disk-indicator"; + version = "unstable-2014-05-19"; src = fetchgit { url = "git://github.com/MeanEYE/Disk-Indicator.git"; diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index a4e09492debd2..a12d97280f19f 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "dmidecode-3.2"; + pname = "dmidecode"; + version = "3.2"; src = fetchurl { - url = "mirror://savannah/dmidecode/${name}.tar.xz"; + url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index c1e0dfc5ae43a..3a6f31fa55232 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, lvm2 }: stdenv.mkDerivation rec { - name = "dmraid-1.0.0.rc16"; + pname = "dmraid"; + version = "1.0.0.rc16"; src = fetchurl { - url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index ae3e986e14afa..85be205749ac2 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, flex, systemd, perl }: stdenv.mkDerivation rec { - name = "drbd-8.4.4"; + pname = "drbd"; + version = "8.4.4"; src = fetchurl { - url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz"; + url = "http://oss.linbit.com/drbd/8.4/drbd-${version}.tar.gz"; sha256 = "1w4889h1ak7gy9w33kd4fgjlfpgmp6hzfya16p1pkc13bjf22mm0"; }; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index 63c539602f125..6171f8ed3073e 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -2,7 +2,8 @@ , sysfsutils, dmidecode, kmod }: stdenv.mkDerivation { - name = "edac-utils-2015-01-07"; + pname = "edac-utils"; + version = "unstable-2015-01-07"; src = fetchFromGitHub { owner = "grondo"; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 79de65fcb9813..389078db0af52 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "b43-fwcutter-019"; + pname = "b43-fwcutter"; + version = "019"; src = fetchurl { - url = "https://bues.ch/b43/fwcutter/${name}.tar.bz2"; + url = "https://bues.ch/b43/fwcutter/b43-fwcutter-${version}.tar.bz2"; sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 6cbaa4acb8d24..3363140ad5691 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: with lib; stdenv.mkDerivation { - name = "rtl8192su-unstable-2016-10-05"; + pname = "rtl8192su"; + version = "unstable-2016-10-05"; src = fetchFromGitHub { owner = "chunkeey"; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index 18cdc21f0b601..08c35d79f3dc5 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libv4l, gd }: stdenv.mkDerivation rec { - name = "fswebcam-20200725"; + pname = "fswebcam"; + version = "2020-07-25"; src = fetchurl { - url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; + url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${lib.replaceStrings ["."] [""] version}.tar.gz"; sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; }; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 3255c992f8641..8c1a778ec8bf9 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "fxload-2002_04_11"; +stdenv.mkDerivation rec { + pname = "fxload"; + version = "2002.04.11"; src = fetchurl { - url = "mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"; + url = "mirror://sourceforge/linux-hotplug/fxload-${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; }; diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/os-specific/linux/hd-idle/default.nix index 3e4b08151463c..301a218ff62e0 100644 --- a/pkgs/os-specific/linux/hd-idle/default.nix +++ b/pkgs/os-specific/linux/hd-idle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hd-idle-1.05"; + pname = "hd-idle"; + version = "1.05"; src = fetchurl { - url = "mirror://sourceforge/project/hd-idle/${name}.tgz"; + url = "mirror://sourceforge/project/hd-idle/hd-idle-${version}.tgz"; sha256 = "031sm996s0rhy3z91b9xvyimsj2yd2fhsww2al2hxda5s5wzxzjf"; }; diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix index 543495ec2afc0..6da154648fc2e 100644 --- a/pkgs/os-specific/linux/ioport/default.nix +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -1,12 +1,16 @@ { lib, stdenv, perl, fetchurl }: -stdenv.mkDerivation { - name = "ioport-1.2"; +stdenv.mkDerivation rec { + pname = "ioport"; + version = "1.2"; + src = fetchurl { - url = "https://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; + url = "https://people.redhat.com/rjones/ioport/files/ioport-${version}.tar.gz"; sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; }; + buildInputs = [ perl ]; + meta = with lib; { description = "Direct access to I/O ports from the command line"; homepage = "https://people.redhat.com/rjones/ioport/"; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index a91175aa59f30..0376ff1a55eca 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,10 +1,11 @@ { lib, fetchurl, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { - name = "iotop-0.6"; + pname = "iotop"; + version = "0.6"; src = fetchurl { - url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"; sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 33152cc51c134..f10364121a461 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -7,10 +7,11 @@ # the time being. stdenv.mkDerivation rec { - name = "ipsec-tools-0.8.2"; + pname = "ipsec-tools"; + version = "0.8.2"; src = fetchurl { - url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2"; + url = "mirror://sourceforge/ipsec-tools/ipsec-tools-${version}.tar.bz2"; sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; }; diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 554898cedebc1..12e4c15e62c0b 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, linuxHeaders }: -stdenv.mkDerivation { - name = "jujuutils-0.2"; +stdenv.mkDerivation rec { + pname = "jujuutils"; + version = "0.2"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-0.2.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-${version}.tar.gz"; sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; }; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 6db3a9583ecda..53b4cd60fb1c7 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: stdenv.mkDerivation { - name = "kmscube-2018-06-17"; + pname = "kmscube"; + version = "unstable-2018-06-17"; src = fetchgit { url = "git://anongit.freedesktop.org/mesa/kmscube"; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 30ec6cdc7b51e..56e412379f80f 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "latencytop-0.5"; + pname = "latencytop"; + version = "0.5"; patchPhase = "sed -i s,/usr,$out, Makefile"; preInstall = "mkdir -p $out/sbin"; src = fetchurl { - urls = [ "http://latencytop.org/download/${name}.tar.gz" + urls = [ "http://latencytop.org/download/latencytop-${version}.tar.gz" "http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ]; sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index c422f5e01bb4b..d5be78e913b7a 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, udev, buildPackages }: stdenv.mkDerivation rec { - name = "libatasmart-0.19"; + pname = "libatasmart"; + version = "0.19"; src = fetchurl { - url = "http://0pointer.de/public/${name}.tar.xz"; + url = "http://0pointer.de/public/libatasmart-${version}.tar.xz"; sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 87b7d33c5d84c..653094c91884f 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libvolume_id-0.81.1"; +stdenv.mkDerivation rec { + pname = "libvolume_id"; + version = "0.81.1"; src = fetchurl { - url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; + url = "https://www.marcuscom.com/downloads/libvolume_id-${version}.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; @@ -21,5 +22,6 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.linux; license = licenses.gpl2; + homepage = "http://www.marcuscom.com/downloads/"; }; } diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index ec56a89ce88fe..8da12d78bc93d 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { - name = "lightum-2014-06-07"; + pname = "lightum"; + version = "unstable-2014-06-07"; src = fetchgit { url = "https://github.com/poliva/lightum"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index 8bbd3ab7f4272..19d6f10e3de18 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lksctp-tools-1.0.17"; + pname = "lksctp-tools"; + version = "1.0.17"; src = fetchurl { - url = "mirror://sourceforge/lksctp/${name}.tar.gz"; + url = "mirror://sourceforge/lksctp/lksctp-tools-${version}.tar.gz"; sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs"; }; diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 6286735b758ba..d87820f246649 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "lsscsi-0.32"; +stdenv.mkDerivation rec { + pname = "lsscsi"; + version = "0.32"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.32.tgz"; + url = "http://sg.danny.cz/scsi/lsscsi-${version}.tgz"; sha256 = "sha256-CoAOnpTcoqtwLWXXJ3eujK4Hjj100Ly+1kughJ6AKaE="; }; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 441476d5f0656..fe9c11ace1f65 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,7 +1,8 @@ { fetchFromGitHub, kernel, lib, stdenv }: stdenv.mkDerivation { - name = "mba6x_bl-2016-12-08"; + pname = "mba6x_bl"; + version = "unstable-2016-12-08"; src = fetchFromGitHub { owner = "patjak"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 935ded637097b..01d2bba32a4df 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }: stdenv.mkDerivation rec { - name = "mdadm-4.1"; + pname = "mdadm"; + version = "4.1"; src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz"; sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index 8a2cf69dd368f..eb58dc5536769 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "mingetty-1.08"; +stdenv.mkDerivation rec { + pname = "mingetty"; + version = "1.08"; src = fetchurl { - url = "mirror://sourceforge/mingetty/mingetty-1.08.tar.gz"; + url = "mirror://sourceforge/mingetty/mingetty-${version}.tar.gz"; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index eeea1d74dcac4..da2ba4b9ff2de 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mkinitcpio-nfs-utils-0.3"; + pname = "mkinitcpio-nfs-utils"; + version = "0.3"; src = fetchurl { - url = "https://sources.archlinux.org/other/mkinitcpio/${name}.tar.xz"; + url = "https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-nfs-utils-${version}.tar.xz"; sha256 = "0fc93sfk41ycpa33083kyd7i4y00ykpbhj5qlw611bjghj4x946j"; # ugh, upstream... - name = "${name}.tar.gz"; + name = "mkinitcpio-nfs-utils-${version}.tar.gz"; }; makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 3498625be7570..d5129ca7f73ac 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation { - name = "mxu11x0-1.4-${kernel.version}"; + pname = "mxu11x0"; + version = "1.4-${kernel.version}"; src = fetchurl { url = "https://www.moxa.com/Moxa/media/PDIM/S100000385/moxa-uport-1000-series-linux-3.x-and-4.x-for-uport-11x0-series-driver-v1.4.tgz"; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 0121c4a6f1c86..23bc8ff0dfad7 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, openldap, perl}: -stdenv.mkDerivation { - name = "nss_ldap-265"; +stdenv.mkDerivation rec { + pname = "nss_ldap"; + version = "265"; src = fetchurl { - url = "http://www.padl.com/download/nss_ldap-265.tar.gz"; + url = "http://www.padl.com/download/nss_ldap-${version}.tar.gz"; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; }; diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 21d5a871f4e91..0526c02f75f86 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "numad-0.5"; + pname = "numad"; + version = "0.5"; src = fetchurl { - url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/${name}.tar.xz"; + url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/numad-${version}.tar.xz"; sha256 = "08zd1yc3w00yv4mvvz5sq1gf91f6p2s9ljcd72m33xgnkglj60v4"; }; diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 33df8c0cc3459..b7f1b65744041 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -9,7 +9,8 @@ {lib, stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { - name = "xorg-sys-opengl-3"; + pname = "xorg-sys-opengl"; + version = "3"; builder = ./builder.sh; neededLibs = map (p: p.out) [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index fed7930bf1485..14381ac68c164 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam }: stdenv.mkDerivation rec { - name = "otpw-1.3"; + pname = "otpw"; + version = "1.3"; src = fetchurl { - url = "https://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/download/otpw-${version}.tar.gz"; sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk"; }; diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index bfe9ac7c830ca..4b2cc7a3822bd 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, pam, openssl, db}: stdenv.mkDerivation rec { - name = "pam_ccreds-10"; + pname = "pam_ccreds"; + version = "10"; src = fetchurl { - url = "https://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/pam_ccreds-${version}.tar.gz"; sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index cb04fa5b4242f..af5fbccff0529 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam, libkrb5 }: stdenv.mkDerivation rec { - name = "pam-krb5-4.10"; + pname = "pam-krb5"; + version = "4.10"; src = fetchurl { - url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; + url = "https://archives.eyrie.org/software/kerberos/pam-krb5-${version}.tar.gz"; sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79"; }; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index e327a551b231a..988256808dbb8 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pam, openldap, perl }: stdenv.mkDerivation rec { - name = "pam_ldap-186"; + pname = "pam_ldap"; + version = "186"; src = fetchurl { - url = "https://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/pam_ldap-${version}.tar.gz"; sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 1a66e986d8b28..8411c4fdbfaff 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -33,10 +33,11 @@ let in stdenv.mkDerivation rec { - name = "pam_usb-0.5.0"; + pname = "pam_usb"; + version = "0.5.0"; src = fetchurl { - url = "mirror://sourceforge/pamusb/${name}.tar.gz"; + url = "mirror://sourceforge/pamusb/pam_usb-${version}.tar.gz"; sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1"; }; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index a4da6be691e9b..bca58bd808eba 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -7,10 +7,11 @@ # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { - name = "pcmciautils-018"; + pname = "pcmciautils"; + version = "018"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz"; + url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${version}.tar.gz"; sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index 7d5d6d59ea84d..5c3ef666c83c8 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "perf-tools-20171219"; + pname = "perf-tools"; + version = "unstable-2017-12-19"; src = fetchFromGitHub { owner = "brendangregg"; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 17723983c696e..4076641717f40 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -12,10 +12,11 @@ let in stdenv.mkDerivation rec { - name = "pm-utils-1.4.1"; + pname = "pm-utils"; + version = "1.4.1"; src = fetchurl { - url = "https://pm-utils.freedesktop.org/releases/${name}.tar.gz"; + url = "https://pm-utils.freedesktop.org/releases/pm-utils-${version}.tar.gz"; sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index 851a903cf0724..facf690a9bd41 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -3,7 +3,8 @@ assert lib.versionAtLeast kernel.version "4.4"; stdenv.mkDerivation { - name = "sch_cake-2017-07-16"; + pname = "sch_cake"; + version = "unstable-2017-07-16"; src = fetchFromGitHub { owner = "dtaht"; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index 4daac076e5872..b5f067fffd720 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sysfsutils-2.1.0"; + pname = "sysfsutils"; + version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/linux-diag/${name}.tar.gz"; + url = "mirror://sourceforge/linux-diag/sysfsutils-${version}.tar.gz"; sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"; }; diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index af180b5e5241f..8e02ab71dbe9a 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "sysklogd-1.5.1"; +stdenv.mkDerivation rec { + pname = "sysklogd"; + version = "1.5.1"; src = fetchurl { - url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz"; + url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${version}.tar.gz"; sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2eff999ac7cfe..2d5b3e2ab5588 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.4.3"; + pname = "sysstat"; + version = "12.4.3"; src = fetchurl { - url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; + url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; }; diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index d2b0bc08071e9..f2a7b692baa33 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -18,7 +18,8 @@ let }; in stdenv.mkDerivation { - name = "tbs-2018.04.18-${kernel.version}"; + pname = "tbs"; + version = "2018.04.18-${kernel.version}"; srcs = [ media build ]; sourceRoot = build.name; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 549a607b15228..646e3702fed00 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "tunctl-1.5"; +stdenv.mkDerivation rec { + pname = "tunctl"; + version = "1.5"; + src = fetchurl { - url = "mirror://sourceforge/tunctl/tunctl-1.5.tar.gz"; + url = "mirror://sourceforge/tunctl/tunctl-${version}.tar.gz"; sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff"; }; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index d0c690a952748..87b38b9af6e49 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { - name = "usermount-0.1"; + pname = "usermount"; + version = "0.1"; src = fetchgit { url = "https://github.com/tom5760/usermount.git"; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 7c93fa91854b7..bba646e583b80 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation { - name = "xf86-video-nested-2017-06-12"; + pname = "xf86-video-nested"; + version = "unstable-2017-06-12"; src = fetchgit { url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested"; |