diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 0f9b511d455..517a53a5fec 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitLab, fetchpatch }: -stdenv.mkDerivation { - name = "aacgain-1.9.0"; +stdenv.mkDerivation rec { + pname = "aacgain"; + version = "1.9.0"; src = fetchFromGitLab { owner = "mulx"; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 11c141e9c55..36686655f36 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }: stdenv.mkDerivation rec { - name = "cdparanoia-III-10.2"; + pname = "cdparanoia-III"; + version = "10.2"; src = fetchurl { - url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz"; + url = "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${version}.src.tgz"; sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index c61f838bc3a..d635dce83f4 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -19,9 +19,10 @@ with lib; stdenv.mkDerivation rec { - name = "crip-3.9"; + pname = "crip"; + version = "3.9"; src = fetchurl { - url = "http://bach.dynet.com/crip/src/${name}.tar.gz"; + url = "http://bach.dynet.com/${pname}/src/${pname}-${version}.tar.gz"; sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz"; }; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 333c1d08b3a..a456d62e6f6 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: stdenv.mkDerivation { - name = "dirt-2018-01-01"; + pname = "dirt"; + version = "unstable-2018-01-01"; src = fetchFromGitHub { repo = "Dirt"; owner = "tidalcycles"; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index 3e2087162f5..b2b9f5e3475 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gmu-0.10.1"; + pname = "gmu"; + version = "0.10.1"; src = fetchurl { - url = "http://wejp.k.vu/files/${name}.tar.gz"; + url = "https://wej.k.vu/files/${pname}-${version}.tar.gz"; sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv"; }; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 520b55e96da..25ee53d3f43 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsa-lib, libxml2, lrdf }: stdenv.mkDerivation rec { - name = "jack-rack-1.4.7"; + pname = "jack-rack"; + version = "1.4.7"; src = fetchurl { - url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 2b4d413526a..95fc88a8696 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libjack2, pkg-config }: stdenv.mkDerivation rec { - name = "jackmeter-0.4"; + pname = "jackmeter"; + version = "0.4"; src = fetchurl { - url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz"; + url = "https://www.aelius.com/njh/${pname}/${pname}-${version}.tar.gz"; sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 4d39616c99d..4cc0fec2e2f 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libmikmod, ncurses }: stdenv.mkDerivation rec { - name = "mikmod-3.2.8"; + pname = "mikmod"; + version = "3.2.8"; src = fetchurl { - url = "mirror://sourceforge/mikmod/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v"; }; diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index bf0a347d14b..ba2a757e090 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, fetchpatch, unzip, mpg123 }: -stdenv.mkDerivation { - name = "mp3gain-1.6.2"; +stdenv.mkDerivation rec { + pname = "mp3gain"; + version = "1.6.2"; src = fetchurl { - url = "mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip"; + url = "mirror://sourceforge/${pname}/${pname}-${lib.replaceStrings ["."] ["_"] version}-src.zip"; sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w"; }; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d67b4da5eb2..86c1f87f522 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "mp3info-0.8.5a"; + pname = "mp3info"; + version = "0.8.5a"; src = fetchurl { - url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/${name}.tgz"; + url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz"; sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 8f9489befc5..44788467d8f 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -7,10 +7,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.26.5"; + pname = "mpg123"; + version = "1.26.5"; src = fetchurl { - url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY="; }; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index 8b2284f9b30..59d58df8c8d 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "nootka-1.4.7"; + pname = "nootka"; + version = "1.4.7"; src = fetchurl { - url = "mirror://sourceforge/nootka/${name}-source.tar.bz2"; + url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2"; sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x"; }; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 8ca75eecde1..6c602ef1d03 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}: stdenv.mkDerivation rec { - name = "opus-tools-0.2"; + pname = "opus-tools"; + version = "0.2"; + src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/opus/${pname}-${version}.tar.gz"; sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl"; }; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 25d7857c353..460b97479c6 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,10 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.4.4"; + pname = "qmmp"; + version = "1.4.4"; src = fetchurl { - url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; + url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2"; sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ="; }; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index aa18a5e397e..15c973a46fc 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "tony-2.1.1"; + pname = "tony"; + version = "2.1.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${name}.tar.gz"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${pname}-${version}.tar.gz"; sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp"; }; diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index ff10ff13e19..7a7ec1e4188 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -2,9 +2,10 @@ , lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }: stdenv.mkDerivation rec { - name = "transcode-1.1.7"; + pname = "transcode"; + version = "1.1.7"; src = fetchurl { - url = "https://bitbucket.org/france/transcode-tcforge/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/france/transcode-tcforge/downloads/${pname}-${version}.tar.bz2"; sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92"; }; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 6158f33713a..5f99555d376 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }: stdenv.mkDerivation rec { - name = "xmp-4.1.0"; + pname = "xmp"; + version = "4.1.0"; meta = with lib; { description = "Extended module player"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz"; sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix index db6fc7d3381..873a294540d 100644 --- a/pkgs/applications/audio/zita-ajbridge/default.nix +++ b/pkgs/applications/audio/zita-ajbridge/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, libjack2, zita-alsa-pcmi, zita-resampler }: stdenv.mkDerivation rec { - name = "zita-ajbridge-0.8.4"; + pname = "zita-ajbridge"; + version = "0.8.4"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw"; }; diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix index 7a66ed42b05..8a629e145c4 100644 --- a/pkgs/applications/audio/zita-at1/default.nix +++ b/pkgs/applications/audio/zita-at1/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "zita-at1-0.6.2"; + pname = "zita-at1"; + version = "0.6.2"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr"; }; diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix index 79d3838e688..442f1f2235f 100644 --- a/pkgs/build-support/icon-conv-tools/default.nix +++ b/pkgs/build-support/icon-conv-tools/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, icoutils }: stdenv.mkDerivation { - name = "icon-conv-tools-0.0.0"; + pname = "icon-conv-tools"; + version = "0.0.0"; src = ./bin; diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 70da5bf5b5f..4678d35442f 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, coreutils }: -stdenv.mkDerivation { - name = "libredirect-0"; +stdenv.mkDerivation rec { + pname = "libredirect"; + version = "0"; unpackPhase = '' cp ${./libredirect.c} libredirect.c diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 28609919098..3170d199cf5 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -1,12 +1,13 @@ { lib, fetchFromGitHub, buildPythonApplication, python, graphviz }: -buildPythonApplication { - name = "gprof2dot-2019-11-30"; +buildPythonApplication rec { + pname = "gprof2dot"; + version = "2019.11.30"; src = fetchFromGitHub { owner = "jrfonseca"; repo = "gprof2dot"; - rev = "2019.11.30"; + rev = version; sha256 = "1nw4cfwimd0djarw4wc756q095xir78js8flmycg6g7sl3l6p27s"; }; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index a1e88d8ebfb..43970497bb4 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "emma-2.0.5312"; +stdenv.mkDerivation rec { + pname = "emma"; + version = "2.0.5312"; src = fetchurl { - url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; }; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index 265f6290453..e07d98998ef 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "findbugs-3.0.1"; + pname = "findbugs"; + version = "3.0.1"; src = fetchurl { - url = "mirror://sourceforge/findbugs/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "06b46fz4nid7qvm36r66zw01fr87y4jyz21ixw27b8hkqah0s3p8"; }; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index 8984a395818..f7f5e84c012 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { - name = "tracefilegen-2017-05-13"; + pname = "tracefilegen"; + version = "unstable-2017-05-13"; src = fetchFromGitHub { owner = "GarCoSim"; @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 TraceFileGen $out/bin/TraceFileGen - mkdir -p $out/share/doc/${name}/ - cp -ar $src/Documentation/html $out/share/doc/${name}/. + mkdir -p $out/share/doc/${pname}-${version}/ + cp -ar $src/Documentation/html $out/share/doc/${pname}-${version}/. ''; meta = with lib; { diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 6fc19b3ae24..a76b6b9239e 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation { - name = "tracefilesim-2015-11-07"; + pname = "tracefilesim"; + version = "unstable-2015-11-07"; src = fetchFromGitHub { owner = "GarCoSim"; diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix index 1f9e2ba3c56..5c286e62954 100644 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: -stdenv.mkDerivation { - name = "makefile2graph-2018-01-03"; +stdenv.mkDerivation rec { + pname = "makefile2graph"; + version = "unstable-2018-01-03"; src = fetchFromGitHub { owner = "lindenb"; diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 2780c8552fc..82a32504d73 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -4,12 +4,12 @@ , llvm, libxml2 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "smatch"; version = "20120924"; src = fetchgit { - url = "git://repo.or.cz/smatch.git"; + url = "git://repo.or.cz/${pname}.git"; rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9"; sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index e0d9840472b..66b457f9902 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, pkg-config, libxml2, llvm }: stdenv.mkDerivation rec { - name = "sparse-0.5.0"; + pname = "sparse"; + version = "0.5.0"; src = fetchurl { - url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.xz"; + url = "mirror://kernel/software/devel/sparse/dist/${pname}-${version}.tar.xz"; sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj"; }; diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index 581ff56bb61..954342550ea 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, flex }: stdenv.mkDerivation rec { - name = "splint-3.1.2"; + pname = "splint"; + version = "3.1.2"; src = fetchurl { - url = "http://www.splint.org/downloads/${name}.src.tgz"; + url = "https://www.splint.org/downloads/${pname}-${version}.src.tgz"; sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index e4ebb85f27f..cc67ce8123c 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "swarm-2019-03-11"; +stdenv.mkDerivation rec { + pname = "swarm"; + version = "unstable-2019-03-11"; src = fetchFromGitHub { owner = "nimble-code"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index d99bbe1cae4..5a787d9c3f8 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { - name = "valgrind-3.16.1"; + pname = "valgrind"; + version = "3.16.1"; src = fetchurl { - url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2"; + url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1jik19rcd34ip8a5c9nv5wfj8k8maqb8cyclr4xhznq2gcpkl7y9"; }; diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 10b9f7291a2..fd24362bab1 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "valkyrie-2.0.0"; + pname = "valkyrie"; + version = "2.0.0"; src = fetchurl { - url = "http://valgrind.org/downloads/${name}.tar.bz2"; + url = "https://valgrind.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; }; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index bc44741cffe..7eefc4fc92d 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}: -stdenv.mkDerivation { - name = "cdecl-2.5"; +stdenv.mkDerivation rec { + pname = "cdecl"; + version = "2.5"; src = fetchurl { - url = "https://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz"; + url = "https://www.cdecl.org/files/${pname}-blocks-${version}.tar.gz"; sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly"; }; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 6a1470e1074..9e0e40b69f4 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,8 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - name = "chef-dk-4.13.3"; + pname = "chef-dk"; + version = "4.13.3"; inherit ruby; gemdir = ./.; diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index 4c94ff1e6e2..ce352542061 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, +{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, freetype, fontconfig, xorg, libusb-compat-0_1 }: stdenv.mkDerivation { - name = "diamond-3.10"; + pname = "diamond"; + version = "3.10"; nativeBuildInputs = [ rpmextract patchelf makeWrapper file ]; @@ -15,17 +16,17 @@ stdenv.mkDerivation { buildCommand = '' origprefix=usr/local/diamond/3.10_x64 prefix=diamond - + echo "Unpacking $src..." rpmextract $src - + # Move $pwd/usr/local/diamond/VERS to $out/diamond, cd. mkdir -p $out/$prefix rmdir $out/$prefix mv $origprefix $out/$prefix - + cd $out - + # Extract all tarballs. for tb in \ cae_library/cae_library.tar.gz \ @@ -36,13 +37,13 @@ stdenv.mkDerivation { bin/bin.tar.gz \ examples/examples.tar.gz \ data/data.tar.gz ; do - + echo "Extracting tarball $prefix/$tb" cd $out/$prefix/$(dirname $tb) tar xf $(basename $tb) rm $(basename $tb) done - + # Patch shebangs in start scripts . cd $out/$prefix/bin/lin64 for tool in \ @@ -60,11 +61,11 @@ stdenv.mkDerivation { ipexpress \ fileutility \ diamond ; do - + echo "Patching script $prefix/bin/lin64/$tool..." patchShebangs $tool done - + # Patch executable ELFs. for path in bin/lin64 ispfpga/bin/lin64; do cd $out/$prefix/$path @@ -82,10 +83,10 @@ stdenv.mkDerivation { $f done done - + # Remove 32-bit libz. rm $out/$prefix/bin/lin64/libz.{so,so.1} - + # Make wrappers (should these target more than the 'diamond' tool?). # The purpose of these is just to call the target program using its # absolute path - otherwise, it will crash. diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index cb3b3040596..7c8ad17c5a0 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.3"; + pname = "libsigrokdecode"; + version = "0.5.3"; src = fetchurl { - url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; + url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz"; sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 186608cde3f..b6970beb873 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }: stdenv.mkDerivation rec { - name = "autobuild-5.3"; + pname = "autobuild"; + version = "5.3"; src = fetchurl { - url = "http://savannah.spinellicreations.com/autobuild/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1"; }; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 9cfd9380010..db2ffce50ce 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -6,10 +6,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { - name = "avrdude-6.3"; + pname = "avrdude"; + version = "6.3"; src = fetchurl { - url = "mirror://savannah/avrdude/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"; }; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 26c484017d2..3dc424f106b 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.8"; + pname = "babeltrace"; + version = "1.5.8"; src = fetchurl { - url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2"; + url = "https://www.efficios.com/files/babeltrace/${pname}-${version}.tar.bz2"; sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 74073722857..4e35ff35f66 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -14,7 +14,8 @@ let in stdenv.mkDerivation { - name = "bossa-1.8"; + pname = "bossa"; + version = "1.8"; src = fetchgit { url = "https://github.com/shumatech/BOSSA"; diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 62aa0ab5dec..a8f6e32f1e0 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, tk, makeWrapper }: stdenv.mkDerivation rec { - name = "cbrowser-0.8"; + pname = "cbrowser"; + version = "0.8"; src = fetchurl { - url = "mirror://sourceforge/cbrowser/cbrowser-0.8.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji"; }; @@ -14,10 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ tk ]; installPhase = '' - mkdir -p $out/bin $out/share/${name} - cp -R * $out/share/${name}/ + mkdir -p $out/bin $out/share/${pname}-${version} + cp -R * $out/share/${pname}-${version}/ - makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \ + makeWrapper $out/share/${pname}-${version}/cbrowser $out/bin/cbrowser \ --prefix PATH : ${tk}/bin ''; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index b9e75d7cb2a..92a812d5a21 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, emacs }: stdenv.mkDerivation rec { - name = "cflow-1.6"; + pname = "cflow"; + version = "1.6"; src = fetchurl { - url = "mirror://gnu/cflow/${name}.tar.bz2"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1mzd3yf0dfv8h2av5vsxxlhpk21nw064h91b2kgfrdz92r0pnj1l"; }; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index ff804f897d1..97da80cc733 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "chrpath-0.16"; +stdenv.mkDerivation rec { + pname = "chrpath"; + version = "0.16"; src = fetchurl { - url = "https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz"; + url = "https://alioth-archive.debian.org/releases/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; }; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 9fe5ed96672..b0dcfc6aa5c 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "cppi-1.18"; + pname = "cppi"; + version = "1.18"; src = fetchurl { - url = "mirror://gnu/cppi/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j"; }; diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 7eb38e385e8..c79a2d25201 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "cscope-15.9"; + pname = "cscope"; + version = "15.9"; src = fetchurl { - url = "mirror://sourceforge/cscope/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "0ngiv4aj3rr35k3q3wjx0y19gh7i1ydqa0cqip6sjwd8fph5ll65"; }; diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 9565eaa3626..78b743ef9f1 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: -stdenv.mkDerivation { - name = "dbench-2013-01-01"; +stdenv.mkDerivation rec { + pname = "dbench"; + version = "2013-01-01"; src = fetchgit { - url = "git://git.samba.org/sahlberg/dbench.git"; + url = "git://git.samba.org/sahlberg/${pname}.git"; rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597"; sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; }; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 74eb9fcb293..ca50deb504d 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}: stdenv.mkDerivation rec { - name = "ddd-3.3.12"; + pname = "ddd"; + version = "3.3.12"; src = fetchurl { - url = "mirror://gnu/ddd/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [motif ncurses libX11 libXt]; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 61251434578..d335916bfe6 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.6.2"; + pname = "dejagnu"; + version = "1.6.2"; src = fetchurl { - url = "mirror://gnu/dejagnu/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd"; }; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 0692d84b454..22de87b95c3 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, python3}: -stdenv.mkDerivation { - name = "doclifter-2.19"; +stdenv.mkDerivation rec { + pname = "doclifter"; + version = "2.19"; src = fetchurl { - url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz"; + url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz"; sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index 2700e56b392..9a521bfd274 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, fetchFromGitHub, php, which, makeWrapper, bash, coreutils, ncurses }: stdenv.mkDerivation rec { - name = "drush-6.1.0"; + pname = "drush"; + version = "6.1.0"; meta = with lib; { description = "Command-line shell and Unix scripting interface for Drupal"; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 5a5267510d7..c5ede848851 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { - name = "eggdbus-0.6"; + pname = "eggdbus"; + version = "0.6"; src = fetchurl { - url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 512989a1446..d0b5911b71d 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -5,11 +5,12 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation { - name = "gnum4-1.4.18"; +stdenv.mkDerivation rec { + pname = "gnum4"; + version = "1.4.18"; src = fetchurl { - url = "mirror://gnu/m4/m4-1.4.18.tar.bz2"; + url = "mirror://gnu/m4/m4-${version}.tar.bz2"; sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; }; diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index e998f09683a..71b0bbd0b0d 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gperf-3.1"; + pname = "gperf"; + version = "3.1"; src = fetchurl { - url = "mirror://gnu/gperf/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq"; }; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 6651bbb0384..9e6d846e80a 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, gtk2, pkg-config }: -stdenv.mkDerivation { - name = "gtkdialog-0.8.3"; +stdenv.mkDerivation rec { + pname = "gtkdialog"; + version = "0.8.3"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-0.8.3.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 4b7f7985a67..ff5fe7bcba4 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: -stdenv.mkDerivation { - name = "gtkperf-0.40.0"; +stdenv.mkDerivation rec { + pname = "gtkperf"; + version = "0.40.0"; src = fetchurl { - url = "mirror://sourceforge//gtkperf/gtkperf_0.40.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}_${lib.versions.majorMinor version}.tar.gz"; sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p"; }; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 4a205268c26..d4d6dc41657 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "help2man-1.48.1"; + pname = "help2man"; + version = "1.48.1"; src = fetchurl { - url = "mirror://gnu/help2man/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-3op0dAvQWGRlZ7kqtOzeudqfGgfMfE9gejwU3TjRB5k="; }; diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index 478c0a61f86..930327a880d 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl, librsvg}: stdenv.mkDerivation rec { - name = "icon-naming-utils-0.8.90"; + pname = "icon-naming-utils"; + version = "0.8.90"; src = fetchurl { - url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; + url = "http://tango.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4"; }; diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 8c5ec6af1c7..1f5236456db 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "indent-2.2.12"; + pname = "indent"; + version = "2.2.12"; src = fetchurl { - url = "mirror://gnu/indent/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; }; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 55e62a2dcae..01a0fab369e 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl, python3 }: stdenv.mkDerivation rec { - name = "itstool-2.0.6"; + pname = "itstool"; + version = "2.0.6"; src = fetchurl { - url = "http://files.itstool.org/itstool/${name}.tar.bz2"; + url = "http://files.itstool.org/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; }; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index dbcb8d52f1b..83dbfb93c86 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,10 +1,11 @@ { autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { - name = "jscoverage-0.5.1"; + pname = "jscoverage"; + version = "0.5.1"; src = fetchurl { - url = "https://siliconforks.com/jscoverage/download/${name}.tar.bz2"; + url = "https://siliconforks.com/${pname}/download/${pname}-${version}.tar.bz2"; sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4"; }; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 2b0089e89f6..1cd195a3132 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "libtool-1.5.26"; + pname = "libtool"; + version = "1.5.26"; src = fetchurl { - url = "mirror://gnu/libtool/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w"; }; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index e1d9ae6b551..ce176aac4a6 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, elfutils, libunwind }: -stdenv.mkDerivation { - name = "ltrace-0.7.3"; +stdenv.mkDerivation rec { + pname = "ltrace"; + version = "0.7.3"; src = fetchurl { - url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2"; + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.bz2"; sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index a196c5f4528..1e89be8a0c2 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { - name = "lttv-1.5"; + pname = "lttv"; + version = "1.5"; src = fetchurl { - url = "https://lttng.org/files/packages/${name}.tar.bz2"; + url = "https://lttng.org/files/packages/${pname}-${version}.tar.bz2"; sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index bf71b619e5a..99f3d8c13e7 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/pkgs/development/tools/misc/rman/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "rman-3.2"; +stdenv.mkDerivation rec { + pname = "rman"; + version = "3.2"; src = fetchurl { - url = "mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz"; + url = "mirror://sourceforge/polyglotman/${version}/${pname}-${version}.tar.gz"; sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; }; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 2fd98490287..fc619612a48 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { - name = "sloccount-2.26"; + pname = "sloccount"; + version = "2.26"; src = fetchurl { - url = "https://www.dwheeler.com/sloccount/${name}.tar.gz"; + url = "https://www.dwheeler.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index a18dcd85255..d986ef05243 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: stdenv.mkDerivation rec { - name = "srecord-1.64"; + pname = "srecord"; + version = "1.64"; src = fetchurl { - url = "mirror://sourceforge/srecord/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"; }; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 8b9646713e8..bc33d417f88 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "stm32flash-0.5"; + pname = "stm32flash"; + version = "0.5"; src = fetchurl { - url = "mirror://sourceforge/stm32flash/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 1fb255073ed..986a560ff6e 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "uisp-20050207"; +stdenv.mkDerivation rec { + pname = "uisp"; + version = "20050207"; src = fetchurl { - url = "http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz"; + url = "https://savannah.nongnu.org/download/uisp/uisp-${version}.tar.gz"; sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 63452728b91..0fcb121e460 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -30,15 +30,16 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' sys.symlinkDir=INSTALLDIR/bin ''; }; -in stdenv.mkDerivation { - name = "neoload-4.1.4"; +in stdenv.mkDerivation rec { + pname = "neoload"; + version = "4.1.4"; src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then - { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh"; + { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x64.sh"; sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; } else - { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh"; + { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x86.sh"; sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } ); nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index a43903c34d3..b40c8b42546 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -stdenv.mkDerivation { - name = "ocamlify-0.0.2"; +stdenv.mkDerivation rec { + pname = "ocamlify"; + version = "0.0.2"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz"; + url = "https://forge.ocamlcore.org/frs/download.php/1209/${pname}-${version}.tar.gz"; sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 4518e7a22e4..82a495b733b 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -1,8 +1,9 @@ {lib, stdenv, fetchurl, ocaml, findlib, camlp4}: -stdenv.mkDerivation { - name = "ocamlscript-2.0.3"; +stdenv.mkDerivation rec { + pname = "ocamlscript"; + version = "2.0.3"; src = fetchurl { - url = "http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz"; + url = "https://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; }; diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index a7ffeb69745..d53eec12e80 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "peg-0.1.18"; + pname = "peg"; + version = "0.1.18"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.gz"; + url = "${meta.homepage}/${pname}-${version}.tar.gz"; sha256 = "114h1y4k8fwcq9m0hfk33dsp7ah8zxzjjzlk71x4iirzczfkn690"; }; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 4cd49b884ce..5b7e77ee0b5 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "phantomjs-1.9.8"; + pname = "phantomjs"; + version = "1.9.8"; # I chose to use the binary build for now. # The source version is quite nasty to compile @@ -14,18 +15,18 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-i686.tar.bz2"; sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-x86_64.tar.bz2"; sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1"; } else # x86_64-darwin fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-macosx.zip"; sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg"; }; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index eaaa057dc0a..5380bb68608 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, python2, emacs }: -stdenv.mkDerivation { - name = "pydb-1.26"; +stdenv.mkDerivation rec { + pname = "pydb"; + version = "1.26"; src = fetchurl { - url = "mirror://sourceforge/sourceforge/bashdb/pydb-1.26.tar.bz2"; + url = "mirror://sourceforge/sourceforge/bashdb/${pname}-${version}.tar.bz2"; sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1"; }; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 94b5e5a6dcc..8dafe88005d 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { - name = "quilt-0.66"; + pname = "quilt"; + version = "0.66"; src = fetchurl { - url = "mirror://savannah/quilt/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"; }; diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index ef04725e562..ede6364fa06 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perlPackages, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "sslmate-1.7.1"; + pname = "sslmate"; + version = "1.7.1"; src = fetchurl { - url = "https://packages.sslmate.com/other/${name}.tar.gz"; + url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz"; sha256 = "1i56za41cfqlml9g787xqqs0r8jifd3y7ks9nf4k2dhhi4rijkj5"; }; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index ae9c7c83392..422969d2c66 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }: -stdenv.mkDerivation { - name = "sunxi-tools-20181113"; +stdenv.mkDerivation rec { + pname = "sunxi-tools"; + version = "unstable-2018-11-13"; src = fetchFromGitHub { owner = "linux-sunxi"; diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix index 67900dda140..b579e367433 100644 --- a/pkgs/development/tools/xib2nib/default.nix +++ b/pkgs/development/tools/xib2nib/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: stdenv.mkDerivation { - name = "xib2nib-730e177"; + pname = "xib2nib"; + version = "unstable-2017-04-12"; src = fetchFromGitHub { owner = "matthewbauer";