diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
| commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
| tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs | |
| parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
| parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
| download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip | |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs')
5430 files changed, 18163 insertions, 14984 deletions
diff --git a/nixpkgs/pkgs/applications/altcoins/default.nix b/nixpkgs/pkgs/applications/altcoins/default.nix deleted file mode 100644 index 5b5bfb897cf3..000000000000 --- a/nixpkgs/pkgs/applications/altcoins/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ callPackage, boost155, boost165, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: - -rec { - - aeon = callPackage ./aeon { }; - - bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; - clightning = callPackage ./clightning.nix { }; - - bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; - bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; - - bitcoin-unlimited = libsForQt5.callPackage ./bitcoin-unlimited.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = true; - }; - bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = false; - }; - - bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - - btc1 = callPackage ./btc1.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - boost = boost165; - }; - btc1d = btc1.override { withGui = false; }; - - cryptop = python3.pkgs.callPackage ./cryptop { }; - - dashpay = callPackage ./dashpay.nix { }; - - dcrd = callPackage ./dcrd.nix { }; - dcrwallet = callPackage ./dcrwallet.nix { }; - - dero = callPackage ./dero.nix { boost = boost165; }; - - dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; }; - dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; }; - - - freicoin = callPackage ./freicoin.nix { boost = boost155; }; - go-ethereum = callPackage ./go-ethereum.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - go-ethereum-classic = callPackage ./go-ethereum-classic { - buildGoPackage = buildGo110Package; - }; - - litecoin = callPackage ./litecoin.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - litecoind = litecoin.override { withGui = false; }; - - lnd = callPackage ./lnd.nix { }; - - masari = callPackage ./masari.nix { boost = boost165; }; - - mist = callPackage ./mist.nix { }; - - namecoin = callPackage ./namecoin.nix { withGui = true; }; - namecoind = callPackage ./namecoin.nix { withGui = false; }; - - pivx = libsForQt59.callPackage ./pivx.nix { withGui = true; }; - pivxd = callPackage ./pivx.nix { withGui = false; }; - - ethabi = callPackage ./ethabi.nix { }; - - stellar-core = callPackage ./stellar-core.nix { }; - - sumokoin = callPackage ./sumokoin.nix { boost = boost165; }; - - wownero = callPackage ./wownero.nix {}; - - zcash = callPackage ./zcash { - withGui = false; - }; - - parity = callPackage ./parity { }; - parity-beta = callPackage ./parity/beta.nix { }; - parity-ui = callPackage ./parity-ui { }; - - polkadot = callPackage ./polkadot { }; - - particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; }; -} diff --git a/nixpkgs/pkgs/applications/altcoins/parity/beta.nix b/nixpkgs/pkgs/applications/altcoins/parity/beta.nix deleted file mode 100644 index 4b6a88fd410a..000000000000 --- a/nixpkgs/pkgs/applications/altcoins/parity/beta.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - version = "2.6.1"; - sha256 = "0yvscs2ivy08zla3jhirxhwwaqsn9j5ml4sqbgx6h5rh19c941vh"; - cargoSha256 = "1s3c44cggajrmc504klf4cyb1s4l5ny48yihs9c3fc0n8d064017"; -in - import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix b/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix index 3ea7b90f84a7..720fd0b88be9 100644 --- a/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/AMB-plugins/default.nix @@ -2,10 +2,10 @@ }: stdenv.mkDerivation rec { - name = "AMB-plugins-${version}"; + pname = "AMB-plugins"; version = "0.8.1"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl"; }; diff --git a/nixpkgs/pkgs/applications/audio/FIL-plugins/default.nix b/nixpkgs/pkgs/applications/audio/FIL-plugins/default.nix index b9322c37df00..ed1f05eaf5c6 100644 --- a/nixpkgs/pkgs/applications/audio/FIL-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/FIL-plugins/default.nix @@ -2,10 +2,10 @@ }: stdenv.mkDerivation rec { - name = "FIL-plugins-${version}"; + pname = "FIL-plugins"; version = "0.3.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw"; }; diff --git a/nixpkgs/pkgs/applications/audio/MMA/default.nix b/nixpkgs/pkgs/applications/audio/MMA/default.nix index ed7a8481f693..92f46abddd5a 100644 --- a/nixpkgs/pkgs/applications/audio/MMA/default.nix +++ b/nixpkgs/pkgs/applications/audio/MMA/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "16.06"; - name = "mma-${version}"; + pname = "mma"; src = fetchurl { url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix index 70709ae4ac4c..b94fed413412 100644 --- a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix +++ b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix @@ -5,7 +5,7 @@ let inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "a2jmidid-${version}"; + pname = "a2jmidid"; version = "8"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/abcde/default.nix b/nixpkgs/pkgs/applications/audio/abcde/default.nix index b602707b3921..adb38d4bbbab 100644 --- a/nixpkgs/pkgs/applications/audio/abcde/default.nix +++ b/nixpkgs/pkgs/applications/audio/abcde/default.nix @@ -6,7 +6,8 @@ let version = "2.9.3"; in stdenv.mkDerivation { - name = "abcde-${version}"; + pname = "abcde"; + inherit version; src = fetchurl { url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04"; diff --git a/nixpkgs/pkgs/applications/audio/aeolus/default.nix b/nixpkgs/pkgs/applications/audio/aeolus/default.nix index 7b80b32331bc..389052d30e1c 100644 --- a/nixpkgs/pkgs/applications/audio/aeolus/default.nix +++ b/nixpkgs/pkgs/applications/audio/aeolus/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "aeolus-${version}"; + pname = "aeolus"; version = "0.9.7"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k"; }; diff --git a/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix b/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix index d6064e80e3ff..0750c38550b1 100644 --- a/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix @@ -2,7 +2,7 @@ , wafHook }: stdenv.mkDerivation rec { - name = "ams-lv2-${version}"; + pname = "ams-lv2"; version = "1.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/ario/default.nix b/nixpkgs/pkgs/applications/audio/ario/default.nix index 02d818410df4..4b48f5f1eea2 100644 --- a/nixpkgs/pkgs/applications/audio/ario/default.nix +++ b/nixpkgs/pkgs/applications/audio/ario/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "ario-${version}"; + pname = "ario"; src = fetchurl { - url = "mirror://sourceforge/ario-player/${name}.tar.gz"; + url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz"; sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; diff --git a/nixpkgs/pkgs/applications/audio/artyFX/default.nix b/nixpkgs/pkgs/applications/audio/artyFX/default.nix index 91a0a1f140c2..4b76ebdf6053 100644 --- a/nixpkgs/pkgs/applications/audio/artyFX/default.nix +++ b/nixpkgs/pkgs/applications/audio/artyFX/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: stdenv.mkDerivation rec { - name = "artyFX-${version}"; + pname = "artyFX"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/asunder/default.nix b/nixpkgs/pkgs/applications/audio/asunder/default.nix index 9c42c98ba5e3..e4c145b35c75 100644 --- a/nixpkgs/pkgs/applications/audio/asunder/default.nix +++ b/nixpkgs/pkgs/applications/audio/asunder/default.nix @@ -13,9 +13,9 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.9.3"; - name = "asunder-${version}"; + pname = "asunder"; src = fetchurl { - url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; + url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5"; }; diff --git a/nixpkgs/pkgs/applications/audio/audacious/default.nix b/nixpkgs/pkgs/applications/audio/audacious/default.nix index 68660b5d054b..12e8237d4857 100644 --- a/nixpkgs/pkgs/applications/audio/audacious/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacious/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "audacious-${version}"; + pname = "audacious"; version = "3.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix index b685fda7683d..6be40a7b93aa 100644 --- a/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.3.2"; - name = "audacity-${version}"; + pname = "audacity"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix b/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix index 7b84cd02a627..534b87e9fa74 100644 --- a/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix +++ b/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix @@ -5,11 +5,11 @@ , pulseaudioSupport ? true, libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "audio-recorder-${version}"; + pname = "audio-recorder"; version = "2.1.3"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz"; sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r"; }; diff --git a/nixpkgs/pkgs/applications/audio/avldrums-lv2/default.nix b/nixpkgs/pkgs/applications/audio/avldrums-lv2/default.nix index c49470b76e2d..7ca5d83b48b2 100644 --- a/nixpkgs/pkgs/applications/audio/avldrums-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/avldrums-lv2/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "avldrums.lv2"; version = "0.3.5"; diff --git a/nixpkgs/pkgs/applications/audio/axoloti/default.nix b/nixpkgs/pkgs/applications/audio/axoloti/default.nix index e3f1b6acf874..7f551304df11 100644 --- a/nixpkgs/pkgs/applications/audio/axoloti/default.nix +++ b/nixpkgs/pkgs/applications/audio/axoloti/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0.12-2"; - name = "axoloti-${version}"; + pname = "axoloti"; src = fetchFromGitHub { owner = "axoloti"; diff --git a/nixpkgs/pkgs/applications/audio/axoloti/dfu-util.nix b/nixpkgs/pkgs/applications/audio/axoloti/dfu-util.nix index 07a78260991f..e9fa6daecfe3 100644 --- a/nixpkgs/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/nixpkgs/pkgs/applications/audio/axoloti/dfu-util.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libusb1-axoloti }: stdenv.mkDerivation rec { - name="dfu-util-${version}"; + pname = "dfu-util"; version = "0.8"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1-axoloti ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; }; diff --git a/nixpkgs/pkgs/applications/audio/baudline/default.nix b/nixpkgs/pkgs/applications/audio/baudline/default.nix index 6827d12b3217..c35df95b24c7 100644 --- a/nixpkgs/pkgs/applications/audio/baudline/default.nix +++ b/nixpkgs/pkgs/applications/audio/baudline/default.nix @@ -7,7 +7,7 @@ let [ libXmu libXt libX11 libXext libXxf86vm libjack2 ]; in stdenv.mkDerivation rec { - name = "baudline-${version}"; + pname = "baudline"; version = "1.08"; src = diff --git a/nixpkgs/pkgs/applications/audio/bitmeter/default.nix b/nixpkgs/pkgs/applications/audio/bitmeter/default.nix index fbe2c97042f0..6f471f3a0283 100644 --- a/nixpkgs/pkgs/applications/audio/bitmeter/default.nix +++ b/nixpkgs/pkgs/applications/audio/bitmeter/default.nix @@ -1,11 +1,11 @@ { stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }: stdenv.mkDerivation rec { - name = "bitmeter-${version}"; + pname = "bitmeter"; version = "1.2"; src = fetchurl { - url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz"; + url = "https://devel.tlrmx.org/audio/source/${pname}-${version}.tar.gz"; sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 31716fce1c21..835868471906 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -6,7 +6,7 @@ , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { - name = "bitwig-studio-${version}"; + pname = "bitwig-studio"; version = "1.3.16"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/bristol/default.nix b/nixpkgs/pkgs/applications/audio/bristol/default.nix index e1ed12b9bd2e..504900d65955 100644 --- a/nixpkgs/pkgs/applications/audio/bristol/default.nix +++ b/nixpkgs/pkgs/applications/audio/bristol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: stdenv.mkDerivation rec { - name = "bristol-${version}"; + pname = "bristol"; version = "0.60.11"; src = fetchurl { - url = "mirror://sourceforge/bristol/${name}.tar.gz"; + url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz"; sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; diff --git a/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix index adda92353647..2dee463aeee2 100644 --- a/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix +++ b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ffmpeg, sox }: stdenv.mkDerivation rec { - name = "bs1770gain-${version}"; + pname = "bs1770gain"; version = "0.5.2"; src = fetchurl { - url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; + url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz"; sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; }; diff --git a/nixpkgs/pkgs/applications/audio/calf/default.nix b/nixpkgs/pkgs/applications/audio/calf/default.nix index 7d7d25ea88a0..0106e8b45846 100644 --- a/nixpkgs/pkgs/applications/audio/calf/default.nix +++ b/nixpkgs/pkgs/applications/audio/calf/default.nix @@ -2,11 +2,11 @@ , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "calf-${version}"; + pname = "calf"; version = "0.90.3"; src = fetchurl { - url = "https://calf-studio-gear.org/files/${name}.tar.gz"; + url = "https://calf-studio-gear.org/files/${pname}-${version}.tar.gz"; sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3"; }; diff --git a/nixpkgs/pkgs/applications/audio/caps/default.nix b/nixpkgs/pkgs/applications/audio/caps/default.nix index 1f53809e9059..eabbf8668375 100644 --- a/nixpkgs/pkgs/applications/audio/caps/default.nix +++ b/nixpkgs/pkgs/applications/audio/caps/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "caps-${version}"; + pname = "caps"; version = "0.9.26"; src = fetchurl { url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/audio/caudec/default.nix b/nixpkgs/pkgs/applications/audio/caudec/default.nix index 04f0f9d30259..9c2f17c5cc9c 100644 --- a/nixpkgs/pkgs/applications/audio/caudec/default.nix +++ b/nixpkgs/pkgs/applications/audio/caudec/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "caudec-${version}"; + pname = "caudec"; + inherit version; src = fetchurl { url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/cava/default.nix b/nixpkgs/pkgs/applications/audio/cava/default.nix index 439175b090a8..5c5c262056ec 100644 --- a/nixpkgs/pkgs/applications/audio/cava/default.nix +++ b/nixpkgs/pkgs/applications/audio/cava/default.nix @@ -2,7 +2,7 @@ libpulseaudio, ncurses }: stdenv.mkDerivation rec { - name = "cava-${version}"; + pname = "cava"; version = "0.6.1"; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/cd-discid/default.nix b/nixpkgs/pkgs/applications/audio/cd-discid/default.nix index 382d4a1b6675..76f76c1e750d 100644 --- a/nixpkgs/pkgs/applications/audio/cd-discid/default.nix +++ b/nixpkgs/pkgs/applications/audio/cd-discid/default.nix @@ -2,11 +2,11 @@ , IOKit ? null }: stdenv.mkDerivation rec { - name = "cd-discid-${version}"; + pname = "cd-discid"; version = "1.4"; src = fetchurl { - url = "http://linukz.org/download/${name}.tar.gz"; + url = "http://linukz.org/download/${pname}-${version}.tar.gz"; sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"; }; diff --git a/nixpkgs/pkgs/applications/audio/chuck/default.nix b/nixpkgs/pkgs/applications/audio/chuck/default.nix index da26a7188357..692485d0dcfd 100644 --- a/nixpkgs/pkgs/applications/audio/chuck/default.nix +++ b/nixpkgs/pkgs/applications/audio/chuck/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.4.0.0"; - name = "chuck-${version}"; + pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; diff --git a/nixpkgs/pkgs/applications/audio/clementine/default.nix b/nixpkgs/pkgs/applications/audio/clementine/default.nix index 1b0dfebe22c2..f48a429b3896 100644 --- a/nixpkgs/pkgs/applications/audio/clementine/default.nix +++ b/nixpkgs/pkgs/applications/audio/clementine/default.nix @@ -67,7 +67,8 @@ let ''; free = stdenv.mkDerivation { - name = "clementine-free-${version}"; + pname = "clementine-free"; + inherit version; inherit src patches nativeBuildInputs postPatch; # gst_plugins needed for setup-hooks @@ -95,7 +96,8 @@ let # Unfree Spotify blob for Clementine unfree = stdenv.mkDerivation { - name = "clementine-blob-${version}"; + pname = "clementine-blob"; + inherit version; # Use the same patches and sources as Clementine inherit src nativeBuildInputs postPatch; diff --git a/nixpkgs/pkgs/applications/audio/cmus/default.nix b/nixpkgs/pkgs/applications/audio/cmus/default.nix index b574993338de..b88951c0fc5b 100644 --- a/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -101,7 +101,7 @@ let in stdenv.mkDerivation rec { - name = "cmus-${version}"; + pname = "cmus"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/nixpkgs/pkgs/applications/audio/cmusfm/default.nix index 2147a84f24be..51b88607208e 100644 --- a/nixpkgs/pkgs/applications/audio/cmusfm/default.nix +++ b/nixpkgs/pkgs/applications/audio/cmusfm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2018-10-11"; - name = "cmusfm-unstable-${version}"; + pname = "cmusfm-unstable"; src = fetchFromGitHub { owner = "Arkq"; repo = "cmusfm"; diff --git a/nixpkgs/pkgs/applications/audio/csa/default.nix b/nixpkgs/pkgs/applications/audio/csa/default.nix index c3b3b9441357..0b8afada0206 100644 --- a/nixpkgs/pkgs/applications/audio/csa/default.nix +++ b/nixpkgs/pkgs/applications/audio/csa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "csa-${version}"; + pname = "csa"; version = "0.5.100810"; src = fetchurl { - url = "mirror://sourceforge/csa/${name}.tar.gz"; + url = "mirror://sourceforge/csa/${pname}-${version}.tar.gz"; sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3"; }; diff --git a/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix index e97341acbb44..86e200ab252f 100644 --- a/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix @@ -3,7 +3,7 @@ qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: stdenv.mkDerivation rec { - name = "csound-qt-${version}"; + pname = "csound-qt"; version = "0.9.6-beta3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/csound/default.nix b/nixpkgs/pkgs/applications/audio/csound/default.nix index cb968ee9e00f..758448c2fb33 100644 --- a/nixpkgs/pkgs/applications/audio/csound/default.nix +++ b/nixpkgs/pkgs/applications/audio/csound/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "csound-${version}"; + pname = "csound"; # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index dab3a97f6e73..b26360f0c469 100644 --- a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: stdenv.mkDerivation rec { - name = "deadbeef-headerbar-gtk3-plugin-${version}"; + pname = "deadbeef-headerbar-gtk3-plugin"; version = "1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix index d2355681b728..8a81101983f7 100644 --- a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }: stdenv.mkDerivation rec { - name = "deadbeef-infobar-plugin-${version}"; + pname = "deadbeef-infobar-plugin"; version = "1.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 4d5367087c10..5b27f3c3f323 100644 --- a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, deadbeef, glib }: stdenv.mkDerivation rec { - name = "deadbeef-mpris2-plugin-${version}"; + pname = "deadbeef-mpris2-plugin"; version = "1.12"; src = fetchurl { - url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; }; diff --git a/nixpkgs/pkgs/applications/audio/denemo/default.nix b/nixpkgs/pkgs/applications/audio/denemo/default.nix index d01e7879335d..331e3fb96989 100644 --- a/nixpkgs/pkgs/applications/audio/denemo/default.nix +++ b/nixpkgs/pkgs/applications/audio/denemo/default.nix @@ -5,7 +5,7 @@ , portaudio, portmidi, fftw, makeWrapper }: stdenv.mkDerivation rec { - name = "denemo-${version}"; + pname = "denemo"; version = "2.3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/dfasma/default.nix b/nixpkgs/pkgs/applications/audio/dfasma/default.nix index d16534b03d32..1785ca60060c 100644 --- a/nixpkgs/pkgs/applications/audio/dfasma/default.nix +++ b/nixpkgs/pkgs/applications/audio/dfasma/default.nix @@ -27,7 +27,7 @@ let }; in stdenv.mkDerivation rec { - name = "dfasma-${version}"; + pname = "dfasma"; version = "1.4.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/distrho/default.nix b/nixpkgs/pkgs/applications/audio/distrho/default.nix index 1c41451b08f3..054fc758d645 100644 --- a/nixpkgs/pkgs/applications/audio/distrho/default.nix +++ b/nixpkgs/pkgs/applications/audio/distrho/default.nix @@ -8,7 +8,7 @@ let else if stdenv.hostPlatform.isWindows then "mingw" else "linux"; in stdenv.mkDerivation rec { - name = "distrho-ports-${version}"; + pname = "distrho-ports"; version = "2018-04-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix b/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix index e5354b060946..11b214f6bb38 100644 --- a/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix +++ b/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.9.17"; - name = "drumgizmo-${version}"; + pname = "drumgizmo"; src = fetchurl { - url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; + url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1"; }; diff --git a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix index f8e1db4814cc..8f1f79169d7b 100644 --- a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: stdenv.mkDerivation rec { - name = "drumkv1-${version}"; + pname = "drumkv1"; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; + url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983"; }; diff --git a/nixpkgs/pkgs/applications/audio/ecasound/default.nix b/nixpkgs/pkgs/applications/audio/ecasound/default.nix index 1013b8a560ca..6c9cd628a518 100644 --- a/nixpkgs/pkgs/applications/audio/ecasound/default.nix +++ b/nixpkgs/pkgs/applications/audio/ecasound/default.nix @@ -14,7 +14,7 @@ # TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. stdenv.mkDerivation rec { - name = "ecasound-${version}"; + pname = "ecasound"; version = "2.9.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/eflite/default.nix b/nixpkgs/pkgs/applications/audio/eflite/default.nix index 4138a07ec067..2338c0ed376e 100644 --- a/nixpkgs/pkgs/applications/audio/eflite/default.nix +++ b/nixpkgs/pkgs/applications/audio/eflite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }: stdenv.mkDerivation rec { - name = "eflite-${version}"; + pname = "eflite"; version = "0.4.1"; src = fetchurl { - url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz"; + url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz"; sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci"; }; diff --git a/nixpkgs/pkgs/applications/audio/ekho/default.nix b/nixpkgs/pkgs/applications/audio/ekho/default.nix index 209ffa05bf28..0e2c950051a5 100644 --- a/nixpkgs/pkgs/applications/audio/ekho/default.nix +++ b/nixpkgs/pkgs/applications/audio/ekho/default.nix @@ -5,7 +5,8 @@ let version = "5.8.2"; in stdenv.mkDerivation rec { - name = "ekho-${version}"; + pname = "ekho"; + inherit version; meta = with stdenv.lib; { description = "Chinese text-to-speech software"; @@ -23,7 +24,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz"; + url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz"; sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; }; diff --git a/nixpkgs/pkgs/applications/audio/eq10q/default.nix b/nixpkgs/pkgs/applications/audio/eq10q/default.nix index 651604c71a11..0308fad831d0 100644 --- a/nixpkgs/pkgs/applications/audio/eq10q/default.nix +++ b/nixpkgs/pkgs/applications/audio/eq10q/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig , xorg }: stdenv.mkDerivation rec { - name = "eq10q-${version}"; + pname = "eq10q"; version = "2.2"; src = fetchurl { - url = "mirror://sourceforge/project/eq10q/${name}.tar.gz"; + url = "mirror://sourceforge/project/eq10q/${pname}-${version}.tar.gz"; sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; diff --git a/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix index 5d0af8cf17ab..043d5b9d2d3a 100644 --- a/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix +++ b/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix @@ -4,7 +4,7 @@ , sonicSupport ? true, sonic }: stdenv.mkDerivation rec { - name = "espeak-ng-${version}"; + pname = "espeak-ng"; version = "1.49.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/eteroj.lv2/default.nix b/nixpkgs/pkgs/applications/audio/eteroj.lv2/default.nix index 28e4879efdc0..bbfe1ad5623f 100644 --- a/nixpkgs/pkgs/applications/audio/eteroj.lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/eteroj.lv2/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "eteroj.lv2"; version = "0.4.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "OpenMusicKontrollers"; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust1.nix b/nixpkgs/pkgs/applications/audio/faust/faust1.nix index 6e47d921d345..687608b43524 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust1.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust1.nix @@ -25,7 +25,8 @@ let }; faust = stdenv.mkDerivation { - name = "faust-${version}"; + pname = "faust"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix index 383d2deb10bb..ad1239b22af2 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -35,7 +35,8 @@ let faust = stdenv.mkDerivation { - name = "faust-${version}"; + pname = "faust"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/applications/audio/faust/faustlive.nix b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix index 754c48070603..4268a783c8d8 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faustlive.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "faustlive-${version}"; + pname = "faustlive"; version = "2017-12-05"; src = fetchFromGitHub { owner = "grame-cncm"; diff --git a/nixpkgs/pkgs/applications/audio/flac123/default.nix b/nixpkgs/pkgs/applications/audio/flac123/default.nix index f0863bfc50b0..19ed23523556 100644 --- a/nixpkgs/pkgs/applications/audio/flac123/default.nix +++ b/nixpkgs/pkgs/applications/audio/flac123/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: stdenv.mkDerivation rec { - name = "flac123-${version}"; + pname = "flac123"; version = "0.0.12"; src = fetchurl { - url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz"; + url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz"; sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr"; }; diff --git a/nixpkgs/pkgs/applications/audio/flacon/default.nix b/nixpkgs/pkgs/applications/audio/flacon/default.nix index 2d2d88308cc1..02317fee15f1 100644 --- a/nixpkgs/pkgs/applications/audio/flacon/default.nix +++ b/nixpkgs/pkgs/applications/audio/flacon/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "flacon-${version}"; + pname = "flacon"; version = "5.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/fmsynth/default.nix b/nixpkgs/pkgs/applications/audio/fmsynth/default.nix index 58d095080fe5..dc163de8ade7 100644 --- a/nixpkgs/pkgs/applications/audio/fmsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/fmsynth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: stdenv.mkDerivation rec { - name = "fmsynth-unstable-${version}"; + pname = "fmsynth-unstable"; version = "2015-02-07"; src = fetchFromGitHub { owner = "Themaister"; diff --git a/nixpkgs/pkgs/applications/audio/fomp/default.nix b/nixpkgs/pkgs/applications/audio/fomp/default.nix index 680fab4ca643..a92d331baadb 100644 --- a/nixpkgs/pkgs/applications/audio/fomp/default.nix +++ b/nixpkgs/pkgs/applications/audio/fomp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }: stdenv.mkDerivation rec { - name = "fomp-${version}"; + pname = "fomp"; version = "1.0.0"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; diff --git a/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix index 28b2cd98e02c..330ae56f13f0 100644 --- a/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix +++ b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "git-2015-05-21"; - name = "foo-yc20-${version}"; + pname = "foo-yc20"; src = fetchFromGitHub { owner = "sampov2"; repo = "foo-yc20"; diff --git a/nixpkgs/pkgs/applications/audio/freewheeling/default.nix b/nixpkgs/pkgs/applications/audio/freewheeling/default.nix index efb832ae625f..a2588093309d 100644 --- a/nixpkgs/pkgs/applications/audio/freewheeling/default.nix +++ b/nixpkgs/pkgs/applications/audio/freewheeling/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "freewheeling-${version}"; + pname = "freewheeling"; version = "0.6.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix b/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix index a0a79785283c..d95b3eea596d 100644 --- a/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix +++ b/nixpkgs/pkgs/applications/audio/game-music-emu/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.6.1"; - name = "game-music-emu-${version}"; + pname = "game-music-emu"; src = fetchurl { - url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2"; sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"; }; diff --git a/nixpkgs/pkgs/applications/audio/gigedit/default.nix b/nixpkgs/pkgs/applications/audio/gigedit/default.nix index e9ce20f6c80a..d8fada45eb16 100644 --- a/nixpkgs/pkgs/applications/audio/gigedit/default.nix +++ b/nixpkgs/pkgs/applications/audio/gigedit/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gigedit-${version}"; + pname = "gigedit"; version = "1.1.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; }; diff --git a/nixpkgs/pkgs/applications/audio/gmpc/default.nix b/nixpkgs/pkgs/applications/audio/gmpc/default.nix index 07d5684e98e7..cae35b625190 100644 --- a/nixpkgs/pkgs/applications/audio/gmpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/gmpc/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gmpc-${version}"; + pname = "gmpc"; version = "11.8.16"; libmpd = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index 3981bc792769..3406f3178847 100644 --- a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -5,7 +5,7 @@ # rustPlatform.buildRustPackage rec { stdenv.mkDerivation rec { version = "0.4.6"; - name = "gnome-podcasts-${version}"; + pname = "gnome-podcasts"; src = fetchurl { url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz; diff --git a/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 7716b1e0c355..b51b72f1c8a4 100644 --- a/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -43,7 +43,8 @@ let in stdenv.mkDerivation { - name = "google-play-music-desktop-player-${version}"; + pname = "google-play-music-desktop-player"; + inherit version; src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; diff --git a/nixpkgs/pkgs/applications/audio/gradio/default.nix b/nixpkgs/pkgs/applications/audio/gradio/default.nix index 3aea07235d8a..94d0f5eb50f5 100644 --- a/nixpkgs/pkgs/applications/audio/gradio/default.nix +++ b/nixpkgs/pkgs/applications/audio/gradio/default.nix @@ -19,7 +19,8 @@ let version = "7.2"; in stdenv.mkDerivation rec { - name = "gradio-${version}"; + pname = "gradio"; + inherit version; src = fetchFromGitHub { owner = "haecker-felix"; diff --git a/nixpkgs/pkgs/applications/audio/greg/default.nix b/nixpkgs/pkgs/applications/audio/greg/default.nix index e7a23b6f204c..e027680f5fe6 100644 --- a/nixpkgs/pkgs/applications/audio/greg/default.nix +++ b/nixpkgs/pkgs/applications/audio/greg/default.nix @@ -3,7 +3,6 @@ with pythonPackages; buildPythonApplication rec { pname = "greg"; version = "0.4.7"; - name = pname + "-" + version; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/applications/audio/gtkpod/default.nix b/nixpkgs/pkgs/applications/audio/gtkpod/default.nix index e01dbc1d30fe..fd3632ee1552 100644 --- a/nixpkgs/pkgs/applications/audio/gtkpod/default.nix +++ b/nixpkgs/pkgs/applications/audio/gtkpod/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "2.1.5"; - name = "gtkpod-${version}"; + pname = "gtkpod"; src = fetchurl { - url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; + url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz"; sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; diff --git a/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 9df4308131eb..91f4b1dcdfe9 100644 --- a/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { - name = "guitarix-${version}"; + pname = "guitarix"; version = "0.38.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix index 04cb57800f95..1f4323eb9d55 100644 --- a/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "GxPlugins.lv2"; version = "0.7"; diff --git a/nixpkgs/pkgs/applications/audio/helm/default.nix b/nixpkgs/pkgs/applications/audio/helm/default.nix index fa76a1a26e82..d32c55122c5f 100644 --- a/nixpkgs/pkgs/applications/audio/helm/default.nix +++ b/nixpkgs/pkgs/applications/audio/helm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "helm-${version}"; + pname = "helm"; src = fetchFromGitHub { owner = "mtytel"; diff --git a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix index d68bfbf2ae4e..50093f8a61de 100644 --- a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix +++ b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.7"; - name = "hydrogen-${version}"; + pname = "hydrogen"; src = fetchurl { url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/i-score/default.nix b/nixpkgs/pkgs/applications/audio/i-score/default.nix index 69fc4b419c06..2cc39e649434 100644 --- a/nixpkgs/pkgs/applications/audio/i-score/default.nix +++ b/nixpkgs/pkgs/applications/audio/i-score/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "1.0.0-b31"; - name = "i-score-${version}"; + pname = "i-score"; src = fetchFromGitHub { owner = "OSSIA"; diff --git a/nixpkgs/pkgs/applications/audio/iannix/default.nix b/nixpkgs/pkgs/applications/audio/iannix/default.nix index c26980e1bb26..1fd8531fb7f3 100644 --- a/nixpkgs/pkgs/applications/audio/iannix/default.nix +++ b/nixpkgs/pkgs/applications/audio/iannix/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "iannix-${version}"; + pname = "iannix"; version = "2016-01-31"; src = fetchFromGitHub { owner = "iannix"; diff --git a/nixpkgs/pkgs/applications/audio/id3v2/default.nix b/nixpkgs/pkgs/applications/audio/id3v2/default.nix index d2720fcace67..0fdb3b2a4a14 100644 --- a/nixpkgs/pkgs/applications/audio/id3v2/default.nix +++ b/nixpkgs/pkgs/applications/audio/id3v2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, id3lib, groff, zlib}: stdenv.mkDerivation rec { - name = "id3v2-${version}"; + pname = "id3v2"; version = "0.1.12"; src = fetchurl { - url = "mirror://sourceforge/id3v2/${name}.tar.gz"; + url = "mirror://sourceforge/id3v2/${pname}-${version}.tar.gz"; sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1"; }; diff --git a/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix b/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix index 2b8c041a0740..341c41818421 100644 --- a/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { - name = "infamousPlugins-${version}"; + pname = "infamousPlugins"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix b/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix index 84be6b866fae..0ca5988383a6 100644 --- a/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }: stdenv.mkDerivation rec { - name = "ir.lv2-${version}"; + pname = "ir.lv2"; version = "1.2.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/jaaa/default.nix b/nixpkgs/pkgs/applications/audio/jaaa/default.nix index 33c74f2b0443..92b2f8ac5153 100644 --- a/nixpkgs/pkgs/applications/audio/jaaa/default.nix +++ b/nixpkgs/pkgs/applications/audio/jaaa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }: stdenv.mkDerivation rec { - name = "jaaa-${version}"; + pname = "jaaa"; version = "0.9.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 = "1czksxx2g8na07k7g57qlz0vvkkgi5bzajcx7vc7jhb94hwmmxbc"; }; diff --git a/nixpkgs/pkgs/applications/audio/jack-capture/default.nix b/nixpkgs/pkgs/applications/audio/jack-capture/default.nix index f11bba34c74c..c62ccc4fc883 100644 --- a/nixpkgs/pkgs/applications/audio/jack-capture/default.nix +++ b/nixpkgs/pkgs/applications/audio/jack-capture/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libjack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { - name = "jack_capture-${version}"; + pname = "jack_capture"; version = "0.9.73"; src = fetchurl { - url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz"; + url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz"; sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; diff --git a/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix b/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix index 75a8a6a4b1a1..d31bc981e0cb 100644 --- a/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/nixpkgs/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }: stdenv.mkDerivation rec { - name = "jack_oscrolloscope-${version}"; + pname = "jack_oscrolloscope"; version = "0.7"; src = fetchurl { - url = "http://das.nasophon.de/download/${name}.tar.gz"; + url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; diff --git a/nixpkgs/pkgs/applications/audio/jalv/default.nix b/nixpkgs/pkgs/applications/audio/jalv/default.nix index 0f1ed143dddd..a40d5101b34f 100644 --- a/nixpkgs/pkgs/applications/audio/jalv/default.nix +++ b/nixpkgs/pkgs/applications/audio/jalv/default.nix @@ -2,11 +2,11 @@ , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { - name = "jalv-${version}"; + pname = "jalv"; version = "1.6.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa"; }; diff --git a/nixpkgs/pkgs/applications/audio/japa/default.nix b/nixpkgs/pkgs/applications/audio/japa/default.nix index 18b7bcd1d568..a9eb15aabf35 100644 --- a/nixpkgs/pkgs/applications/audio/japa/default.nix +++ b/nixpkgs/pkgs/applications/audio/japa/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "japa-${version}"; + pname = "japa"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897"; }; diff --git a/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix b/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix index 344e6894baf5..4bb1d63a1e71 100644 --- a/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/nixpkgs/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libav, libkeyfinder }: stdenv.mkDerivation rec { - name = "keyfinder-cli-${version}"; + pname = "keyfinder-cli"; version = "2015-09-13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/keyfinder/default.nix b/nixpkgs/pkgs/applications/audio/keyfinder/default.nix index 55039e8508bc..d47fc3b6190d 100644 --- a/nixpkgs/pkgs/applications/audio/keyfinder/default.nix +++ b/nixpkgs/pkgs/applications/audio/keyfinder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: stdenv.mkDerivation rec { - name = "keyfinder-${version}"; + pname = "keyfinder"; version = "2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/kid3/default.nix b/nixpkgs/pkgs/applications/audio/kid3/default.nix index 04d0349c88f6..dfb07c4f4568 100644 --- a/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { - name = "kid3-${version}"; + pname = "kid3"; version = "3.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8"; }; diff --git a/nixpkgs/pkgs/applications/audio/klick/default.nix b/nixpkgs/pkgs/applications/audio/klick/default.nix index 5e54609f8bf0..f33245d8f1c9 100644 --- a/nixpkgs/pkgs/applications/audio/klick/default.nix +++ b/nixpkgs/pkgs/applications/audio/klick/default.nix @@ -2,11 +2,11 @@ , libsamplerate, libsndfile, liblo, libjack2, boost }: stdenv.mkDerivation rec { - name = "klick-${version}"; + pname = "klick"; version = "0.12.2"; src = fetchurl { - url = "http://das.nasophon.de/download/${name}.tar.gz"; + url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; diff --git a/nixpkgs/pkgs/applications/audio/ladspa-plugins/default.nix b/nixpkgs/pkgs/applications/audio/ladspa-plugins/default.nix index a60b3db2fb86..44186abc3c46 100644 --- a/nixpkgs/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/ladspa-plugins/default.nix @@ -2,7 +2,7 @@ , perlPackages }: stdenv.mkDerivation rec { - name = "swh-plugins-${version}"; + pname = "swh-plugins"; version = "0.4.17"; diff --git a/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix b/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix index 72bb7010b627..a7779ee8aeea 100644 --- a/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ladspa-sdk-${version}"; + pname = "ladspa-sdk"; version = "1.15"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; diff --git a/nixpkgs/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/nixpkgs/pkgs/applications/audio/ladspa-sdk/ladspah.nix index b57b7283b850..3fad5de1de59 100644 --- a/nixpkgs/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/nixpkgs/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ladspa.h-${version}"; + pname = "ladspa.h"; version = "1.15"; src = fetchurl { url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; diff --git a/nixpkgs/pkgs/applications/audio/lash/default.nix b/nixpkgs/pkgs/applications/audio/lash/default.nix index 7fb5a01e2c80..e96972b0d1b1 100644 --- a/nixpkgs/pkgs/applications/audio/lash/default.nix +++ b/nixpkgs/pkgs/applications/audio/lash/default.nix @@ -4,11 +4,11 @@ assert libuuid != null; stdenv.mkDerivation rec { - name = "lash-${version}"; + pname = "lash"; version = "0.5.4"; src = fetchurl { - url = "mirror://savannah/lash/${name}.tar.gz"; + url = "mirror://savannah/lash/${pname}-${version}.tar.gz"; sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh"; }; diff --git a/nixpkgs/pkgs/applications/audio/linuxband/default.nix b/nixpkgs/pkgs/applications/audio/linuxband/default.nix index a8e33c23dc0d..b5a99150cb22 100644 --- a/nixpkgs/pkgs/applications/audio/linuxband/default.nix +++ b/nixpkgs/pkgs/applications/audio/linuxband/default.nix @@ -4,10 +4,10 @@ let inherit (python2Packages) pyGtkGlade pygtksourceview python; in stdenv.mkDerivation rec { version = "12.02.1"; - name = "linuxband-${version}"; + pname = "linuxband"; src = fetchurl { - url = "http://linuxband.org/assets/sources/${name}.tar.gz"; + url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; diff --git a/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix b/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix index f173e41321f0..26fc2408d8ac 100644 --- a/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix +++ b/nixpkgs/pkgs/applications/audio/linuxsampler/default.nix @@ -2,11 +2,11 @@ , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }: stdenv.mkDerivation rec { - name = "linuxsampler-${version}"; + pname = "linuxsampler"; version = "2.1.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; }; diff --git a/nixpkgs/pkgs/applications/audio/lmms/default.nix b/nixpkgs/pkgs/applications/audio/lmms/default.nix index 59e94e0bdad5..d22065eb9fe0 100644 --- a/nixpkgs/pkgs/applications/audio/lmms/default.nix +++ b/nixpkgs/pkgs/applications/audio/lmms/default.nix @@ -4,7 +4,7 @@ , qtbase, qtx11extras, qttools, SDL ? null }: stdenv.mkDerivation rec { - name = "lmms-${version}"; + pname = "lmms"; version = "1.2.0-rc7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index c80485734cae..3d5c6f699dd2 100644 --- a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -6,12 +6,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; version = "1.1.9"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sadko4u"; repo = "${pname}"; - rev = "${name}"; + rev = "${pname}-${version}"; sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2"; }; diff --git a/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix b/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix index 81db133ff9ab..c986e3af288e 100644 --- a/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix +++ b/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}: stdenv.mkDerivation rec { - name = "ltc-tools-${version}"; + pname = "ltc-tools"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/lv2bm/default.nix b/nixpkgs/pkgs/applications/audio/lv2bm/default.nix index d3821c51fbc6..7288d39ce779 100644 --- a/nixpkgs/pkgs/applications/audio/lv2bm/default.nix +++ b/nixpkgs/pkgs/applications/audio/lv2bm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }: stdenv.mkDerivation rec { - name = "lv2bm-${version}"; + pname = "lv2bm"; version = "git-2015-11-29"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index f355c540f301..6488d1bd65e5 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "CharacterCompressor-${version}"; + pname = "CharacterCompressor"; version = "0.3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 90e4eabeef0b..c5728b6e8b7b 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "CompBus-${version}"; + pname = "CompBus"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 73dd7b48e9c4..331e58c4bd29 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "constant-detune-chorus-${version}"; + pname = "constant-detune-chorus"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 39065db6edeb..046ee70e990c 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "LazyLimiter-${version}"; + pname = "LazyLimiter"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 362451988d38..aa7da17dafd1 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "MBdistortion-${version}"; + pname = "MBdistortion"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 3f809aa78474..ae05866e57d0 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "RhythmDelay-${version}"; + pname = "RhythmDelay"; version = "2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 740763889ffd..718bbdaf49ea 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: stdenv.mkDerivation rec { - name = "VoiceOfFaust-${version}"; + pname = "VoiceOfFaust"; version = "1.1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 6237628e600c..356e95bf97c8 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "pluginUtils-${version}"; + pname = "pluginUtils"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index cb9247fd3d08..292cd3dfd860 100644 --- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "shelfMultiBand-${version}"; + pname = "shelfMultiBand"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix b/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix index 26290e5bf888..901be5a23d08 100644 --- a/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "mda-lv2-${version}"; + pname = "mda-lv2"; version = "1.2.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; diff --git a/nixpkgs/pkgs/applications/audio/meterbridge/default.nix b/nixpkgs/pkgs/applications/audio/meterbridge/default.nix index d16107e4c292..4d2fa0e15b48 100644 --- a/nixpkgs/pkgs/applications/audio/meterbridge/default.nix +++ b/nixpkgs/pkgs/applications/audio/meterbridge/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "0.9.3"; - name = "meterbridge-${version}"; + pname = "meterbridge"; src = fetchurl { - url = "http://plugin.org.uk/meterbridge/${name}.tar.gz"; + url = "http://plugin.org.uk/meterbridge/${pname}-${version}.tar.gz"; sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz"; }; diff --git a/nixpkgs/pkgs/applications/audio/mhwaveedit/default.nix b/nixpkgs/pkgs/applications/audio/mhwaveedit/default.nix index db70e59218b3..e4d6c0293df8 100644 --- a/nixpkgs/pkgs/applications/audio/mhwaveedit/default.nix +++ b/nixpkgs/pkgs/applications/audio/mhwaveedit/default.nix @@ -3,7 +3,7 @@ , vorbis-tools }: stdenv.mkDerivation rec { - name = "mhwaveedit-${version}"; + pname = "mhwaveedit"; version = "1.4.24"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix b/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix index dd8b28fc2d8b..48052fc4ec88 100644 --- a/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix +++ b/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix @@ -5,7 +5,8 @@ let version = "2.6"; in stdenv.mkDerivation { - name = "midisheetmusic-${version}"; + pname = "midisheetmusic"; + inherit version; src = fetchurl { url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/milkytracker/default.nix b/nixpkgs/pkgs/applications/audio/milkytracker/default.nix index 6b3abeb1e23c..7f86e2c20716 100644 --- a/nixpkgs/pkgs/applications/audio/milkytracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/milkytracker/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.02.00"; - name = "milkytracker-${version}"; + pname = "milkytracker"; src = fetchFromGitHub { owner = "milkytracker"; diff --git a/nixpkgs/pkgs/applications/audio/mimic/default.nix b/nixpkgs/pkgs/applications/audio/mimic/default.nix index dcaffe3eb9b4..e91b2c9360de 100644 --- a/nixpkgs/pkgs/applications/audio/mimic/default.nix +++ b/nixpkgs/pkgs/applications/audio/mimic/default.nix @@ -3,7 +3,7 @@ , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { - name = "mimic-${version}"; + pname = "mimic"; version = "1.2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/nixpkgs/pkgs/applications/audio/mixxx/default.nix index bc7c2ff9a24f..5cf9b1b8ab70 100644 --- a/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -7,7 +7,7 @@ }: mkDerivation rec { - name = "mixxx-${version}"; + pname = "mixxx"; version = "2.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/moc/default.nix b/nixpkgs/pkgs/applications/audio/moc/default.nix index 3ed330cc7437..89d062d584e5 100644 --- a/nixpkgs/pkgs/applications/audio/moc/default.nix +++ b/nixpkgs/pkgs/applications/audio/moc/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { - name = "moc-${version}"; + pname = "moc"; version = "2.5.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix b/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix index c66f78373228..3fbe927be4ba 100644 --- a/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix +++ b/nixpkgs/pkgs/applications/audio/mod-distortion/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - name = "mod-distortion-git-${version}"; + pname = "mod-distortion-git"; version = "2016-08-19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index 1b3e89d4885e..58bb4d3e3274 100644 --- a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "3.99-u4-b5"; pname = "monkeys-audio"; - name = pname + "-" + version; patches = [ ./buildfix.diff ]; diff --git a/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix b/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix index eb5aa7c036cc..727133be78df 100644 --- a/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix +++ b/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.2.6"; - name = "mp3blaster-${version}"; + pname = "mp3blaster"; src = fetchFromGitHub { owner = "stragulus"; diff --git a/nixpkgs/pkgs/applications/audio/mp3splt/default.nix b/nixpkgs/pkgs/applications/audio/mp3splt/default.nix index f2922e7eecf9..f067c5af6df3 100644 --- a/nixpkgs/pkgs/applications/audio/mp3splt/default.nix +++ b/nixpkgs/pkgs/applications/audio/mp3splt/default.nix @@ -3,11 +3,10 @@ stdenv.mkDerivation rec { pname = "mp3splt"; version = "2.6.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry"; }; diff --git a/nixpkgs/pkgs/applications/audio/mp3val/default.nix b/nixpkgs/pkgs/applications/audio/mp3val/default.nix index 7477bea7602c..6c35779f6c4c 100644 --- a/nixpkgs/pkgs/applications/audio/mp3val/default.nix +++ b/nixpkgs/pkgs/applications/audio/mp3val/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mp3val-${version}"; + pname = "mp3val"; version = "0.1.8"; src = fetchurl { - url = "mirror://sourceforge/mp3val/${name}-src.tar.gz"; + url = "mirror://sourceforge/mp3val/${pname}-${version}-src.tar.gz"; sha256 = "17y3646ghr38r620vkrxin3dksxqig5yb3nn4cfv6arm7kz6x8cm"; }; diff --git a/nixpkgs/pkgs/applications/audio/mpc/default.nix b/nixpkgs/pkgs/applications/audio/mpc/default.nix index 220e72b568af..b13e1cc037a0 100644 --- a/nixpkgs/pkgs/applications/audio/mpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/mpc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }: stdenv.mkDerivation rec { - name = "mpc-${version}"; + pname = "mpc"; version = "0.28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/mpc123/default.nix b/nixpkgs/pkgs/applications/audio/mpc123/default.nix index efaef97257e0..f024e5a6a1d1 100644 --- a/nixpkgs/pkgs/applications/audio/mpc123/default.nix +++ b/nixpkgs/pkgs/applications/audio/mpc123/default.nix @@ -2,10 +2,11 @@ let version = "0.2.4"; in stdenv.mkDerivation rec { - name = "mpc123-${version}"; + pname = "mpc123"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz"; + url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz"; sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1"; }; diff --git a/nixpkgs/pkgs/applications/audio/mpg321/default.nix b/nixpkgs/pkgs/applications/audio/mpg321/default.nix index 3ffc5265f7a0..65dfe3484b66 100644 --- a/nixpkgs/pkgs/applications/audio/mpg321/default.nix +++ b/nixpkgs/pkgs/applications/audio/mpg321/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "mpg321-${version}"; + pname = "mpg321"; version = "0.3.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/muse/default.nix b/nixpkgs/pkgs/applications/audio/muse/default.nix index b3efa82ead47..8582fd781929 100644 --- a/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -17,7 +17,7 @@ }: stdenv.mkDerivation rec { - name = "muse-sequencer-${version}"; + pname = "muse-sequencer"; version = "3.1pre1"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/audio/musescore/darwin.nix b/nixpkgs/pkgs/applications/audio/musescore/darwin.nix index e14594ae3b2d..6f81ebbb8f1e 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/darwin.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/darwin.nix @@ -8,7 +8,7 @@ in with lib; stdenv.mkDerivation rec { - name = "musescore-darwin-${version}"; + pname = "musescore-darwin"; version = "${concatStringsSep "." versionComponents}"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index a595bb069005..2e69c3cda7a3 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "musescore-${version}"; + pname = "musescore"; version = "3.0.5"; src = fetchzip { diff --git a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index a35d9c670fe8..d89b61aa21f4 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -2,7 +2,7 @@ , mpd_clientlib, gettext, boost }: stdenv.mkDerivation rec { - name = "ncmpc-${version}"; + pname = "ncmpc"; version = "0.34"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix index d35cefb88416..2ba36b4a50d9 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix @@ -11,11 +11,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "ncmpcpp-${version}"; + pname = "ncmpcpp"; version = "0.8.2"; src = fetchurl { - url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; + url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2"; sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; }; diff --git a/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix index 8b715a24e3cb..53ed9b3297c1 100644 --- a/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "ncpamixer-${version}"; + pname = "ncpamixer"; version = "1.3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/non/default.nix b/nixpkgs/pkgs/applications/audio/non/default.nix index 44dd0d2d4ec3..94cf32f8f823 100644 --- a/nixpkgs/pkgs/applications/audio/non/default.nix +++ b/nixpkgs/pkgs/applications/audio/non/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "non-${version}"; + pname = "non"; version = "2018-02-15"; src = fetchFromGitHub { owner = "original-male"; diff --git a/nixpkgs/pkgs/applications/audio/normalize/default.nix b/nixpkgs/pkgs/applications/audio/normalize/default.nix index 85c902d38396..490ecc967bbf 100644 --- a/nixpkgs/pkgs/applications/audio/normalize/default.nix +++ b/nixpkgs/pkgs/applications/audio/normalize/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libmad }: stdenv.mkDerivation rec { - name = "normalize-${version}"; + pname = "normalize"; version = "0.7.7"; src = fetchurl { - url = "mirror://savannah/normalize/${name}.tar.gz"; + url = "mirror://savannah/normalize/${pname}-${version}.tar.gz"; sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; }; diff --git a/nixpkgs/pkgs/applications/audio/nova-filters/default.nix b/nixpkgs/pkgs/applications/audio/nova-filters/default.nix index bb186687c66e..91443bb1ef7f 100644 --- a/nixpkgs/pkgs/applications/audio/nova-filters/default.nix +++ b/nixpkgs/pkgs/applications/audio/nova-filters/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2-2"; - name = "nova-filters-${version}"; + pname = "nova-filters"; src = fetchurl { url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; diff --git a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index f8f08369ab93..8116bcaf0bda 100644 --- a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -4,7 +4,8 @@ let version = "0.4.1"; in stdenv.mkDerivation rec { - name = "openmpt123-${version}"; + pname = "openmpt123"; + inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/pamix/default.nix b/nixpkgs/pkgs/applications/audio/pamix/default.nix index cc4a781ef66c..2507f08e9e59 100644 --- a/nixpkgs/pkgs/applications/audio/pamix/default.nix +++ b/nixpkgs/pkgs/applications/audio/pamix/default.nix @@ -3,7 +3,7 @@ , libpulseaudio, ncurses }: stdenv.mkDerivation rec { - name = "pamix-${version}"; + pname = "pamix"; version = "1.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/patchage/default.nix b/nixpkgs/pkgs/applications/audio/patchage/default.nix index 7f3940e0ae9c..4f76aefb5ed3 100644 --- a/nixpkgs/pkgs/applications/audio/patchage/default.nix +++ b/nixpkgs/pkgs/applications/audio/patchage/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "patchage-${version}"; + pname = "patchage"; version = "1.0.1"; src = fetchsvn { url = http://svn.drobilla.net/lad/trunk/patchage/; diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix index ae43bad5b2c2..6440f6e787ff 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { - name = "cyclone-${version}"; + pname = "cyclone"; version = "0.3beta-2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 0eb75d77c68c..21ba375200bc 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { - name = "maxlib-${version}"; + pname = "maxlib"; version = "1.5.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 972a162b73f4..9e7de39218d5 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, puredata }: stdenv.mkDerivation rec { - name = "mrpeach-${version}"; + pname = "mrpeach"; version = "1.1"; # this was to only usable url I could find: diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 37d692a3ab5a..c214d3fcf405 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation rec { - name = "puremapping-${version}"; + pname = "puremapping"; version = "20160130"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix index f2e54b327fce..fa9660fbbf61 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; - name = "timbreid-${version}"; + pname = "timbreid"; src = fetchurl { url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/zexy/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/zexy/default.nix index d56462ccc844..cc307417c061 100644 --- a/nixpkgs/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, puredata }: stdenv.mkDerivation rec { - name = "zexy-${version}"; + pname = "zexy"; version = "2.2.4"; src = fetchurl { - url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + url = "https://puredata.info/downloads/zexy/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; }; diff --git a/nixpkgs/pkgs/applications/audio/petrifoo/default.nix b/nixpkgs/pkgs/applications/audio/petrifoo/default.nix index d86e5aae2cd4..8bbeffb1f7a3 100644 --- a/nixpkgs/pkgs/applications/audio/petrifoo/default.nix +++ b/nixpkgs/pkgs/applications/audio/petrifoo/default.nix @@ -3,11 +3,11 @@ , pkgconfig, openssl }: stdenv.mkDerivation rec { - name = "petri-foo-${version}"; + pname = "petri-foo"; version = "0.1.87"; src = fetchurl { - url = "mirror://sourceforge/petri-foo/${name}.tar.bz2"; + url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2"; sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; diff --git a/nixpkgs/pkgs/applications/audio/pianobooster/default.nix b/nixpkgs/pkgs/applications/audio/pianobooster/default.nix index 53afcdd2306a..c2c4672be12b 100644 --- a/nixpkgs/pkgs/applications/audio/pianobooster/default.nix +++ b/nixpkgs/pkgs/applications/audio/pianobooster/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: stdenv.mkDerivation rec { - name = "pianobooster-${version}"; + pname = "pianobooster"; version = "0.6.4b"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/pithos/default.nix b/nixpkgs/pkgs/applications/audio/pithos/default.nix index f2c798d1e6e7..5d86e37dec8a 100644 --- a/nixpkgs/pkgs/applications/audio/pithos/default.nix +++ b/nixpkgs/pkgs/applications/audio/pithos/default.nix @@ -1,33 +1,29 @@ -{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobject-introspection, libnotify -, gst_all_1, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, appstream-glib +, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection +, libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { pname = "pithos"; - version = "1.1.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp"; + sha256 = "0vaw0rfcdh4bsp9b8la9bs36kw0iwia54y5x060byxhff9av6nj4"; }; - # No tests in repo - doCheck = false; + format = "other"; postPatch = '' - substituteInPlace setup.py --replace "/usr/share" "$out/share" + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; - postInstall = '' - mkdir -p $out/share/applications - cp -v data/pithos.desktop $out/share/applications - ''; - - buildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify ] ++ + [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/nixpkgs/pkgs/applications/audio/playbar2/default.nix b/nixpkgs/pkgs/applications/audio/playbar2/default.nix index 16d5eb69cb97..8c21dc8f2ad7 100644 --- a/nixpkgs/pkgs/applications/audio/playbar2/default.nix +++ b/nixpkgs/pkgs/applications/audio/playbar2/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "playbar2-${version}"; + pname = "playbar2"; version = "2.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix b/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix index 5529998803cf..346387be7e3c 100644 --- a/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix +++ b/nixpkgs/pkgs/applications/audio/plugin-torture/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: stdenv.mkDerivation rec { - name = "plugin-torture-${version}"; + pname = "plugin-torture"; version = "2016-07-25"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/pmidi/default.nix b/nixpkgs/pkgs/applications/audio/pmidi/default.nix index 9f51d3008259..f9b3fbae2137 100644 --- a/nixpkgs/pkgs/applications/audio/pmidi/default.nix +++ b/nixpkgs/pkgs/applications/audio/pmidi/default.nix @@ -3,7 +3,8 @@ , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" }: stdenv.mkDerivation { - name = "pmidi-${version}"; + pname = "pmidi"; + inherit version; src = fetchurl { url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/ponymix/default.nix b/nixpkgs/pkgs/applications/audio/ponymix/default.nix index 5cfbb7bf5a48..6d168ec56618 100644 --- a/nixpkgs/pkgs/applications/audio/ponymix/default.nix +++ b/nixpkgs/pkgs/applications/audio/ponymix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: stdenv.mkDerivation rec { - name = "ponymix-${version}"; + pname = "ponymix"; version = "5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/praat/default.nix b/nixpkgs/pkgs/applications/audio/praat/default.nix index 5db5035c8352..9414f4211d7a 100644 --- a/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: stdenv.mkDerivation rec { - name = "praat-${version}"; + pname = "praat"; version = "6.0.43"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 9989f75c0bd7..b8082c12c644 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -23,7 +23,7 @@ let ''; in stdenv.mkDerivation rec { - name = "pulseaudio-modules-bt-${version}"; + pname = "pulseaudio-modules-bt"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/puredata/default.nix b/nixpkgs/pkgs/applications/audio/puredata/default.nix index 6ade9042b532..5886a465409a 100644 --- a/nixpkgs/pkgs/applications/audio/puredata/default.nix +++ b/nixpkgs/pkgs/applications/audio/puredata/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "puredata-${version}"; + pname = "puredata"; version = "0.49-0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix index 9b8c8035239d..0b50d3098aa2 100644 --- a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix +++ b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { version = "0.5.9"; - name = "qjackctl-${version}"; + pname = "qjackctl"; # some dependencies such as killall have to be installed additionally src = fetchurl { - url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; + url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk"; }; diff --git a/nixpkgs/pkgs/applications/audio/qmidinet/default.nix b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix index 16e76bb631c9..d627f352e734 100644 --- a/nixpkgs/pkgs/applications/audio/qmidinet/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.5.5"; - name = "qmidinet-${version}"; + pname = "qmidinet"; src = fetchurl { - url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; + url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y"; }; diff --git a/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix b/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix index 7f5191a02c20..2a83d98b6ea3 100644 --- a/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.0"; - name = "qmidiroute-${version}"; + pname = "qmidiroute"; src = fetchurl { - url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz"; sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; diff --git a/nixpkgs/pkgs/applications/audio/qsampler/default.nix b/nixpkgs/pkgs/applications/audio/qsampler/default.nix index 4e6df82a32a9..a878f4edad8f 100644 --- a/nixpkgs/pkgs/applications/audio/qsampler/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsampler/default.nix @@ -2,11 +2,11 @@ , liblscp, libgig, qtbase }: stdenv.mkDerivation rec { - name = "qsampler-${version}"; + pname = "qsampler"; version = "0.5.6"; src = fetchurl { - url = "mirror://sourceforge/qsampler/${name}.tar.gz"; + url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz"; sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs"; }; diff --git a/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 82e003b2bea3..81b7e35b6309 100644 --- a/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }: stdenv.mkDerivation rec { - name = "qsynth-${version}"; + pname = "qsynth"; version = "0.5.7"; src = fetchurl { - url = "mirror://sourceforge/qsynth/${name}.tar.gz"; + url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6"; }; diff --git a/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix b/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix index 453da89953e0..68e8e6402acf 100644 --- a/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "qtscrobbler-${version}"; + pname = "qtscrobbler"; version = "0.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/rakarrack/default.nix b/nixpkgs/pkgs/applications/audio/rakarrack/default.nix index ec71cfb427c6..36302458a75b 100644 --- a/nixpkgs/pkgs/applications/audio/rakarrack/default.nix +++ b/nixpkgs/pkgs/applications/audio/rakarrack/default.nix @@ -2,11 +2,11 @@ libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { - name = "rakarrack-${version}"; + pname = "rakarrack"; version = "0.6.1"; src = fetchurl { - url = "mirror://sourceforge/rakarrack/${name}.tar.bz2"; + url = "mirror://sourceforge/rakarrack/${pname}-${version}.tar.bz2"; sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn"; }; diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index 6530d737c33d..9cff98f61372 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "reaper-${version}"; + pname = "reaper"; version = "5.981"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/redoflacs/default.nix b/nixpkgs/pkgs/applications/audio/redoflacs/default.nix index 1918fa9e3a99..e32fd42af323 100644 --- a/nixpkgs/pkgs/applications/audio/redoflacs/default.nix +++ b/nixpkgs/pkgs/applications/audio/redoflacs/default.nix @@ -2,7 +2,7 @@ , flac, sox }: stdenv.mkDerivation rec { - name = "redoflacs-${version}"; + pname = "redoflacs"; version = "0.30.20150202"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/renoise/default.nix b/nixpkgs/pkgs/applications/audio/renoise/default.nix index ddbefd129ffe..62625aa421d1 100644 --- a/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/nixpkgs/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "renoise-${version}"; + pname = "renoise"; version = "3.1.0"; src = diff --git a/nixpkgs/pkgs/applications/audio/rhvoice/default.nix b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix index 6516532df33f..c34b27edd96d 100644 --- a/nixpkgs/pkgs/applications/audio/rhvoice/default.nix +++ b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix @@ -4,7 +4,8 @@ let version = "unstable-2018-02-10"; in stdenv.mkDerivation rec { - name = "rhvoice-${version}"; + pname = "rhvoice"; + inherit version; src = fetchFromGitHub { owner = "Olga-Yakovleva"; diff --git a/nixpkgs/pkgs/applications/audio/rosegarden/default.nix b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix index 313227f77985..9445bf3723c9 100644 --- a/nixpkgs/pkgs/applications/audio/rosegarden/default.nix +++ b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation (rec { version = "19.06"; - name = "rosegarden-${version}"; + pname = "rosegarden"; src = fetchurl { - url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; + url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; sha256 = "169qb58v2s8va59hzkih8nqb2aipsqlrbfs8q39ywqa8w5d60gcc"; }; diff --git a/nixpkgs/pkgs/applications/audio/rubyripper/default.nix b/nixpkgs/pkgs/applications/audio/rubyripper/default.nix index 9e0a3712c971..82aa86f795bb 100644 --- a/nixpkgs/pkgs/applications/audio/rubyripper/default.nix +++ b/nixpkgs/pkgs/applications/audio/rubyripper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: stdenv.mkDerivation rec { version = "0.6.2"; - name = "rubyripper-${version}"; + pname = "rubyripper"; src = fetchurl { url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2"; sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1"; diff --git a/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/nixpkgs/pkgs/applications/audio/samplv1/default.nix index f9b1fe6afe00..5a62a8a4292d 100644 --- a/nixpkgs/pkgs/applications/audio/samplv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/samplv1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }: stdenv.mkDerivation rec { - name = "samplv1-${version}"; + pname = "samplv1"; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/samplv1/${name}.tar.gz"; + url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; sha256 = "1y61wb0bzm1cz7y8xxv6hp8mrkfb9zm9irg6zs4g6aanw539r6l8"; }; diff --git a/nixpkgs/pkgs/applications/audio/sayonara/default.nix b/nixpkgs/pkgs/applications/audio/sayonara/default.nix index fbe90c5377df..7776fa0c166e 100644 --- a/nixpkgs/pkgs/applications/audio/sayonara/default.nix +++ b/nixpkgs/pkgs/applications/audio/sayonara/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1-git1-20180828"; in stdenv.mkDerivation { - name = "sayonara-player-${version}"; + pname = "sayonara-player"; + inherit version; src = fetchurl { url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index ab1a6e387383..f902b2dd41b0 100644 --- a/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "20120105"; - name = "schismtracker-${version}"; + pname = "schismtracker"; src = fetchurl { - url = "http://schismtracker.org/dl/${name}.tar.bz2"; + url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2"; sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii"; }; diff --git a/nixpkgs/pkgs/applications/audio/seq24/default.nix b/nixpkgs/pkgs/applications/audio/seq24/default.nix index d47ede27ece2..9bab024f021e 100644 --- a/nixpkgs/pkgs/applications/audio/seq24/default.nix +++ b/nixpkgs/pkgs/applications/audio/seq24/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: stdenv.mkDerivation rec { - name = "seq24-${version}"; + pname = "seq24"; version = "0.9.3"; src = fetchurl { - url = "https://launchpad.net/seq24/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/seq24/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3"; }; diff --git a/nixpkgs/pkgs/applications/audio/setbfree/default.nix b/nixpkgs/pkgs/applications/audio/setbfree/default.nix index 1047734a2c18..9502cb7b7e7e 100644 --- a/nixpkgs/pkgs/applications/audio/setbfree/default.nix +++ b/nixpkgs/pkgs/applications/audio/setbfree/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "setbfree-${version}"; + pname = "setbfree"; version = "0.8.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix index a98d1431d65e..5708ef0ce0a6 100644 --- a/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix +++ b/nixpkgs/pkgs/applications/audio/sfxr-qt/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "sfxr-qt-${version}"; + pname = "sfxr-qt"; version = "1.2.0"; src = fetchFromGitHub { owner = "agateau"; diff --git a/nixpkgs/pkgs/applications/audio/shntool/default.nix b/nixpkgs/pkgs/applications/audio/shntool/default.nix index 8645251b384d..dc8d95d2c490 100644 --- a/nixpkgs/pkgs/applications/audio/shntool/default.nix +++ b/nixpkgs/pkgs/applications/audio/shntool/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.0.10"; - name = "shntool-${version}"; + pname = "shntool"; src = fetchurl { url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz; diff --git a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index b857c5b68358..aff8c173d9f2 100644 --- a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.4.4"; - name = "sidplayfp-${version}"; + pname = "sidplayfp"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz"; + url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz"; sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m"; }; diff --git a/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 5730dec6b994..21a36cecbe54 100644 --- a/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { - name = "snapcast-${version}"; + pname = "snapcast"; version = "0.15.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index ee72b6cdb1a4..7934af8aad8e 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "3.1.0"; - name = "sonic-pi-${version}"; + pname = "sonic-pi"; src = fetchFromGitHub { owner = "samaaron"; diff --git a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix index d5f613b45945..501d097f29fa 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "sonic-visualiser-${version}"; + pname = "sonic-visualiser"; version = "2.4.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; + url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz"; sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; }; diff --git a/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix b/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix index bf4d96c6fc4e..8dcca85a25c4 100644 --- a/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix +++ b/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "sooperlooper-git-${version}"; + pname = "sooperlooper-git"; version = "2016-07-19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/sorcer/default.nix b/nixpkgs/pkgs/applications/audio/sorcer/default.nix index cf0b5db81f62..5d8ae0928c90 100644 --- a/nixpkgs/pkgs/applications/audio/sorcer/default.nix +++ b/nixpkgs/pkgs/applications/audio/sorcer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: stdenv.mkDerivation rec { - name = "sorcer-${version}"; + pname = "sorcer"; version = "1.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix b/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix index babe4edff9df..01f0708d1157 100644 --- a/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { - name = "soundscape-renderer-unstable-${version}"; + pname = "soundscape-renderer-unstable"; version = "2016-11-03"; diff --git a/nixpkgs/pkgs/applications/audio/spectmorph/default.nix b/nixpkgs/pkgs/applications/audio/spectmorph/default.nix index 64deede535b2..7544a3520c76 100644 --- a/nixpkgs/pkgs/applications/audio/spectmorph/default.nix +++ b/nixpkgs/pkgs/applications/audio/spectmorph/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: stdenv.mkDerivation rec { - name = "spectmorph-${version}"; + pname = "spectmorph"; version = "0.5.0"; src = fetchurl { - url = "http://spectmorph.org/files/releases/${name}.tar.bz2"; + url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn"; }; diff --git a/nixpkgs/pkgs/applications/audio/spectrojack/default.nix b/nixpkgs/pkgs/applications/audio/spectrojack/default.nix index 6614e3702247..4c1682b1e0b8 100644 --- a/nixpkgs/pkgs/applications/audio/spectrojack/default.nix +++ b/nixpkgs/pkgs/applications/audio/spectrojack/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: stdenv.mkDerivation rec { - name = "spectrojack-${version}"; + pname = "spectrojack"; version = "0.4.1"; src = fetchurl { - url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; + url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz"; sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/spek/default.nix b/nixpkgs/pkgs/applications/audio/spek/default.nix index 8af7888f74bb..f4922e388c46 100644 --- a/nixpkgs/pkgs/applications/audio/spek/default.nix +++ b/nixpkgs/pkgs/applications/audio/spek/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }: stdenv.mkDerivation rec { - name = "spek-${version}"; + pname = "spek"; version = "0.8.3"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz"; sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; }; diff --git a/nixpkgs/pkgs/applications/audio/split2flac/default.nix b/nixpkgs/pkgs/applications/audio/split2flac/default.nix index 372e507ed0e9..3c9565df9199 100644 --- a/nixpkgs/pkgs/applications/audio/split2flac/default.nix +++ b/nixpkgs/pkgs/applications/audio/split2flac/default.nix @@ -18,7 +18,7 @@ let ''; in stdenv.mkDerivation rec { - name = "split2flac-${version}"; + pname = "split2flac"; version = "122"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/spotify/default.nix b/nixpkgs/pkgs/applications/audio/spotify/default.nix index 77aa79949943..403075f91352 100644 --- a/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -60,7 +60,8 @@ let in stdenv.mkDerivation { - name = "spotify-${version}"; + pname = "spotify"; + inherit version; # fetch from snapcraft instead of the debian repository most repos fetch from. # That is a bit more cumbersome. But the debian repository only keeps the last diff --git a/nixpkgs/pkgs/applications/audio/spotifywm/default.nix b/nixpkgs/pkgs/applications/audio/spotifywm/default.nix index 64ae9491535a..3447049099b1 100644 --- a/nixpkgs/pkgs/applications/audio/spotifywm/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotifywm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: stdenv.mkDerivation rec { - name = "spotifywm-unstable-${version}"; + pname = "spotifywm-unstable"; version = "2016-11-28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/ssrc/default.nix b/nixpkgs/pkgs/applications/audio/ssrc/default.nix index 19386b477942..9eb71835caa9 100644 --- a/nixpkgs/pkgs/applications/audio/ssrc/default.nix +++ b/nixpkgs/pkgs/applications/audio/ssrc/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "ssrc"; - name = "${pname}-${version}"; version = "1.33"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/streamripper/default.nix b/nixpkgs/pkgs/applications/audio/streamripper/default.nix index 39d1c266a373..efa87a2f72cc 100644 --- a/nixpkgs/pkgs/applications/audio/streamripper/default.nix +++ b/nixpkgs/pkgs/applications/audio/streamripper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { - name = "streamripper-${version}"; + pname = "streamripper"; version = "1.64.6"; src = fetchurl { - url = "mirror://sourceforge/streamripper/${name}.tar.gz"; + url = "mirror://sourceforge/streamripper/${pname}-${version}.tar.gz"; sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"; }; diff --git a/nixpkgs/pkgs/applications/audio/sunvox/default.nix b/nixpkgs/pkgs/applications/audio/sunvox/default.nix index 957ee50ca7ad..1a3d1a96c85d 100644 --- a/nixpkgs/pkgs/applications/audio/sunvox/default.nix +++ b/nixpkgs/pkgs/applications/audio/sunvox/default.nix @@ -12,7 +12,7 @@ let else "x86"; in stdenv.mkDerivation rec { - name = "SunVox-${version}"; + pname = "SunVox"; version = "1.9.4c"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/svox/default.nix b/nixpkgs/pkgs/applications/audio/svox/default.nix index 5e26b6c1cdb8..d25e61c37f5d 100644 --- a/nixpkgs/pkgs/applications/audio/svox/default.nix +++ b/nixpkgs/pkgs/applications/audio/svox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "svox-${version}"; + pname = "svox"; version = "2017-07-18"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix b/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix index 6fa0eb7f8f2b..b59752d7cc3e 100644 --- a/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/swh-lv2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }: stdenv.mkDerivation rec { - name = "swh-lv2-${version}"; + pname = "swh-lv2"; version = "1.0.16"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix index d28329b01171..1c373aefb4f6 100644 --- a/nixpkgs/pkgs/applications/audio/synthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }: stdenv.mkDerivation rec { - name = "synthv1-${version}"; + pname = "synthv1"; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/synthv1/${name}.tar.gz"; + url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; sha256 = "0cvamqzg74qfr7kzk3skimskmv0j3d1rmmpbpsmfcrg8srvyx9r2"; }; diff --git a/nixpkgs/pkgs/applications/audio/tambura/default.nix b/nixpkgs/pkgs/applications/audio/tambura/default.nix index a739d72898e2..2438cf68536d 100644 --- a/nixpkgs/pkgs/applications/audio/tambura/default.nix +++ b/nixpkgs/pkgs/applications/audio/tambura/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "Tambura"; - name = "${pname}-${version}"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/tetraproc/default.nix b/nixpkgs/pkgs/applications/audio/tetraproc/default.nix index 257963de256f..40362fdd4968 100644 --- a/nixpkgs/pkgs/applications/audio/tetraproc/default.nix +++ b/nixpkgs/pkgs/applications/audio/tetraproc/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "tetraproc-${version}"; + pname = "tetraproc"; version = "0.8.6"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7"; }; diff --git a/nixpkgs/pkgs/applications/audio/tomahawk/default.nix b/nixpkgs/pkgs/applications/audio/tomahawk/default.nix index 78bd43383539..c983123ca383 100644 --- a/nixpkgs/pkgs/applications/audio/tomahawk/default.nix +++ b/nixpkgs/pkgs/applications/audio/tomahawk/default.nix @@ -12,11 +12,11 @@ assert enableKDE -> kdelibs4 != null; assert enableTelepathy -> telepathy-qt != null; stdenv.mkDerivation rec { - name = "tomahawk-${version}"; + pname = "tomahawk"; version = "0.8.4"; src = fetchurl { - url = "http://download.tomahawk-player.org/${name}.tar.bz2"; + url = "http://download.tomahawk-player.org/${pname}-${version}.tar.bz2"; sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g"; }; diff --git a/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/nixpkgs/pkgs/applications/audio/transcribe/default.nix index 740790419482..8eb846ac9c56 100644 --- a/nixpkgs/pkgs/applications/audio/transcribe/default.nix +++ b/nixpkgs/pkgs/applications/audio/transcribe/default.nix @@ -2,7 +2,7 @@ , glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: stdenv.mkDerivation rec { - name = "transcribe-${version}"; + pname = "transcribe"; version = "8.72"; src = if stdenv.hostPlatform.system == "i686-linux" then diff --git a/nixpkgs/pkgs/applications/audio/traverso/default.nix b/nixpkgs/pkgs/applications/audio/traverso/default.nix index 0c432acf4afe..0f70f9567131 100644 --- a/nixpkgs/pkgs/applications/audio/traverso/default.nix +++ b/nixpkgs/pkgs/applications/audio/traverso/default.nix @@ -3,7 +3,7 @@ , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: stdenv.mkDerivation rec { - name = "traverso-${version}"; + pname = "traverso"; version = "0.49.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/tree-from-tags/default.nix b/nixpkgs/pkgs/applications/audio/tree-from-tags/default.nix index cdee979768cf..521133cb08fc 100644 --- a/nixpkgs/pkgs/applications/audio/tree-from-tags/default.nix +++ b/nixpkgs/pkgs/applications/audio/tree-from-tags/default.nix @@ -7,7 +7,8 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - name = "tree-from-tags-${version}"; + pname = "tree-from-tags"; + inherit version; src = fetchFromGitHub { owner = "dbrock"; repo = "bongo"; diff --git a/nixpkgs/pkgs/applications/audio/uade123/default.nix b/nixpkgs/pkgs/applications/audio/uade123/default.nix index 7db3b7ec2376..b5ff8e41fe0b 100644 --- a/nixpkgs/pkgs/applications/audio/uade123/default.nix +++ b/nixpkgs/pkgs/applications/audio/uade123/default.nix @@ -3,7 +3,8 @@ let version = "2.13"; in stdenv.mkDerivation rec { - name = "uade123-${version}"; + pname = "uade123"; + inherit version; src = fetchurl { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; diff --git a/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix b/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix index 9a27ed302e6c..234b98a893c8 100644 --- a/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix +++ b/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix @@ -27,7 +27,7 @@ let }; in with stdenv.lib; stdenv.mkDerivation rec { - name = "VCV-Rack-${version}"; + pname = "VCV-Rack"; version = "1.1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/vimpc/default.nix b/nixpkgs/pkgs/applications/audio/vimpc/default.nix index ce561b5db314..7f02ea9cefec 100644 --- a/nixpkgs/pkgs/applications/audio/vimpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/vimpc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.09.2"; - name = "vimpc-${version}"; + pname = "vimpc"; src = fetchFromGitHub { owner = "boysetsfrog"; diff --git a/nixpkgs/pkgs/applications/audio/vkeybd/default.nix b/nixpkgs/pkgs/applications/audio/vkeybd/default.nix index b7b0fba2d548..485edaa1ff27 100644 --- a/nixpkgs/pkgs/applications/audio/vkeybd/default.nix +++ b/nixpkgs/pkgs/applications/audio/vkeybd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }: stdenv.mkDerivation rec { - name = "vkeybd-${version}"; + pname = "vkeybd"; version = "0.1.18d"; src = fetchurl { - url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${name}.tar.bz2"; + url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${pname}-${version}.tar.bz2"; sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a"; }; diff --git a/nixpkgs/pkgs/applications/audio/vmpk/default.nix b/nixpkgs/pkgs/applications/audio/vmpk/default.nix index dde96764fe6c..2bc40a78af48 100644 --- a/nixpkgs/pkgs/applications/audio/vmpk/default.nix +++ b/nixpkgs/pkgs/applications/audio/vmpk/default.nix @@ -5,7 +5,8 @@ let version = "0.5.1"; in stdenv.mkDerivation rec { - name = "vmpk-${version}"; + pname = "vmpk"; + inherit version; meta = with stdenv.lib; { description = "Virtual MIDI Piano Keyboard"; @@ -15,7 +16,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2"; sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc"; }; diff --git a/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix b/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix index 735e4eb632c2..13bf1d674c7c 100644 --- a/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/wolf-shaper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }: stdenv.mkDerivation rec { - name = "wolf-shaper-${version}"; + pname = "wolf-shaper"; version = "0.1.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix index ece2f5677912..22594d3ec85d 100644 --- a/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "20190714"; - name = "x42-plugins-${version}"; + pname = "x42-plugins"; src = fetchurl { - url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; + url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4"; }; diff --git a/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix b/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix index a55b47a6c16b..c0803ffa4185 100644 --- a/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix @@ -2,11 +2,11 @@ ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { - name = "xsynth-dssi-${version}"; + pname = "xsynth-dssi"; version = "0.9.4"; src = fetchurl { - url = "mirror://sourceforge/dssi/${name}.tar.gz"; + url = "mirror://sourceforge/dssi/${pname}-${version}.tar.gz"; sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; diff --git a/nixpkgs/pkgs/applications/audio/yasr/default.nix b/nixpkgs/pkgs/applications/audio/yasr/default.nix index ca6d6240688a..c8902f1dda4b 100644 --- a/nixpkgs/pkgs/applications/audio/yasr/default.nix +++ b/nixpkgs/pkgs/applications/audio/yasr/default.nix @@ -1,12 +1,12 @@ {stdenv,fetchurl}: stdenv.mkDerivation rec { - name = "yasr-${version}"; + pname = "yasr"; version = "0.6.9"; src = fetchurl { - url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz"; + url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${pname}-${version}.tar.gz"; sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1"; }; diff --git a/nixpkgs/pkgs/applications/audio/ympd/default.nix b/nixpkgs/pkgs/applications/audio/ympd/default.nix index b800df016c9a..7976f7477171 100644 --- a/nixpkgs/pkgs/applications/audio/ympd/default.nix +++ b/nixpkgs/pkgs/applications/audio/ympd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }: stdenv.mkDerivation rec { - name = "ympd-${version}"; + pname = "ympd"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix index 00a22ac711e7..0936fe5a8ed7 100644 --- a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix +++ b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix @@ -5,11 +5,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "yoshimi-${version}"; + pname = "yoshimi"; version = "1.5.11.3"; src = fetchurl { - url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; + url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2"; sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154"; }; diff --git a/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix index 69906b814382..cc04632cfb5c 100644 --- a/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { - name = "zam-plugins-${version}"; + pname = "zam-plugins"; version = "3.11"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix b/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix index faa90e684aea..1ec6946cf38c 100644 --- a/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix +++ b/nixpkgs/pkgs/applications/audio/zita-njbridge/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.4"; - name = "zita-njbridge-${version}"; + pname = "zita-njbridge"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j"; }; diff --git a/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix b/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix index 7bc1c07befa1..e22bf9ed653a 100644 --- a/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "zynaddsubfx-${version}"; + pname = "zynaddsubfx"; version = "3.0.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch deleted file mode 100644 index 7fa68ba4a388..000000000000 --- a/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./scripts/CrashPlanDesktop 2016-03-02 21:01:58.000000000 -0500 -+++ ./scripts/CrashPlanDesktop-1 2016-03-18 20:52:10.117686266 -0400 -@@ -11,7 +11,7 @@ - cd ${TARGETDIR} - - if [ "_${VERSION_5_UI}" == "_true" ]; then -- ${TARGETDIR}/electron/crashplan > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log & -+ ${TARGETDIR}/electron/crashplan & - else -- ${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log & -+ ${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop & - fi diff --git a/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanEngine.patch b/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanEngine.patch deleted file mode 100644 index de2afe2da684..000000000000 --- a/nixpkgs/pkgs/applications/backup/crashplan/CrashPlanEngine.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ./scripts/CrashPlanEngine 2014-02-19 23:17:19.000000000 +0000 -+++ ./scripts/CrashPlanEngine.1 2014-07-24 17:36:37.330333581 +0100 -@@ -11,7 +11,7 @@ - - cd $TARGETDIR - -- nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log & -+ nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log & - - if [[ $! -gt 0 ]]; then - echo $! > $PIDFILE -@@ -26,7 +26,7 @@ - - echo "Using Ubuntu 9.04 startup" - -- start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log -+ start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log - - # This test isn't as useful as one might like; start-stop-daemon can't accurately report the state of child processes when --background is used. - # We use this mainly to report the specific error value returned by start-stop-daemon if something goes wrong, but be aware that a return value -@@ -91,7 +91,6 @@ - DESC="CrashPlan Engine" - NAME=CrashPlanEngine - DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar --PIDFILE="$TARGETDIR/${NAME}.pid" - - if [[ -f $TARGETDIR/install.vars ]]; then - . $TARGETDIR/install.vars -@@ -100,6 +99,8 @@ - exit 1 - fi - -+PIDFILE="$VARDIR/${NAME}.pid" -+ - if [[ ! -f $DAEMON ]]; then - echo "Could not find JAR file $DAEMON" - exit 0 diff --git a/nixpkgs/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/nixpkgs/pkgs/applications/backup/crashplan/crashplan-small-business.nix deleted file mode 100644 index 5db4badeb6c0..000000000000 --- a/nixpkgs/pkgs/applications/backup/crashplan/crashplan-small-business.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, - procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype, - fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev, - libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, - libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages, - maxRam ? "1024m" }: - -stdenv.mkDerivation rec { - version = "6.7.0"; - rev = "1512021600670_4503"; - pname = "CrashPlanSmb"; - name = "${pname}_${version}_${rev}"; - - src = fetchurl { - url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; - sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; - }; - - nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ]; - buildInputs = [ getopt which ]; - - vardir = "/var/lib/crashplan"; - manifestdir = "${vardir}/manifest"; - - postPatch = '' - # patch scripts/CrashPlanEngine - substituteInPlace scripts/CrashPlanEngine \ - --replace /bin/ps ${procps}/bin/ps \ - --replace awk ${gawk}/bin/awk \ - --replace '`sed' '`${gnused}/bin/sed' \ - --replace grep ${gnugrep}/bin/grep \ - --replace TARGETDIR/log VARDIR/log \ - --replace TARGETDIR/\''${NAME} VARDIR/\''${NAME} \ - --replace \$TARGETDIR/bin/run.conf $out/bin/run.conf \ - --replace \$VARDIR ${vardir} - - # patch scripts/CrashPlanDesktop - substituteInPlace scripts/CrashPlanDesktop \ - --replace awk ${gawk}/bin/awk \ - --replace "\"\$SCRIPTDIR/..\"" "$out" \ - --replace "\$(dirname \$SCRIPT)" "$out" \ - --replace "\''${TARGETDIR}/log" ${vardir}/log \ - --replace "\''${TARGETDIR}" "$out" - ''; - - installPhase = '' - mkdir $out - zcat -v ${pname}_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner) - - install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop - install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine - install -D -m 644 scripts/run.conf $out/bin/run.conf - install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop - - # unpack, patch and repack app.asar to stop electron from creating /usr/local/crashplan/log to store the ui logs. - asar e $out/app.asar $out/app.asar-unpacked - rm -v $out/app.asar - substituteInPlace $out/app.asar-unpacked/shared_modules/shell/platform_paths.js \ - --replace "getLogFileParentPath();" "\"$vardir/log\";" - asar p $out/app.asar-unpacked $out/app.asar - - mv -v $out/*.asar $out/electron/resources - chmod 755 "$out/electron/crashplan" - - rm -r $out/log - mv -v $out/conf $out/conf.template - ln -s $vardir/log $out/log - ln -s $vardir/cache $out/cache - ln -s $vardir/conf $out/conf - - substituteInPlace $out/bin/run.conf \ - --replace "-Xmx1024m" "-Xmx${maxRam}" - - echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars - echo "APP_BASENAME=CrashPlan" >> $out/install.vars - echo "TARGETDIR=$out" >> $out/install.vars - echo "BINSDIR=$out/bin" >> $out/install.vars - echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars - echo "VARDIR=${vardir}" >> $out/install.vars - echo "INITDIR=" >> $out/install.vars - echo "RUNLVLDIR=" >> $out/install.vars - echo "INSTALLDATE=" >> $out/install.vars - - ''; - - postFixup = '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan - wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ - stdenv.cc.cc.lib gtk2 atk glib pango gdk-pixbuf cairo freetype - fontconfig dbus gconf nss nspr alsaLib cups expat udev - libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite - libXext libXfixes libXrender libXtst libXScrnSaver]}" - ''; - - meta = with stdenv.lib; { - description = "An online backup solution"; - homepage = http://www.crashplan.com/business/; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ xvapx ]; - broken = true; # 2018-12-06 - }; -} diff --git a/nixpkgs/pkgs/applications/backup/crashplan/default.nix b/nixpkgs/pkgs/applications/backup/crashplan/default.nix deleted file mode 100644 index 2c76891b3f9e..000000000000 --- a/nixpkgs/pkgs/applications/backup/crashplan/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }: - -stdenv.mkDerivation rec { - version = "4.8.3"; - rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time - name = "crashplan-${version}-r${rev}"; - - src = fetchurl { - url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113"; - }; - - meta = with stdenv.lib; { - description = "An online/offline backup solution"; - homepage = http://www.crashplan.org; - license = licenses.unfree; - maintainers = with maintainers; [ sztupi domenkozar jerith666 ]; - }; - - buildInputs = [ makeWrapper cpio ]; - - vardir = "/var/lib/crashplan"; - - manifestdir = "${vardir}/manifest"; - - patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ]; - - installPhase = '' - mkdir $out - zcat -v CrashPlan_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner) - - # sed -i "s|<manifestPath>manifest</manifestPath>|<manifestPath>${manifestdir}</manifestPath>|g" $out/conf/default.service.xml - - # Fix for encoding troubles (CrashPlan ticket 178827) - # Make sure the daemon is running using the same localization as - # the (installing) user - echo "" >> run.conf - echo "LC_ALL=en_US.UTF-8" >> run.conf - - install -d -m 755 unpacked $out - - install -D -m 644 run.conf $out/bin/run.conf - install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop - install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine - install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop - - rm -r $out/log - mv -v $out/conf $out/conf.template - ln -s $vardir/log $out/log - ln -s $vardir/cache $out/cache - ln -s $vardir/backupArchives $out/backupArchives - ln -s $vardir/conf $out/conf - - echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars - echo "APP_BASENAME=CrashPlan" >> $out/install.vars - echo "TARGETDIR=${vardir}" >> $out/install.vars - echo "BINSDIR=$out/bin" >> $out/install.vars - echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars - echo "VARDIR=${vardir}" >> $out/install.vars - echo "INITDIR=" >> $out/install.vars - echo "RUNLVLDIR=" >> $out/install.vars - echo "INSTALLDATE=" >> $out/install.vars - ''; - - postFixup = '' - for f in $out/bin/CrashPlanDesktop $out/bin/CrashPlanEngine; do - echo "substitutions in $f" - substituteInPlace $f --replace /bin/ps ${procps}/bin/ps - substituteInPlace $f --replace awk ${gawk}/bin/awk - substituteInPlace $f --replace sed ${gnused}/bin/sed - substituteInPlace $f --replace grep ${gnugrep}/bin/grep - done - - substituteInPlace $out/share/applications/CrashPlan.desktop \ - --replace /usr/local $out \ - --replace crashplan/skin skin \ - --replace bin/CrashPlanDesktop CrashPlanDesktop - - wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk2 glib libXtst ]}" - ''; -} diff --git a/nixpkgs/pkgs/applications/backup/vdmfec/default.nix b/nixpkgs/pkgs/applications/backup/vdmfec/default.nix index 3a480f70d4b7..1366bb484a91 100644 --- a/nixpkgs/pkgs/applications/backup/vdmfec/default.nix +++ b/nixpkgs/pkgs/applications/backup/vdmfec/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "vdmfec-${version}"; + pname = "vdmfec"; version = "1.0"; src = fetchurl { - url = "http://members.tripod.com/professor_tom/archives/${name}.tgz"; + url = "http://members.tripod.com/professor_tom/archives/${pname}-${version}.tgz"; sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm"; }; diff --git a/nixpkgs/pkgs/applications/altcoins/aeon/default.nix b/nixpkgs/pkgs/applications/blockchains/aeon/default.nix index 5a09641c70d1..d65889be3ac0 100644 --- a/nixpkgs/pkgs/applications/altcoins/aeon/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/aeon/default.nix @@ -7,7 +7,8 @@ let version = "0.12.9.0"; in stdenv.mkDerivation { - name = "aeon-${version}"; + pname = "aeon"; + inherit version; src = fetchFromGitHub { owner = "aeonix"; diff --git a/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix index 479d175020b7..479d175020b7 100644 --- a/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix diff --git a/nixpkgs/pkgs/applications/altcoins/bitcoin-classic.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix index ddce5c3f7150..ddce5c3f7150 100644 --- a/nixpkgs/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix diff --git a/nixpkgs/pkgs/applications/altcoins/bitcoin-unlimited.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix index a75b20b39109..a75b20b39109 100644 --- a/nixpkgs/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix diff --git a/nixpkgs/pkgs/applications/altcoins/bitcoin.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin.nix index b1d84f91251e..b1d84f91251e 100644 --- a/nixpkgs/pkgs/applications/altcoins/bitcoin.nix +++ b/nixpkgs/pkgs/applications/blockchains/bitcoin.nix diff --git a/nixpkgs/pkgs/applications/altcoins/btc1.nix b/nixpkgs/pkgs/applications/blockchains/btc1.nix index 3241148aee12..3241148aee12 100644 --- a/nixpkgs/pkgs/applications/altcoins/btc1.nix +++ b/nixpkgs/pkgs/applications/blockchains/btc1.nix diff --git a/nixpkgs/pkgs/applications/altcoins/clightning.nix b/nixpkgs/pkgs/applications/blockchains/clightning.nix index 481e19c66cdc..b20a6b3e8aa8 100644 --- a/nixpkgs/pkgs/applications/altcoins/clightning.nix +++ b/nixpkgs/pkgs/applications/blockchains/clightning.nix @@ -3,18 +3,20 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "clightning-${version}"; - version = "0.7.1"; + pname = "clightning"; + version = "0.7.2.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "557be34410f27a8d55d9f31a40717a8f5e99829f2bd114c24e7ca1dd5f6b7d85"; + sha256 = "3be716948efc1208b5e6a41e3034e4e4eecc5abbdac769fd1d999a104ac3a2ec"; }; enableParallelBuilding = true; nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip ]; - buildInputs = [ sqlite gmp zlib python3 ]; + buildInputs = + let py3 = python3.withPackages (p: [ p.Mako ]); + in [ sqlite gmp zlib py3 ]; makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; @@ -23,7 +25,10 @@ stdenv.mkDerivation rec { ''; postPatch = '' - patchShebangs tools/generate-wire.py + patchShebangs \ + tools/generate-wire.py \ + tools/update-mocks.sh \ + tools/mockup.sh ''; doCheck = false; diff --git a/nixpkgs/pkgs/applications/altcoins/cryptop/default.nix b/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix index 01c47b320de5..01c47b320de5 100644 --- a/nixpkgs/pkgs/applications/altcoins/cryptop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/cryptop/default.nix diff --git a/nixpkgs/pkgs/applications/altcoins/dashpay.nix b/nixpkgs/pkgs/applications/blockchains/dashpay.nix index b2f2a457a99d..03dcd6cb54e6 100644 --- a/nixpkgs/pkgs/applications/altcoins/dashpay.nix +++ b/nixpkgs/pkgs/applications/blockchains/dashpay.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dashpay-${version}"; + pname = "dashpay"; version = "0.12.2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/altcoins/dcrd.nix b/nixpkgs/pkgs/applications/blockchains/dcrd.nix index cc3e83befa64..16d39e85da15 100644 --- a/nixpkgs/pkgs/applications/altcoins/dcrd.nix +++ b/nixpkgs/pkgs/applications/blockchains/dcrd.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: buildGoPackage rec { - name = "dcrd-${version}"; + pname = "dcrd"; version = "1.1.2"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/decred/dcrd"; diff --git a/nixpkgs/pkgs/applications/altcoins/dcrwallet.nix b/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix index 8d966684b23c..163ed2615d33 100644 --- a/nixpkgs/pkgs/applications/altcoins/dcrwallet.nix +++ b/nixpkgs/pkgs/applications/blockchains/dcrwallet.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: buildGoPackage rec { - name = "dcrwallet-${version}"; + pname = "dcrwallet"; version = "1.1.2"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/decred/dcrwallet"; diff --git a/nixpkgs/pkgs/applications/altcoins/dero.nix b/nixpkgs/pkgs/applications/blockchains/dero.nix index 8405ea8f842b..0ab63bb53951 100644 --- a/nixpkgs/pkgs/applications/altcoins/dero.nix +++ b/nixpkgs/pkgs/applications/blockchains/dero.nix @@ -2,7 +2,7 @@ , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { - name = "dero-${version}"; + pname = "dero"; version = "0.11.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/altcoins/dogecoin.nix b/nixpkgs/pkgs/applications/blockchains/dogecoin.nix index e5f149a0efe7..e5f149a0efe7 100644 --- a/nixpkgs/pkgs/applications/altcoins/dogecoin.nix +++ b/nixpkgs/pkgs/applications/blockchains/dogecoin.nix diff --git a/nixpkgs/pkgs/applications/altcoins/ethabi.nix b/nixpkgs/pkgs/applications/blockchains/ethabi.nix index 21d69f14d7f3..21d69f14d7f3 100644 --- a/nixpkgs/pkgs/applications/altcoins/ethabi.nix +++ b/nixpkgs/pkgs/applications/blockchains/ethabi.nix diff --git a/nixpkgs/pkgs/applications/altcoins/exodus/default.nix b/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index bc354a5213ea..bc354a5213ea 100644 --- a/nixpkgs/pkgs/applications/altcoins/exodus/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/exodus/default.nix diff --git a/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/nixpkgs/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch index c49bbc432519..c49bbc432519 100644 --- a/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch +++ b/nixpkgs/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch diff --git a/nixpkgs/pkgs/applications/altcoins/freicoin.nix b/nixpkgs/pkgs/applications/blockchains/freicoin.nix index 664159be2013..6cf84f76f919 100644 --- a/nixpkgs/pkgs/applications/altcoins/freicoin.nix +++ b/nixpkgs/pkgs/applications/blockchains/freicoin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.6-2"; - name = "freicoin-${version}"; + pname = "freicoin"; src = fetchFromGitHub { owner = "freicoin"; diff --git a/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/default.nix index 7461e4c376ab..ed8086f742f9 100644 --- a/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-ethereum-classic-${version}"; + pname = "go-ethereum-classic"; version = "4.0.0"; goPackagePath = "github.com/ethereumproject/go-ethereum"; diff --git a/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/deps.nix index 0aa6755ee960..0aa6755ee960 100644 --- a/nixpkgs/pkgs/applications/altcoins/go-ethereum-classic/deps.nix +++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum-classic/deps.nix diff --git a/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 740ecfa228fd..740ecfa228fd 100644 --- a/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix +++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix diff --git a/nixpkgs/pkgs/applications/altcoins/jormungandr/default.nix b/nixpkgs/pkgs/applications/blockchains/jormungandr/default.nix index 8c276d6bb805..8c276d6bb805 100644 --- a/nixpkgs/pkgs/applications/altcoins/jormungandr/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/jormungandr/default.nix diff --git a/nixpkgs/pkgs/applications/altcoins/ledger-live-desktop/default.nix b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 0417d2913de5..0417d2913de5 100644 --- a/nixpkgs/pkgs/applications/altcoins/ledger-live-desktop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix diff --git a/nixpkgs/pkgs/applications/altcoins/litecoin.nix b/nixpkgs/pkgs/applications/blockchains/litecoin.nix index 33ac2be18322..33ac2be18322 100644 --- a/nixpkgs/pkgs/applications/altcoins/litecoin.nix +++ b/nixpkgs/pkgs/applications/blockchains/litecoin.nix diff --git a/nixpkgs/pkgs/applications/altcoins/lnd.nix b/nixpkgs/pkgs/applications/blockchains/lnd.nix index 27f10c963c0f..27f10c963c0f 100644 --- a/nixpkgs/pkgs/applications/altcoins/lnd.nix +++ b/nixpkgs/pkgs/applications/blockchains/lnd.nix diff --git a/nixpkgs/pkgs/applications/altcoins/masari.nix b/nixpkgs/pkgs/applications/blockchains/masari.nix index 02a6d25df516..dfa005abb6ec 100644 --- a/nixpkgs/pkgs/applications/altcoins/masari.nix +++ b/nixpkgs/pkgs/applications/blockchains/masari.nix @@ -2,7 +2,7 @@ , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { - name = "masari-${version}"; + pname = "masari"; version = "0.1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/altcoins/mist.nix b/nixpkgs/pkgs/applications/blockchains/mist.nix index 2990b44c7f4c..2990b44c7f4c 100644 --- a/nixpkgs/pkgs/applications/altcoins/mist.nix +++ b/nixpkgs/pkgs/applications/blockchains/mist.nix diff --git a/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index aaff39f1c6be..92f6f0080219 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub -, wrapQtAppsHook, makeDesktopItem +{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative , qtlocation, qtquickcontrols, qtquickcontrols2 @@ -9,22 +8,10 @@ , hidapi }: -with stdenv.lib; +with lib; -let - qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; - - qml2ImportPath = concatMapStringsSep ":" qmlPath [ - qtbase.bin qtmultimedia.bin qtgraphicaleffects - qtdeclarative.bin qtlocation.bin - qtquickcontrols qtquickcontrols2.bin - qtwebchannel.bin qtwebengine.bin qtxmlpatterns - ]; - -in - -stdenv.mkDerivation rec { - name = "monero-gui-${version}"; +mkDerivation rec { + pname = "monero-gui"; version = "0.14.1.2"; src = fetchFromGitHub { @@ -34,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects @@ -46,9 +33,7 @@ stdenv.mkDerivation rec { cppzmq hidapi ]; - patches = [ - ./move-log-file.patch - ]; + patches = [ ./move-log-file.patch ]; postPatch = '' echo ' diff --git a/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch index e540f1960d6c..e540f1960d6c 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/nixpkgs/pkgs/applications/blockchains/monero-gui/move-log-file.patch diff --git a/nixpkgs/pkgs/applications/altcoins/monero/default.nix b/nixpkgs/pkgs/applications/blockchains/monero/default.nix index f351c9fa5043..b6f074528616 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -11,7 +11,7 @@ assert stdenv.isDarwin -> IOKit != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "monero-${version}"; + pname = "monero"; version = "0.14.1.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/altcoins/namecoin.nix b/nixpkgs/pkgs/applications/blockchains/namecoin.nix index 4b8dc5525dc4..4b8dc5525dc4 100644 --- a/nixpkgs/pkgs/applications/altcoins/namecoin.nix +++ b/nixpkgs/pkgs/applications/blockchains/namecoin.nix diff --git a/nixpkgs/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch index 5bbec1d39bea..5bbec1d39bea 100644 --- a/nixpkgs/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch +++ b/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch diff --git a/nixpkgs/pkgs/applications/altcoins/nano-wallet/default.nix b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix index 58ab367c020f..a8d29ae149d9 100644 --- a/nixpkgs/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "nano-wallet-${version}"; + pname = "nano-wallet"; version = "18.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/altcoins/parity-ui/default.nix b/nixpkgs/pkgs/applications/blockchains/parity-ui/default.nix index c59b2ccb8ac3..0615aed2ca03 100644 --- a/nixpkgs/pkgs/applications/altcoins/parity-ui/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/parity-ui/default.nix @@ -5,13 +5,13 @@ let uiEnv = pkgs.callPackage ./env.nix { }; in stdenv.mkDerivation rec { - name = "parity-ui-${version}"; + pname = "parity-ui"; version = "0.3.4"; src = fetchurl { url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73"; - name = "${name}.deb"; + name = "${pname}-${version}.deb"; }; nativeBuildInputs = [ makeWrapper nodePackages.asar ]; diff --git a/nixpkgs/pkgs/applications/altcoins/parity-ui/env.nix b/nixpkgs/pkgs/applications/blockchains/parity-ui/env.nix index a878bbf2e3e3..a878bbf2e3e3 100644 --- a/nixpkgs/pkgs/applications/altcoins/parity-ui/env.nix +++ b/nixpkgs/pkgs/applications/blockchains/parity-ui/env.nix diff --git a/nixpkgs/pkgs/applications/blockchains/parity/beta.nix b/nixpkgs/pkgs/applications/blockchains/parity/beta.nix new file mode 100644 index 000000000000..a936691bd799 --- /dev/null +++ b/nixpkgs/pkgs/applications/blockchains/parity/beta.nix @@ -0,0 +1,6 @@ +let + version = "2.6.2"; + sha256 = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r"; + cargoSha256 = "18zd91n04wck3gd8szj4vxn3jq0bzq0h3rg0wcs6nzacbzhcx2sw"; +in + import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/nixpkgs/pkgs/applications/altcoins/parity/default.nix b/nixpkgs/pkgs/applications/blockchains/parity/default.nix index 873f83190fde..9b5a72077d5c 100644 --- a/nixpkgs/pkgs/applications/altcoins/parity/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.5.6"; - sha256 = "1qkrqkkgjvm27babd6bidhf1n6vdp8rac1zy5kf61nfzplxzr2dy"; + version = "2.5.7"; + sha256 = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj"; cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/nixpkgs/pkgs/applications/altcoins/parity/parity.nix b/nixpkgs/pkgs/applications/blockchains/parity/parity.nix index 79831f3304df..fbc43cd3402c 100644 --- a/nixpkgs/pkgs/applications/altcoins/parity/parity.nix +++ b/nixpkgs/pkgs/applications/blockchains/parity/parity.nix @@ -7,11 +7,10 @@ , fetchFromGitHub , rustPlatform -, pkgconfig +, cmake , openssl +, pkgconfig , systemd -, cmake -, perl }: rustPlatform.buildRustPackage rec { @@ -26,10 +25,9 @@ rustPlatform.buildRustPackage rec { inherit sha256; }; - buildInputs = [ - pkgconfig cmake perl - systemd.lib systemd.dev openssl openssl.dev - ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ openssl systemd ]; cargoBuildFlags = [ "--features final" ]; diff --git a/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix b/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix index f5efa0bb52c2..613d57cd9c8c 100644 --- a/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix +++ b/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "particl-core-${version}"; + pname = "particl-core"; version = "0.17.1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/altcoins/pivx.nix b/nixpkgs/pkgs/applications/blockchains/pivx.nix index e2cf8aa182f3..c0833de7dbf3 100644 --- a/nixpkgs/pkgs/applications/altcoins/pivx.nix +++ b/nixpkgs/pkgs/applications/blockchains/pivx.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pivx-${version}"; + pname = "pivx"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/altcoins/polkadot/default.nix b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 26c9192ee6fa..26c9192ee6fa 100644 --- a/nixpkgs/pkgs/applications/altcoins/polkadot/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix diff --git a/nixpkgs/pkgs/applications/altcoins/stellar-core-dirty-version.patch b/nixpkgs/pkgs/applications/blockchains/stellar-core-dirty-version.patch index 57d66ce5919a..57d66ce5919a 100644 --- a/nixpkgs/pkgs/applications/altcoins/stellar-core-dirty-version.patch +++ b/nixpkgs/pkgs/applications/blockchains/stellar-core-dirty-version.patch diff --git a/nixpkgs/pkgs/applications/altcoins/stellar-core.nix b/nixpkgs/pkgs/applications/blockchains/stellar-core.nix index 4c3f9fe0760b..4c3f9fe0760b 100644 --- a/nixpkgs/pkgs/applications/altcoins/stellar-core.nix +++ b/nixpkgs/pkgs/applications/blockchains/stellar-core.nix diff --git a/nixpkgs/pkgs/applications/altcoins/sumokoin.nix b/nixpkgs/pkgs/applications/blockchains/sumokoin.nix index 026008b2761a..ad65da057aec 100644 --- a/nixpkgs/pkgs/applications/altcoins/sumokoin.nix +++ b/nixpkgs/pkgs/applications/blockchains/sumokoin.nix @@ -2,7 +2,7 @@ , libunwind, lmdb, miniupnpc }: stdenv.mkDerivation rec { - name = "sumokoin-${version}"; + pname = "sumokoin"; version = "0.2.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/altcoins/wasabiwallet/default.nix b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index 7185b3510601..7185b3510601 100644 --- a/nixpkgs/pkgs/applications/altcoins/wasabiwallet/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix diff --git a/nixpkgs/pkgs/applications/altcoins/wownero.nix b/nixpkgs/pkgs/applications/blockchains/wownero.nix index 7aed32978326..365afb5a2411 100644 --- a/nixpkgs/pkgs/applications/altcoins/wownero.nix +++ b/nixpkgs/pkgs/applications/blockchains/wownero.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "wownero-${version}"; + pname = "wownero"; version = "0.6.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/altcoins/zcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index 6a8fba3c2bb7..6a8fba3c2bb7 100644 --- a/nixpkgs/pkgs/applications/altcoins/zcash/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/zcash/default.nix diff --git a/nixpkgs/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 3aeee7e6972f..3aeee7e6972f 100644 --- a/nixpkgs/pkgs/applications/altcoins/zcash/librustzcash/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/zcash/librustzcash/default.nix diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 45fd3cb8cbb7..8302303a08e7 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.2.1"; - name = "lightdm-enso-os-greeter-${version}"; + pname = "lightdm-enso-os-greeter"; src = fetchgit { url = https://github.com/nick92/Enso-OS; diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 91446f73507e..69635718e3ba 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: stdenv.mkDerivation rec { - name = "lightdm-mini-greeter-${version}"; + pname = "lightdm-mini-greeter"; version = "0.3.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 61db182f7446..f892a9da50b9 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -12,10 +12,11 @@ let version = "2.0.6"; in stdenv.mkDerivation rec { - name = "lightdm-gtk-greeter-${version}"; + pname = "lightdm-gtk-greeter"; + inherit version; src = fetchurl { - url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; + url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15"; }; diff --git a/nixpkgs/pkgs/applications/display-managers/ly/default.nix b/nixpkgs/pkgs/applications/display-managers/ly/default.nix index e8edcc3f634c..2f0a770bc71c 100644 --- a/nixpkgs/pkgs/applications/display-managers/ly/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/ly/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, linux-pam }: stdenv.mkDerivation rec { - name = "ly-${version}"; + pname = "ly"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/display-managers/sddm/default.nix b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix index b5d32493003d..fc61d43436da 100644 --- a/nixpkgs/pkgs/applications/display-managers/sddm/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix @@ -1,13 +1,14 @@ { mkDerivation, lib, fetchFromGitHub , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs -, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd +, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd }: let version = "0.18.1"; in mkDerivation rec { - name = "sddm-${version}"; + pname = "sddm"; + inherit version; src = fetchFromGitHub { owner = "sddm"; @@ -29,7 +30,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ - libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd + libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/editors/aewan/default.nix b/nixpkgs/pkgs/applications/editors/aewan/default.nix index 214b435429ae..1bd73bebe03b 100644 --- a/nixpkgs/pkgs/applications/editors/aewan/default.nix +++ b/nixpkgs/pkgs/applications/editors/aewan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, ncurses }: stdenv.mkDerivation rec { - name = "aewan-${version}"; + pname = "aewan"; version = "1.0.01"; src = fetchurl { - url = "mirror://sourceforge/aewan/${name}.tar.gz"; + url = "mirror://sourceforge/aewan/${pname}-${version}.tar.gz"; sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817"; }; diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 4b9e2f409506..9f7997860c61 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.8"; # "Android Studio 3.6 Canary 8" - build = "192.5825043"; - sha256Hash = "1nh8p880pz3x7hlwa3inkr9qkd95amkg0sv4f0m7bb70k9v5mnvv"; + version = "3.6.0.9"; # "Android Studio 3.6 Canary 9" + build = "192.5830636"; + sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/nixpkgs/pkgs/applications/editors/aseprite/default.nix b/nixpkgs/pkgs/applications/editors/aseprite/default.nix index 7db4d3e947bf..170fde7b9caf 100644 --- a/nixpkgs/pkgs/applications/editors/aseprite/default.nix +++ b/nixpkgs/pkgs/applications/editors/aseprite/default.nix @@ -10,7 +10,7 @@ let skia = callPackage ./skia.nix {}; in stdenv.mkDerivation rec { - name = "aseprite-${version}"; + pname = "aseprite"; version = if unfree then "1.2.11" else "1.1.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix b/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix index 9f1db1464482..a12ccd257f8a 100644 --- a/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix +++ b/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix @@ -1,7 +1,6 @@ { stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "bonzomatic"; version = "2018-03-29"; diff --git a/nixpkgs/pkgs/applications/editors/brackets/default.nix b/nixpkgs/pkgs/applications/editors/brackets/default.nix index 17ae40521986..439b721632d0 100644 --- a/nixpkgs/pkgs/applications/editors/brackets/default.nix +++ b/nixpkgs/pkgs/applications/editors/brackets/default.nix @@ -8,13 +8,13 @@ let ]; in stdenv.mkDerivation rec { - name = "brackets-${version}"; + pname = "brackets"; version = "1.9"; src = fetchurl { url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp"; - name = "${name}.deb"; + name = "${pname}-${version}.deb"; }; phases = [ "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/applications/editors/bvi/default.nix b/nixpkgs/pkgs/applications/editors/bvi/default.nix index f5e14ff1e096..3237c543ee69 100644 --- a/nixpkgs/pkgs/applications/editors/bvi/default.nix +++ b/nixpkgs/pkgs/applications/editors/bvi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "bvi-${version}"; + pname = "bvi"; version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/bvi/${name}.src.tar.gz"; + url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz"; sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1"; }; diff --git a/nixpkgs/pkgs/applications/editors/bviplus/default.nix b/nixpkgs/pkgs/applications/editors/bviplus/default.nix index d08e006ec5b3..2c6b153370e4 100644 --- a/nixpkgs/pkgs/applications/editors/bviplus/default.nix +++ b/nixpkgs/pkgs/applications/editors/bviplus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "bviplus-${version}"; + pname = "bviplus"; version = "0.9.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix b/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix index 4ab11064eae3..65ec43939127 100644 --- a/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017-10-27"; - name = "deadpixi-sam-unstable-${version}"; + pname = "deadpixi-sam-unstable"; src = fetchFromGitHub { owner = "deadpixi"; diff --git a/nixpkgs/pkgs/applications/editors/dhex/default.nix b/nixpkgs/pkgs/applications/editors/dhex/default.nix index f4581c4beceb..efb3a2f9ffab 100644 --- a/nixpkgs/pkgs/applications/editors/dhex/default.nix +++ b/nixpkgs/pkgs/applications/editors/dhex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "dhex-${version}"; + pname = "dhex"; version = "0.69"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/dit/default.nix b/nixpkgs/pkgs/applications/editors/dit/default.nix index 12ca7a071406..2f83b0b8d992 100644 --- a/nixpkgs/pkgs/applications/editors/dit/default.nix +++ b/nixpkgs/pkgs/applications/editors/dit/default.nix @@ -1,11 +1,11 @@ { lib, fetchurl, stdenv, libiconv, ncurses, lua }: stdenv.mkDerivation rec { - name = "dit-${version}"; + pname = "dit"; version = "0.5"; src = fetchurl { - url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz"; + url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc"; }; diff --git a/nixpkgs/pkgs/applications/editors/edbrowse/default.nix b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix index 0b6e28434f56..0de514233f8e 100644 --- a/nixpkgs/pkgs/applications/editors/edbrowse/default.nix +++ b/nixpkgs/pkgs/applications/editors/edbrowse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }: stdenv.mkDerivation rec { - name = "edbrowse-${version}"; + pname = "edbrowse"; version = "3.7.4"; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; diff --git a/nixpkgs/pkgs/applications/editors/edit/default.nix b/nixpkgs/pkgs/applications/editors/edit/default.nix index 17fa75fe6343..acda484ba3a3 100644 --- a/nixpkgs/pkgs/applications/editors/edit/default.nix +++ b/nixpkgs/pkgs/applications/editors/edit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }: stdenv.mkDerivation rec { - name = "edit-nightly-${version}"; + pname = "edit-nightly"; version = "20160425"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/auto-complete/default.nix deleted file mode 100644 index 40f172316efc..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/auto-complete/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "auto-complete-1.3.1"; - - src = fetchurl { - url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2"; - sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj"; - }; - - buildInputs = [ emacs ]; - - preInstall = '' - install -d $out/share/emacs/site-lisp - ''; - - installFlags = "DIR=$(out)/share/emacs/site-lisp"; - - postInstall = '' - ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode - ''; - - meta = { - description = "Auto-complete extension for Emacs"; - homepage = http://cx4a.org/software/auto-complete/; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/3.nix deleted file mode 100644 index d20ab53bf7e1..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/3.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "bbdb-3.1.2"; - - src = fetchurl { - url = "https://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz"; - sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05"; - }; - - buildInputs = [ emacs ]; - - # Hack to disable documentation as there is no way to tell bbdb to - # NOT build pdfs. I really don't want to pull in TexLive here... - preConfigure = '' - substituteInPlace ./Makefile.in \ - --replace "SUBDIRS = lisp doc tex" "SUBDIRS = lisp" - ''; - - meta = { - homepage = https://savannah.nongnu.org/projects/bbdb/; - description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3"; - license = "GPL"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/default.nix deleted file mode 100644 index 689bcfc9adfd..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, fetchurl, emacs, texinfo, ctags}: - -stdenv.mkDerivation rec { - name = "bbdb-2.36"; - - src = fetchurl { - # not using mirror:// because it produces a different file - url = "http://bbdb.sourceforge.net/${name}.tar.gz"; - sha256 = "1rmw94l71ahfbynyy0bijfy488q9bl5ksl4zpvg7j9dbmgbh296r"; - }; - - patches = [ ./install-infodir.patch ]; - - buildInputs = [emacs texinfo ctags]; - configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ]; - preInstall = "mkdir -p $out/info"; - installTargets = "install-pkg texinfo"; - postInstall = '' - mv $out/info $out/share/ - mv "$out/share/emacs/site-lisp/lisp/bbdb/"* $out/share/emacs/site-lisp/ - mv $out/share/emacs/site-lisp/etc/bbdb $out/share/ - rm -rf $out/share/emacs/site-lisp/{lisp,etc} - mv bits $out/share/bbdb/ - # Make optional modules from bbdb available for import, but symlink - # them into the site-lisp directory to make it obvious that they are - # not a genuine part of the distribution. - ln -s "$out/share/bbdb/bits/"*.el $out/share/emacs/site-lisp/ - ''; - - meta = { - homepage = http://bbdb.sourceforge.net/; - description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs"; - license = "GPL"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch deleted file mode 100644 index 31ae6b266980..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- bbdb-2.35/texinfo/Makefile.in 2001-11-20 09:00:12.000000000 +0100 -+++ bbdb-2.35/texinfo/Makefile.in 2008-02-20 12:07:36.000000000 +0100 -@@ -27,22 +27,22 @@ all: info bbdb.dvi - install-pkg: uninstall-pkg info - @if test "x$(SYMLINKS)" = "xno" ; then \ - for i in `ls bbdb.info* ` ; do \ -- $(INSTALL_DATA) $$i $(PACKAGEDIR)/info/ ; \ -+ $(INSTALL_DATA) $$i $(infodir)/ ; \ - done ; \ - else \ - if test "x$(LINKPATH)" = "x" ; then \ - for i in `ls bbdb.info* ` ; do \ -- $(LN_S) `pwd`/$$i $(PACKAGEDIR)/info/$$i ; \ -+ $(LN_S) `pwd`/$$i $(infodir)/$$i ; \ - done ; \ - else \ - for i in `ls bbdb.info* ` ; do \ -- $(LN_S) $(LINKPATH)/texinfo/$$i $(PACKAGEDIR)/info/$$i ; \ -+ $(LN_S) $(LINKPATH)/texinfo/$$i $(infodir)/$$i ; \ - done ; \ - fi ; \ - fi - - uninstall-pkg: -- -$(RM) $(PACKAGEDIR)/info/bbdb.info* -+ -$(RM) $(infodir)/bbdb.info* - - info: bbdb.info diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/calfw/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/calfw/default.nix deleted file mode 100644 index b8c61bb97af6..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchgit, stdenv, emacs }: - -# TODO: byte-compile in build phase - a buildEmacsPackage that does -# that would be nice - -stdenv.mkDerivation rec { - name = "calfw-1.3-5-ga9b6615"; - - src = fetchgit { - url = "git://github.com/kiwanami/emacs-calfw.git"; - rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d"; - sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393"; - }; - - buildInputs = [ emacs ]; - - installPhase = - '' - mkdir -p "$out/share/doc/${name}" - cp -v readme.md "$out/share/doc/${name}" - - mkdir -p "$out/share/emacs/site-lisp/" - cp *.el "$out/share/emacs/site-lisp/" - ''; - - meta = { - description = "A calendar framework for Emacs"; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix deleted file mode 100644 index 34120db6aa70..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, python }: - -stdenv.mkDerivation rec { - version = "0.8.4"; - name = "cask-${version}"; - - src = fetchFromGitHub { - owner = "cask"; - repo = "cask"; - rev = "v${version}"; - sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686"; - }; - - buildInputs = [ emacs python ]; - - # byte-compiling emacs files automatically triggers cask's bootstrap - # mechanism, what we don't want. - dontBuild = true; - - installPhase = '' - install -d "$out/share/emacs/site-lisp" - install cask*.el* "$out/share/emacs/site-lisp" - - install -d "$out/bin" - install bin/cask "$out/bin" - - # We also need to install cask's templates in order for 'cask - # init' to work properly. - install -d "$out/templates" - install templates/* "$out/templates" - - # In order to work with cask's hard coded file paths (during bootstrap), - # we have to create these links. - ln -s "$out/share/emacs/site-lisp/"* "$out" - - # This file disables cask's self-updating function. - touch "$out/.no-upgrade" - ''; - - meta = with stdenv.lib; { - description = "Project management tool for Emacs"; - longDescription = - '' - Cask is a project management tool for Emacs that helps automate the - package development cycle; development, dependencies, testing, - building, packaging and more. Cask can also be used to manage - dependencies for your local Emacs configuration. - ''; - homepage = https://github.com/cask/cask; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cedet/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cedet/default.nix index e350dc08e71c..5fbe095c4f35 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -44,5 +44,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://cedet.sourceforge.net/; + + # Fails with `semantic-idle.el:42:1:Error: Invalid function: class-p` + broken = true; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix index 2d1cbb75981e..ce9f57ef40b6 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cedille/default.nix @@ -1,7 +1,7 @@ { stdenv, cedille, emacs }: stdenv.mkDerivation rec { - name = "cedille-mode-${version}"; + pname = "cedille-mode"; version = cedille.version; src = cedille.src; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/coffee/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/coffee/default.nix deleted file mode 100644 index 495b1aca4b53..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/coffee/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation rec { - name = "coffee-mode-0.4.1"; - - src = fetchgit { - url = "https://github.com/defunkt/coffee-mode.git"; - rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8"; - sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile coffee-mode.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs major mode for CoffeeScript, unfancy JavaScript"; - homepage = https://github.com/defunkt/coffee-mode; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index 6b51f117ad85..fb3de6ea3d9e 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -30,5 +30,8 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.samuelrivas ]; license = licenses.mit; platforms = platforms.all; + + # Fails with `solarized-definitions.el:786:1:Warning: the function `rotatef' is not known to` + broken = true; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/default.nix deleted file mode 100644 index 407b9e58f0bf..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation rec { - name = "color-theme-6.6.0"; - - src = fetchurl { - url = "mirror://savannah/color-theme/${name}.tar.gz"; - sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn"; - }; - - # patches from http://aur.archlinux.org/packages.php?ID=54883 - patches = [ ./fix-build.patch ./gnus-bug.diff ]; - - buildInputs = [ emacs ]; - - installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ]; - installTargets = "install-bin"; - - meta = { - description = "Emacs-lisp mode for skinning your Emacs"; - homepage = https://www.nongnu.org/color-theme; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch deleted file mode 100644 index cfc237c8cdc1..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Makefile 2009-05-15 18:22:49.000000000 +0200 -+++ b/Makefile 2009-05-16 08:59:36.000000000 +0200 -@@ -15,6 +15,7 @@ - TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE)) - MANUAL = color-theme - MISC = AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in -+LOADPATH = "$(shell pwd)" "$(shell pwd)/themes" - #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \ - #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \ - #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi -@@ -47,7 +48,7 @@ - - %.elc: %.el - @$(EMACS) $(OPTIONCOMPILE) \ -- --eval '(setq load-path (cons "." load-path))' \ -+ --eval '(setq load-path (append load-path (list $(LOADPATH))))' \ - -f batch-byte-compile $< - - %.info: %.texi diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff b/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff deleted file mode 100644 index 9d227df562e1..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el ---- color-theme-6.6.0.orig/color-theme.el 2011-11-18 01:17:29.000000000 +0100 -+++ color-theme-6.6.0.new/color-theme.el 2011-11-18 01:24:07.000000000 +0100 -@@ -73,9 +73,10 @@ - "Non-nil if running XEmacs.") - - ;; Add this since it appears to miss in emacs-2x --(or (fboundp 'replace-in-string) -- (defun replace-in-string (target old new) -- (replace-regexp-in-string old new target))) -+(if (fboundp 'replace-in-string) -+ (defalias 'color-theme-replace-in-string 'replace-in-string) -+ (defsubst color-theme-replace-in-string (target old new &optional literal) -+ (replace-regexp-in-string old new target nil literal))) - - ;; face-attr-construct has a problem in Emacs 20.7 and older when - ;; dealing with inverse-video faces. Here is a short test to check -@@ -1626,8 +1627,8 @@ - (add-to-list 'color-themes - (list ',n - (upcase-initials -- (replace-in-string -- (replace-in-string -+ (color-theme-replace-in-string -+ (color-theme-replace-in-string - (symbol-name ',n) "^color-theme-" "") "-" " ")) - ,author)) - (defun ,n () diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cryptol/default.nix deleted file mode 100644 index 5b408ad7999d..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cryptol/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "cryptol-mode-${version}"; - version = "0.1.0"; - - src = fetchurl { - url = "https://github.com/thoughtpolice/cryptol-mode/archive/v${version}.tar.gz"; - sha256 = "1qyrqvfgpg1nyk1clv7v94r3amm02613hrak5732xzn6iak81cc0"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs major mode for Cryptol"; - homepage = "https://thoughtpolice/cryptol-mode"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cua/builder.sh b/nixpkgs/pkgs/applications/editors/emacs-modes/cua/builder.sh deleted file mode 100644 index 6f7bb428c1a6..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cua/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/emacs/site-lisp -cp $src $out/emacs/site-lisp/cua.el diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cua/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cua/default.nix deleted file mode 100644 index 0305be28ad62..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cua/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "cua-mode-2.10"; - builder = ./builder.sh; - src = fetchurl { - url = http://tarballs.nixos.org/cua-mode-2.10.el; - sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/d/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/d/default.nix deleted file mode 100644 index 28736acded2f..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/d/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, emacs}: - -# Note: Don't have a version, using date as fallback. -let version = "20150111"; - -in stdenv.mkDerivation { - name = "emacs-d-${version}"; - - src = fetchurl { - url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz"; - sha256 = "0vb0za51lc6qf1qgqisap4vzk36caa5k17zajjn034rhjsqfw0w7"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Major mode for editing D code"; - homepage = https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - }; - -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/darcs_context b/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/darcs_context deleted file mode 100644 index 7e9de1ed80b5..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/darcs_context +++ /dev/null @@ -1,7 +0,0 @@ - -Context: - -[TAG 1.3 -Simon Michael <simon@joyful.com>**20131103203640 - Ignore-this: d12bac373e4aa0e5ffe6c390e1dfe269 -] diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/default.nix deleted file mode 100644 index 0a1c2c77b2a2..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/darcsum/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -# To automatically load darcsum when needed, add the following to your emacs init file: -# -# (autoload 'darcsum-changes "darcsum" nil t) -# (autoload 'darcsum-whatsnew "darcsum" nil t) -# (autoload 'darcsum-view "darcsum" nil t) -# -# (These lines were copied from 50darcsum.el in the darcsum repository.) - - -{ fetchdarcs, stdenv }: - -stdenv.mkDerivation { - name = "darcsum-1.3"; - - src = fetchdarcs { - url = http://hub.darcs.net/simon/darcsum; - context = ./darcs_context; - sha256 = "18dyk2apmnjapd604a5njfqwjri1mc7lgjaajy9phicpibgdrwzh"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - install -d "$out/share/emacs/site-lisp" - install darcsum.el "$out/share/emacs/site-lisp" - ''; - - meta = { - description = "A pcl-cvs like interface for managing darcs patches"; - homepage = http://hub.darcs.net/simon/darcsum; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.falsifian ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/ecb/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ecb/default.nix deleted file mode 100644 index 807bb91f850c..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ fetchurl, stdenv, emacs, cedet, jdee, texinfo }: - -stdenv.mkDerivation rec { - name = "ecb-2.40"; - - src = fetchurl { - url = "mirror://sourceforge/ecb/${name}.tar.gz"; - sha256 = "0gp56ixfgnyk2j1fps4mk1yv1vpz81kivb3gq9f56jw4kdlhjrjs"; - }; - - buildInputs = [ emacs ]; - propagatedBuildInputs = [ cedet jdee ]; - propagatedUserEnvPkgs = propagatedBuildInputs; - - patchPhase = '' - sed -i "Makefile" \ - -e 's|CEDET[[:blank:]]*=.*$|CEDET = ${cedet}/share/emacs/site-lisp|g ; - s|INSTALLINFO[[:blank:]]*=.*$|INSTALLINFO = ${texinfo}/bin/install-info|g ; - s|MAKEINFO[[:blank:]]*=.*$|MAKEINFO = ${texinfo}/bin/makeinfo|g ; - s|common/cedet.el|cedet.el|g' - ''; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp" - - mkdir -p "$out/share/info" - cp -v info-help/*.info* "$out/share/info" - ''; - - meta = { - description = "ECB, the Emacs Code browser"; - - longDescription = '' - ECB stands for "Emacs Code Browser". While Emacs already has - good editing support for many modes, its browsing support is - somewhat lacking. That's where ECB comes in: it displays a - number of informational windows that allow for easy source code - navigation and overview. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://ecb.sourceforge.net/; - - maintainers = [ ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 31e87df6d85a..7737034973af 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -621,21 +621,6 @@ license = lib.licenses.free; }; }) {}; - counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }: - elpaBuild { - pname = "counsel-ebdb"; - ename = "counsel-ebdb"; - version = "1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el"; - sha256 = "0p919gq871rxlrn6lpjbwws7h6i2gc9vgcxzj8bzgz8xk5hq9mis"; - }; - packageRequires = [ ebdb ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/counsel-ebdb.html"; - license = lib.licenses.free; - }; - }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -1252,10 +1237,10 @@ elpaBuild { pname = "frog-menu"; ename = "frog-menu"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.9.el"; - sha256 = "1gjhypsafpqybcbwi49qi1g419hcq9qv4p940ybspydg9gqk3gmp"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el"; + sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -1470,21 +1455,6 @@ license = lib.licenses.free; }; }) {}; - helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }: - elpaBuild { - pname = "helm-ebdb"; - ename = "helm-ebdb"; - version = "1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/helm-ebdb-1.el"; - sha256 = "17gpna0hywxnhfwc9zsm2r35mskyfi416qqmmdba26r4zmpb9r63"; - }; - packageRequires = [ ebdb helm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/helm-ebdb.html"; - license = lib.licenses.free; - }; - }) {}; highlight-escape-sequences = callPackage ({ elpaBuild , fetchurl , lib }: @@ -2415,10 +2385,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.2.4"; + version = "0.2.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.2.4.tar"; - sha256 = "0n6gj22w0llns3kx5hd69imhlrnlxx74zvhz7qikfx60669c5n20"; + url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar"; + sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl"; }; packageRequires = [ emacs ]; meta = { @@ -3181,10 +3151,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.2.1"; + version = "2.4.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.2.1.tar"; - sha256 = "139y05b2m715zryxqw7k438cc137mziz2k5nbzrrahddfz0i3cf9"; + url = "https://elpa.gnu.org/packages/tramp-2.4.2.2.tar"; + sha256 = "0bjfnxxyn8xgw10ybnjrza2gfwqifa3q7rh0bp6pidlhg45718p8"; }; packageRequires = [ emacs ]; meta = { @@ -3575,10 +3545,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.2.tar"; - sha256 = "09rpjl3z6xzap0lbrjs9hf2nspwc5avvx75ah3aimgvizrf2kyp0"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.3.tar"; + sha256 = "1vljnhi35vix30xch9mziczg56ss1r615yn2pgdcw8wa8sm14crw"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 5f0c863b5861..a6bea779eae0 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -36,13 +36,7 @@ self: let super = removeAttrs imported [ "dash" ]; overrides = { - # upstream issue: missing footer - ebdb-i18n-chn = markBroken super.ebdb-i18n-chn; - el-search = markBroken super.el-search; # requires emacs-25 - iterators = markBroken super.iterators; # requires emacs-25 - midi-kbd = markBroken super.midi-kbd; # requires emacs-25 rcirc-menu = markBroken super.rcirc-menu; # Missing file header - stream = markBroken super.stream; # requires emacs-25 cl-lib = null; # builtin tle = null; # builtin advice = null; # builtin diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix deleted file mode 100644 index 66ac9a3d77e6..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ clangStdenv, fetchgit, llvmPackages }: - -clangStdenv.mkDerivation { - name = "emacs-clang-complete-async-20130218"; - src = fetchgit { - url = "git://github.com/Golevka/emacs-clang-complete-async.git"; - rev = "f01488971ec8b5752780d130fb84de0c16a46f31"; - sha256 = "01smjinrvx0w5z847a43fh2hyr6rrq1kaglfakbr6dcr313w89x9"; - }; - - buildInputs = [ llvmPackages.llvm ]; - - patches = [ ./fix-build.patch ]; - - CFLAGS = "-I${llvmPackages.clang}/include"; - LDFLAGS = "-L${llvmPackages.clang}/lib"; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/emacs/site-lisp - install -m 755 clang-complete $out/bin - install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp - ''; - - meta = { - homepage = https://github.com/Golevka/emacs-clang-complete-async; - description = "An emacs plugin to complete C and C++ code using libclang"; - license = clangStdenv.lib.licenses.gpl3Plus; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch deleted file mode 100644 index 89de339a436b..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- old/src/completion.h 2014-11-16 16:58:16.625150124 +0100 -+++ new/src/completion.h 2014-11-16 16:58:28.020207508 +0100 -@@ -3,6 +3,7 @@ - - - #include <clang-c/Index.h> -+#include <stdio.h> - - - typedef struct __completion_Session_struct diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix deleted file mode 100644 index 8e1d7092e6a1..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }: - -let date = "2013-03-21"; in -stdenv.mkDerivation rec { - name = "emacs-w3m-cvs${date}"; - - # Get the source from CVS because the previous release (1.4.4) is old and - # doesn't work with GNU Emacs 23. - src = fetchcvs { - inherit date; - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ emacs w3m texinfo ]; - - # XXX: Should we do the same for xpdf/evince, gv, gs, etc.? - patchPhase = '' - sed -i "w3m.el" \ - -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ; - s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g' - - sed -i "w3m-image.el" \ - -e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ; - s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g' - ''; - - configureFlags = [ - "--with-lispdir=$(out)/share/emacs/site-lisp" - "--with-icondir=$(out)/share/emacs/site-lisp/images/w3m" - ]; - - postInstall = '' - cd "$out/share/emacs/site-lisp" - for i in ChangeLog* - do - mv -v "$i" "w3m-$i" - done - ''; - - meta = { - description = "Emacs-w3m, a simple Emacs interface to the w3m web browser"; - - longDescription = '' - Emacs/W3 used to be known as the most popular WEB browser on Emacs, but - it worked so slowly that we wanted a simple and speedy alternative. - - w3m is a pager with WWW capability, developed by Akinori ITO. Although - it is a pager, it can be used as a text-mode WWW browser. Then we - developed a simple Emacs interface to w3m. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://emacs-w3m.namazu.org/; - - maintainers = [ ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/emms/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/emms/default.nix deleted file mode 100644 index f966989b5a30..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/emms/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchurl, emacs, texinfo -, mpg321, vorbis-tools, taglib, mp3info, alsaUtils }: - -# XXX: EMMS also supports Xine, MPlayer, Jack, etc. - -stdenv.mkDerivation rec { - name = "emms-3.0"; - - src = fetchurl { - # These guys don't use ftp.gnu.org... - url = "https://www.gnu.org/software/emms/download/${name}.tar.gz"; - sha256 = "151mfx97x15lfpd1qc2sqbvhwhvg46axgh15qyqmdy42vh906xav"; - }; - - buildInputs = [ emacs texinfo ]; - - configurePhase = '' - sed -i "Makefile" -e "s|PREFIX *=.*\$|PREFIX = $out|g ; - s|/usr/sbin/install-info|install-info|g ; - s|/usr/include/taglib|${taglib}/include/taglib|g ; - s|/usr/lib|${taglib}/lib|g ; - s|^all:\(.*\)\$|all:\1 emms-print-metadata|g" - mkdir -p "$out/share/man/man1" - - sed -i "emms-player-mpg321-remote.el" \ - -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g' - sed -i "emms-player-simple.el" \ - -e 's|"ogg123"|"${vorbis-tools}/bin/ogg123"|g' - sed -i "emms-info-ogginfo.el" \ - -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbis-tools}/bin/ogginfo"|g' - sed -i "emms-info-libtag.el" \ - -e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g" - sed -i "emms-volume-amixer.el" \ - -e 's|"amixer"|"${alsaUtils}/bin/amixer"|g' - - # Use the libtag info back-end for MP3s since we're building it. - sed -i "emms-setup.el" \ - -e 's|emms-info-mp3info|emms-info-libtag|g' - - # But use mp3info for the tag editor. - sed -i "emms-info-mp3info.el" \ - -e 's|emms-info-mp3info-program-name[[:blank:]]\+"mp3info"|emms-info-mp3info-program-name "${mp3info}/bin/mp3info"|g' - sed -i "emms-tag-editor.el" \ - -e 's|"mp3info"|"${mp3info}/bin/mp3info"|g' - ''; - - postInstall = '' - mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin" - ''; - - meta = { - description = "GNU EMMS, The Emacs Multimedia System"; - - longDescription = '' - EMMS is the Emacs Multimedia System. It tries to be a clean and - small application to play multimedia files from Emacs using - external players. Many of it's ideas are derived from - MpthreePlayer, but it tries to be more general and cleaner. - - The fact that EMMS is based on external players makes it - powerful, because it supports all formats that those players - support, with no effort from your side. - ''; - - homepage = https://www.gnu.org/software/emms/; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/ensime/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ensime/default.nix deleted file mode 100644 index d776103a6627..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/ensime/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s, scalaMode2, sbtMode }: - -stdenv.mkDerivation { - name = "emacs-ensime-2014-09-04"; - - src = fetchurl { - url = "https://github.com/ensime/ensime-emacs/archive/d3820a3f362975f6e14b817988ec07bfef2b4dad.zip"; - sha256 = "0gwr0r92z2hh2x8g0hpxaar2vvfk1b91cp6v04gaasw0fvl5i7g5"; - }; - - buildInputs = [ emacs unzip ]; - propagatedUserEnvPkgs = [ autoComplete dash s scalaMode2 sbtMode ]; - - buildPhase = '' - emacs -L . -L ${autoComplete}/share/emacs/site-lisp --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/erlang/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/erlang/default.nix deleted file mode 100644 index 463d7fc7e159..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/erlang/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, erlang }: - -stdenv.mkDerivation { - - name = "erlang-mode-${erlang.version}"; - - buildInputs = [ ]; - - inherit erlang; - - buildCommand = '' - mkdir -p "$out/share/emacs/site-lisp" - cp "$erlang/lib/erlang/lib/tools"*/emacs/*.el $out/share/emacs/site-lisp/ - ''; - - # emacs highlighting */ - - meta = with stdenv.lib; { - homepage = https://github.com/erlang/otp; - description = "Erlang mode for Emacs"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.samuelrivas ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/ess/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ess/default.nix deleted file mode 100644 index ce335a5d4827..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/ess/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, emacs, texinfo }: - -stdenv.mkDerivation rec { - name = "ess-14.09"; - - src = fetchurl { - url = "http://ess.r-project.org/downloads/ess/${name}.tgz"; - sha256 = "0wa507jfmq3k7x0vigd2yzb4j2190ix4wnnpv7ql4bjy0vfvmwdn"; - }; - - buildInputs = [ emacs texinfo ]; - - configurePhase = "makeFlags=PREFIX=$out"; - - meta = { - description = "Emacs Speaks Statistics"; - homepage = http://ess.r-project.org/; - license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix deleted file mode 100644 index eae338d241de..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "flymake-cursor-0.1.5"; - - src = fetchurl { - url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el"; - sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src flymake-cursor.el - emacs --batch -f batch-byte-compile flymake-cursor.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Displays flymake error msg in minibuffer after delay"; - homepage = http://www.emacswiki.org/emacs/flymake-cursor.el; - license = stdenv.lib.licenses.publicDomain; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/gh/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/gh/default.nix deleted file mode 100644 index aa59eace2ae3..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/gh/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, emacs, pcache, logito }: - -stdenv.mkDerivation rec { - name = "gh-0.5.3"; - - src = fetchgit { - url = "https://github.com/sigma/gh.el.git"; - rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e"; - sha256 = "1pciq16vl5l4kvj08q4ib1jzk2bb2y1makcsyaw8k9jblqviw756"; - }; - - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ pcache logito ]; - - patchPhase = '' - sed -i Makefile \ - -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \ - -e "s|/usr/local|$out|" \ - -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|" - ''; - - buildPhase = "make lisp"; - - meta = { - description = "A (very early) GitHub client library for Emacs"; - homepage = https://github.com/sigma/gh.el; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/gist/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/gist/default.nix deleted file mode 100644 index 08471247f081..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/gist/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchgit, emacs, gh, pcache, logito }: - -stdenv.mkDerivation rec { - name = "gist-1.0"; - - src = fetchgit { - url = "https://github.com/sigma/gist.el.git"; - rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed"; - sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L ${gh}/share/emacs/site-lisp \ - -L ${pcache}/share/emacs/site-lisp \ - -L ${logito}/share/emacs/site-lisp \ - --eval '(setq user-emacs-directory "./")' \ - --batch -f batch-byte-compile gist.el - ''; - - propagatedUserEnvPkgs = [ gh pcache logito ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install gist.el gist.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs integration for gist.github.com"; - homepage = https://github.com/sigma/gist.el; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/gn/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/gn/default.nix deleted file mode 100644 index 39e7d1abf386..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/gn/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation { - name = "gn-mode-2017-09-21"; - src = fetchgit { - url = "https://chromium.googlesource.com/chromium/src/tools/gn"; - rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36"; - sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866"; - }; - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el - ''; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp/ - cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/ - ''; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix deleted file mode 100644 index a08f138bed95..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "graphviz-dot-mode-0.3.3"; - - src = fetchurl { - url = "http://www.graphviz.org/Misc/graphviz-dot-mode.el"; - sha256 = "6465c18cfaa519a063cf664207613f70b0a17ac5eabcfaa949b3c4c289842953"; - }; - - buildInputs = [ emacs ]; - - dontUnpack = true; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v ${src} "$out/share/emacs/site-lisp/graphviz-dot-mode.el" - emacs -batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile "$out/share/emacs/site-lisp/graphviz-dot-mode.el" - ''; - - meta = { - homepage = http://www.graphviz.org/; - description = "An emacs mode for the DOT Language, used by graphviz"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/haskell/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/haskell/default.nix deleted file mode 100644 index 6b10766bedb7..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo }: - -# Use "emacsMelpa.haskell-mode" instead. - -let - version = "13.14-169-g0d3569d"; # git describe --tags -in -stdenv.mkDerivation { - name = "haskell-mode-${version}"; - - src = fetchFromGitHub { - owner = "haskell"; - repo = "haskell-mode"; - rev = "v${version}"; - sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k"; - }; - - buildInputs = [ emacs texinfo ]; - - makeFlags = "VERSION=v${version} GIT_VERSION=v${version}"; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc *.hs $out/share/emacs/site-lisp/ - mkdir -p $out/share/info - cp -v *.info* $out/share/info/ - ''; - - # The test suite must run *after* copying the generated files to $out - # because "make check" implies "make clean". - doInstallCheck = true; - installCheckTarget = "check"; - - meta = { - homepage = https://github.com/haskell/haskell-mode; - description = "Haskell mode for Emacs"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; - broken = true; # no longer compiles and this package is obsolete anyway - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/helm-words/default.nix index b28d0ae24a34..c6e1c5a50f4a 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/helm-words/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/helm-words/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "helm-words-20150413"; + name = "helm-words-20190917"; src = fetchgit { url = "https://github.com/pronobis/helm-words.git"; - rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185"; - sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35"; + rev = "e6387ece1940a06695b9d910de3d90252efb8d29"; + sha256 = "1ly0mbzlgc26fqvf7rxpmy698g0cf9qldrwrx022ar6r68l1h7xf"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/hol_light/default.nix index c32669239f88..255b30d60ed1 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn }: stdenv.mkDerivation rec { - name = "hol_light-mode-${version}"; + pname = "hol_light-mode"; version = "73"; src = fetchsvn { @@ -22,5 +22,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + + # Fails trying to fetch dependencies in build + # broken = true; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 199a5886e1df..75b72516a3cd 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -6,7 +6,8 @@ let version = "0.15"; in stdenv.mkDerivation { - name = "hsc3-mode-${version}"; + pname = "hsc3-mode"; + inherit version; src = fetchurl { url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz; sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/htmlize/default.nix deleted file mode 100644 index c16f449c3a24..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - name = "htmlize-1.47"; - - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "htmlize"; - rev = "release/1.47"; - name = "htmlize-1.47-src"; - sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp"; - }; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp htmlize.el $out/share/emacs/site-lisp/ - ''; - - meta = { - description = "Convert buffer text and decorations to HTML"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix index 17cf213a799d..27dcd1063bf2 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "2019-02-22"; - name = "icicles-${version}"; + pname = "icicles"; srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; + installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/"; meta = { homepage = https://www.emacswiki.org/emacs/Icicles; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix index 3cc8156337e0..eaa0f2c2a5b1 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix @@ -4,7 +4,8 @@ let version = "3.6-4-gb659bf8"; in stdenv.mkDerivation { - name = "ido-ubiquitous-${version}"; + pname = "ido-ubiquitous"; + inherit version; src = fetchFromGitHub { owner = "DarwinAwardWinner"; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/idris/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/idris/default.nix deleted file mode 100644 index 2e168b3abf7f..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/idris/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "idris-mode"; - version = "0.9.18"; - - src = fetchurl { - url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; - sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs major mode for Idris"; - homepage = https://github.com/idris-hackers/idris-mode; - license = stdenv.lib.licenses.gpl3; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/jabber/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/jabber/default.nix deleted file mode 100644 index c0ddbc88cf27..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, emacs }: -stdenv.mkDerivation rec { - pname = "emacs-jabber"; - version = "0.8.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26"; - }; - buildInputs = [ emacs ]; - meta = with stdenv.lib; { - description = "A Jabber client for Emacs"; - longDescription = '' - jabber.el is a Jabber client for Emacs. It may seem strange to have a - chat client in an editor, but consider that chatting is, after all, just - a special case of text editing. - ''; - homepage = http://emacs-jabber.sourceforge.net/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/jade/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/jade/default.nix deleted file mode 100644 index 925fa54c735f..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/jade/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation { - name = "jade-mode-0-20120802"; - - src = fetchgit { - url = "https://github.com/brianc/jade-mode.git"; - rev = "275ab149edb0f6bcfae6ac17ba456f3351191604"; - sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -L . -f batch-byte-compile *.el - ''; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc $out/share/emacs/site-lisp/ - ''; - - meta = { - description = "Emacs major mode for jade and stylus"; - homepage = https://github.com/brianc/jade-mode; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch deleted file mode 100644 index d0a733b912e3..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch +++ /dev/null @@ -1,12 +0,0 @@ -Make sure `build.properties' is honored. - ---- jde/build.xml -+++ jde/build.xml -@@ -14,6 +14,7 @@ - <property name="project.version" value="2.4.0"/> - <property name="config.dir" location="./config"/> - -+ <property file="build.properties"/> - - <!-- everything depends on this initialization target --> - <target name="init"> diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch deleted file mode 100644 index 8c866e2d1db3..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ -JDE insists on seeing CEDET's source tree layout, with various -sub-directories (`common', `eieio', etc.). However, the installed CEDET -is flat, with everything under ${cedet}/share/emacs/site-lisp. - ---- jde/config/build.el (revision 90) -+++ jde/config/build.el (working copy) -@@ -50,10 +50,5 @@ PATHS are sub directories under CEDET-DI - (jde-make-autoloads-and-compile (expand-file-name "@{build.lisp.dir}") - "@{src.lisp.dir}" - "@{cedet.dir}" -- '("common" -- "eieio" -- "semantic" -- "semantic/bovine" -- "speedbar" -- ) -+ '(".") - "@{build.lisp.autoload.libname}") diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/default.nix deleted file mode 100644 index 306fe66823c8..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ fetchsvn, stdenv, emacs, cedet, ant }: - -let - revision = "137"; -in - stdenv.mkDerivation rec { - name = "jdee-svn${revision}"; - - # Last release is too old, so use SVN. - # See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment . - src = fetchsvn { - url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee"; - rev = revision; - sha256 = "1z1y957glbqm7z3dhah9h4jysw3173pq1gpx5agfwcw614n516xz"; - }; - - patchFlags = "-p1 --ignore-whitespace"; - - patches = [ - ./build-properties.patch - ./cedet-paths.patch ./elib-avltree.patch - ./java-directory.patch - ]; - - configurePhase = '' - mkdir -p "dist" - cat > build.properties <<EOF - dist.lisp.dir = dist/share/emacs/site-lisp - dist.java.lib.dir = dist/share/java - dist.jar.jde.file = dist/share/java/jde.jar - dist.java.src.dir = dist/src/${name}/java - dist.doc.dir dist/doc/${name} - prefix.dir = $out - cedet.dir = ${cedet}/share/emacs/site-lisp - elib.dir = /nowhere - build.bin.emacs = ${emacs}/bin/emacs - EOF - - # Substitute variables, à la Autoconf. - for i in "lisp/"*.el - do - sed -i "$i" -e "s|@out@|$out|g ; - s|@javadir@|$out/share/java|g ; - s|@datadir@|$out/share/${name}|g" - done - ''; - - buildPhase = "ant dist"; - - installPhase = '' - ant install - - mkdir -p "$out/share/${name}" - cp -rv java/bsh-commands "$out/share/${name}" - - # Move everything that's not a JAR to $datadir. This includes - # `sun_checks.xml', license files, etc. - cd "$out/share/java" - for i in * - do - if echo $i | grep -qv '\.jar''$' - then - mv -v "$i" "$out/share/${name}" - fi - done - ''; - - buildInputs = [ emacs ant ]; - propagatedBuildInputs = [ cedet ]; - propagatedUserEnvPkgs = propagatedBuildInputs; # FIXME: Not honored - - meta = { - description = "JDEE, a Java development environment for Emacs"; - - longDescription = '' - The JDEE is a software package that interfaces Emacs to - command-line Java development tools (for example, JavaSoft's - JDK). JDEE features include: - - * JDEE menu with compile, run, debug, build, browse, project, - and help commands - * syntax coloring - * auto indentation - * compile error to source links - * source-level debugging - * source code browsing - * make file support - * automatic code generation - * Java source interpreter (Pat Neimeyer's BeanShell) - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - - broken = true; - }; - } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch deleted file mode 100644 index db891b1655e0..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch +++ /dev/null @@ -1,105 +0,0 @@ -JDEE refers to the `avltree' module from GNU Elib, but GNU Elib -no longer exists (see http://www.gnu.org/software/elib/). This -patch updates the module names to what's current in Emacs. - ---- jde/config/build.el -+++ jde/config/build.el -@@ -33,11 +33,10 @@ compile. - CEDET-DIR is the cedet lisp code base directory (see PATHS). - - PATHS are sub directories under CEDET-DIR we use to compile." -- (dolist (path (list dir lisp-src-dir elib-dir cedet-dir)) -+ (dolist (path (list dir lisp-src-dir cedet-dir)) - (if (not (file-directory-p path)) - (error "Doesn't exist or not a directory: %s" path))) - (let ((autoload-buf (jde-make-autoloads dir autoload-libname))) -- (add-to-list 'load-path elib-dir t) - (dolist (path paths) - (add-to-list 'load-path (expand-file-name path cedet-dir) t)) - (add-to-list 'load-path lisp-src-dir t) - ---- jde/lisp/jde-parse.el (revision 90) -+++ jde/lisp/jde-parse.el (working copy) -@@ -24,7 +24,7 @@ - - (require 'semantic-sb) - (require 'semantic-ctxt) --(require 'avltree) -+(require 'avl-tree) - (require 'thingatpt) - (require 'eieio) - (require 'jde-imenu) ; All the imenu stuff is here now! -@@ -869,7 +869,8 @@ in a method; otherwise, nil." - - (defclass jde-avl-tree () - ((tree :initarg tree -- :type list -+ ;; FIXME: Emacs 23 `avl-tree' objects are not lists. -+ ;;:type list - :documentation - "The tree") - (compare-fcn :initarg compare-fcn -@@ -887,51 +887,51 @@ in a method; otherwise, nil." - - (assert (typep (oref this compare-fcn) 'function)) - -- (oset this tree (avltree-create (oref this compare-fcn)))) -+ (oset this tree (avl-tree-create (oref this compare-fcn)))) - - (defmethod jde-avl-tree-add ((this jde-avl-tree) item) - "Inserts ITEM in this tree." -- (avltree-enter (oref this tree) item)) -+ (avl-tree-enter (oref this tree) item)) - - (defmethod jde-avl-tree-delete ((this jde-avl-tree) item) - "Deletes ITEM from THIS tree." -- (avltree-delete (oref this tree) item)) -+ (avl-tree-delete (oref this tree) item)) - - (defmethod jde-avl-tree-is-empty ((this jde-avl-tree)) - "Return t if THIS tree is empty, otherwise return nil." -- (avltree-empty (oref this tree))) -+ (avl-tree-empty (oref this tree))) - - (defmethod jde-avl-tree-find ((this jde-avl-tree) item) - "Return the element in THIS tree that matches item." -- (avltree-member (oref this tree) item)) -+ (avl-tree-member (oref this tree) item)) - - (defmethod jde-avl-tree-map ((this jde-avl-tree) map-function) - "Applies MAP-FUNCTION to all elements of THIS tree." -- (avltree-map map-function (oref this tree))) -+ (avl-tree-map map-function (oref this tree))) - - (defmethod jde-avl-tree-first ((this jde-avl-tree)) - "Return the first item in THIS tree." -- (avltree-first (oref this tree))) -+ (avl-tree-first (oref this tree))) - - (defmethod jde-avl-tree-last ((this jde-avl-tree)) - "Return the last item in THIS tree." -- (avltree-last (oref this tree))) -+ (avl-tree-last (oref this tree))) - - (defmethod jde-avl-tree-copy ((this jde-avl-tree)) - "Return a copy of THIS tree." -- (avltree-copy (oref this tree))) -+ (avl-tree-copy (oref this tree))) - - (defmethod jde-avl-tree-flatten ((this jde-avl-tree)) - "Return a sorted list containing all elements of THIS tree." -- (avltree-flatten (oref this tree))) -+ (avl-tree-flatten (oref this tree))) - - (defmethod jde-avl-tree-size ((this jde-avl-tree)) - "Return the number of elements in THIS tree." -- (avltree-size (oref this tree))) -+ (avl-tree-size (oref this tree))) - - (defmethod jde-avl-tree-clear ((this jde-avl-tree)) - "Delete all elements of THIS tree." -- (avltree-clear (oref this tree))) -+ (avl-tree-clear (oref this tree))) - - (defclass jde-parse-method-map (jde-avl-tree) - () diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch deleted file mode 100644 index ec03749daa67..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch +++ /dev/null @@ -1,82 +0,0 @@ -Tell the elisp code about the right Java directory. - ---- jde/lisp/jde.el (revision 90) -+++ jde/lisp/jde.el (working copy) -@@ -2448,17 +2448,14 @@ environment variable." - (defmethod initialize-instance ((this jde-bsh) &rest fields) - "Constructor for the JDEE BeanShell instance." - (call-next-method) -- (let* ((jde-java-directory -- (concat -- (jde-find-jde-data-directory) -- "java/"))) -- -- (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory)) -- (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)) -- (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory)) -+ (let ((jde-java-directory "@out@/share/java")) -+ -+ (oset this bsh-cmd-dir "@datadir@/bsh-commands") -+ (oset this checkstyle-jar (expand-file-name "checkstyle-all.jar" jde-java-directory)) -+ (oset this regexp-jar (expand-file-name "jakarta-regexp.jar" jde-java-directory)) - (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory)) -- (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory)) -- (oset this jar (expand-file-name "lib/bsh.jar" jde-java-directory)) -+ (oset this jde-jar (expand-file-name "jde.jar" jde-java-directory)) -+ (oset this jar (expand-file-name "bsh.jar" jde-java-directory)) - (oset-default 'jde-bsh the-bsh this))) - - (defmethod bsh-create-buffer ((this jde-bsh)) - ---- jde/lisp/jde-checkstyle.el (revision 90) -+++ jde/lisp/jde-checkstyle.el (working copy) -@@ -316,10 +316,7 @@ string describing how the compilation fi - (vm-path (oref (jde-run-get-vm) :path)) - (source-file - (concat (file-name-nondirectory buffer-file-name))) -- (jde-java-directory -- (concat -- (jde-find-jde-data-directory) -- "java/")) -+ (jde-java-directory "@out@/share/java") - (args (append - (unless jde-checkstyle-expanded-properties-file - (jde-checkstyle-get-property-args this)) -@@ -328,12 +325,12 @@ string describing how the compilation fi - (if jde-checkstyle-classpath - (jde-build-classpath jde-checkstyle-classpath) - (jde-normalize-path -- (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)))) -+ (expand-file-name "checkstyle-all.jar" jde-java-directory)))) - (list jde-checkstyle-class) - (list "-c" - (if jde-checkstyle-style - (jde-normalize-path jde-checkstyle-style) -- (concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml"))) -+ "@datadir@/sun_checks.xml")) - (if jde-checkstyle-expanded-properties-file - (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file))) - (if jde-checkstyle-module-package-names-file - ---- jde/lisp/jde-dbs.el (revision 90) -+++ jde/lisp/jde-dbs.el (working copy) -@@ -899,9 +899,7 @@ for the breakpoint." - (jde-normalize-path 'jde-run-working-directory) - source-directory)) - (vm (oref (jde-run-get-vm) :path)) -- (jde-java-directory -- (expand-file-name "java" -- (jde-find-jde-data-directory))) -+ (jde-java-directory "@out@/share/java") - (vm-args - (let (args) - (setq args -@@ -912,7 +910,7 @@ for the breakpoint." - (jde-build-classpath - (list - (expand-file-name -- (if jde-bug-debug "classes" "lib/jde.jar") -+ (if jde-bug-debug "classes" "jde.jar") - jde-java-directory) - (if (jde-bug-vm-includes-jpda-p) - (jde-get-tools-jar) diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/js2/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/js2/default.nix deleted file mode 100644 index bc94828ec51d..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/js2/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation { - name = "js2-mode-0-20141118"; - - src = fetchgit { - url = "git://github.com/mooz/js2-mode.git"; - rev = "3abcd90ddc2f446ddf0fb874dd79ba870c26ad2d"; - sha256 = "0sh9ax2w0ydhjjn4vnwbgy3926p7ad6h6nmsnm0a3zlldj9a4vwn"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile js2-mode.el - ''; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/ - ''; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/let-alist/default.nix deleted file mode 100644 index f6fee846f920..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/let-alist/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "let-alist-1.0.3"; - - src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.3.el"; - sha256 = "12n1cmjc7hzyy0jmsdxqz1hqzg4ri4nvvi0p9mw1d6v44xzfm0mx"; - }; - - buildInputs = [ emacs ]; - - unpackPhase = "cp -v ${src} let-alist.el"; - buildPhase = "emacs --batch -f batch-byte-compile let-alist.el"; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - mv -v *.el *.elc $out/share/emacs/site-lisp/ - ''; - - meta = { - homepage = https://elpa.gnu.org/packages/let-alist.html; - description = "Easily let-bind values of an assoc-list by their names"; - license = stdenv.lib.licenses.gpl3Plus; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/logito/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/logito/default.nix deleted file mode 100644 index c324e395fa9e..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/logito/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation rec { - name = "logito-0.1"; - - src = fetchgit { - url = "https://github.com/sigma/logito.git"; - rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052"; - sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile logito.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install logito.el logito.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Tiny logging framework for Emacs"; - homepage = https://github.com/sigma/logito; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix deleted file mode 100644 index b75c51d3bd74..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -stdenv.mkDerivation rec { - name = "lorem-ipsum-0.1"; - - src = fetchurl { - url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el"; - sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src lorem-ipsum.el - emacs --batch -f batch-byte-compile lorem-ipsum.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Insert dummy pseudo Latin text for Emacs"; - homepage = http://www.emacswiki.org/emacs/LoremIpsum; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix index 7f75de74ed63..582a8b5e71b3 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -130,8 +130,6 @@ railgun = callPackage ./railgun { }; - gn = callPackage ./gn { }; - structured-haskell-mode = self.shm; thingatpt-plus = callPackage ./thingatpt-plus { }; @@ -142,4 +140,54 @@ zeitgeist = callPackage ./zeitgeist { }; + # From old emacsPackages (pre emacsPackagesNg) + cedet = callPackage ./cedet { }; + cedille = callPackage ./cedille { cedille = pkgs.cedille; }; + colorThemeSolarized = callPackage ./color-theme-solarized { + colorTheme = self.color-theme; + }; + emacsSessionManagement = callPackage ./session-management-for-emacs { }; + hsc3-mode = callPackage ./hsc3 { }; + hol_light_mode = callPackage ./hol_light { }; + ido-ubiquitous = callPackage ./ido-ubiquitous { }; + ocaml-mode = callPackage ./ocaml { }; + prolog-mode = callPackage ./prolog { }; + rectMark = callPackage ./rect-mark { }; + sunriseCommander = callPackage ./sunrise-commander { }; + + # Legacy aliases, these try to mostly map to melpa stable because it's + # closer to the old outdated package infra. + # + # Ideally this should be dropped some time during/after 20.03 + bbdb3 = self.melpaStablePackages.bbdb; + ocamlMode = self.ocaml-mode; + jade = self.jade-mode; + # scalaMode2 = null; # No clear mapping as of now + flymakeCursor = self.melpaStablePackages.flymake-cursor; + cryptol = self.melpaStablePackages.cryptol-mode; + maudeMode = self.maude-mode; + phpMode = self.melpaStablePackages.php-mode; + idris = self.melpaStablePackages.idris-mode; + rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters; + colorTheme = self.color-theme; + sbtMode = self.melpaStablePackages.sbt-mode; + markdownMode = self.melpaStablePackages.markdown-mode; + scalaMode1 = self.melpaStablePackages.scala-mode; + prologMode = self.prolog-mode; + hsc3Mode = self.hsc3-mode; + graphvizDot = self.melpaStablePackages.graphviz-dot-mode; + proofgeneral_HEAD = self.proof-general; + proofgeneral = self.melpaStablePackages.proof-general; + haskellMode = self.melpaStablePackages.haskell-mode; + writeGood = self.melpaStablePackages.writegood-mode; + erlangMode = self.melpaStablePackages.erlang; + d = self.melpaStablePackages.d-mode; + autoComplete = self.melpaStablePackages.auto-complete; + tuaregMode = self.melpaStablePackages.tuareg; + structuredHaskellMode = self.melpaStablePackages.shm; + xmlRpc = self.melpaStablePackages.xml-rpc; + emacsw3m = self.w3m; + loremIpsum = self.lorem-ipsum; + js2 = self.melpaStablePackages.js2-mode; + } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix deleted file mode 100644 index 7176b289b8b5..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs }: - -let - version = "2.0-82-gfe30ef7"; -in -stdenv.mkDerivation { - name = "markdown-mode-${version}"; - - src = fetchFromGitHub { - owner = "defunkt"; - repo = "markdown-mode"; - rev = "v${version}"; - sha256 = "14a6r05j0g2ppq2q4kd14qyxwr6yv5jwndavbwzkmp6qhmm9k8nz"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta.license = stdenv.lib.licenses.gpl3Plus; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/maude/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/maude/default.nix deleted file mode 100644 index 9b737a938a12..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/maude/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation { - name = "maude-mode-0.2"; - - src = fetchurl { - url = "mirror://sourceforge/maude-mode/maude-mode-0.2.tar.gz"; - sha256 = "19jdd7la0bxxxnnq4ryckf63jykg0r3v92z126x6djaigi3xn1yx"; - }; - - buildInputs = [emacs]; - configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ]; - - meta = { - description = "Emacs mode for the programming language Maude"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.peti ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 9574ec43a612..8b83b5562469 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -6,8 +6,8 @@ To update the list of packages from MELPA, 1. Run ./update-melpa 2. Check for evaluation errors: -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaPackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages 3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` */ @@ -34,7 +34,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); overrides = rec { - shared = { + shared = rec { # Expects bash to be at /bin/bash ac-rtags = markBroken super.ac-rtags; @@ -42,8 +42,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (self.melpaPackages) powerline; }; - # upstream issue: missing file header - bufshow = markBroken super.bufshow; + auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: { + buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ]; + CFLAGS = "-I${external.llvmPackages.clang}/include"; + LDFLAGS = "-L${external.llvmPackages.clang}/lib"; + }); + emacsClangCompleteAsync = auto-complete-clang-async; # part of a larger package caml = dontConfigure super.caml; @@ -64,9 +68,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (self.melpaPackages) easy-kill; }; - # upstream issue: missing file header - elmine = markBroken super.elmine; - elpy = super.elpy.overrideAttrs(old: { propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ]; }); @@ -101,9 +102,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; - # build timeout - graphene = markBroken super.graphene; - pdf-tools = super.pdf-tools.overrideAttrs(old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; @@ -123,14 +121,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac propagatedUserEnvPkgs = [ external.hindent ]; }); - # upstream issue: missing file header - ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; - - # upstream issue: missing file header - initsplit = markBroken super.initsplit; - irony = super.irony.overrideAttrs (old: { cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; + NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server ''; @@ -144,6 +137,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac make check cd ../.. ''; + preFixup = '' + rm -rf $out/share/emacs/site-lisp/elpa/*/server + ''; dontUseCmakeBuildDir = true; doCheck = true; packageRequires = [ self.emacs ]; @@ -158,12 +154,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Expects bash to be at /bin/bash ivy-rtags = markBroken super.ivy-rtags; - # upstream issue: missing file header - jsfmt = markBroken super.jsfmt; - - # upstream issue: missing file header - maxframe = markBroken super.maxframe; - magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -206,13 +196,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - kubernetes = super.kubernetes.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); + kubernetes = super.kubernetes.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); - # upstream issue: missing file header + # upstream issue: missing file header mhc = super.mhc.override { inherit (self.melpaPackages) calfw; }; @@ -223,25 +213,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # part of a larger package notmuch = dontConfigure super.notmuch; - # missing OCaml - ocp-indent = markBroken super.ocp-indent; - - # upstream issue: missing file header - qiita = markBroken super.qiita; - - # upstream issue: missing file header - speech-tagger = markBroken super.speech-tagger; - shm = super.shm.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; }); - # upstream issue: missing file header - tawny-mode = markBroken super.tawny-mode; - # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs(old: { - buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; postBuild = '' @@ -254,26 +231,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac mkdir -p $out/bin install -m755 -Dt $out/bin ./source/server/telega-server ''; - }); - # upstream issue: missing file header - textmate = markBroken super.textmate; - - # missing OCaml - utop = markBroken super.utop; - vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - # upstream issue: missing file header - voca-builder = markBroken super.voca-builder; - - # upstream issue: missing file header - window-numbering = markBroken super.window-numbering; - zmq = super.zmq.overrideAttrs(old: { stripDebugList = [ "share" ]; preBuild = '' @@ -313,9 +277,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }; stable = shared // { + + # upstream issue: missing file header + bufshow = markBroken super.bufshow; + # part of a larger package # upstream issue: missing package version - cmake-mode = markBroken (dontConfigure super.cmake-mode); + cmake-mode = dontConfigure super.cmake-mode; # upstream issue: missing file header connection = markBroken super.connection; @@ -326,47 +294,48 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # missing git egg = markBroken super.egg; - # upstream issue: missing dependency redshank - emr = markBroken super.emr; - - # upstream issue: doesn't build - eterm-256color = markBroken super.eterm-256color; + # upstream issue: missing file header + elmine = markBroken super.elmine; - # upstream issue: missing dependency highlight - evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; + # upstream issue: missing file header + ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; - # upstream issue: missing dependency highlight - floobits = markBroken super.floobits; + # upstream issue: missing file header + initsplit = markBroken super.initsplit; - # missing OCaml - flycheck-ocaml = markBroken super.flycheck-ocaml; + # upstream issue: missing file header + jsfmt = markBroken super.jsfmt; - # upstream issue: missing dependency - fold-dwim-org = markBroken super.fold-dwim-org; + # upstream issue: missing file header + maxframe = markBroken super.maxframe; - # build timeout - graphene = markBroken super.graphene; + # upstream issue: doesn't build + eterm-256color = markBroken super.eterm-256color; # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; # upstream issue: missing file header + qiita = markBroken super.qiita; + + # upstream issue: missing file header + speech-tagger = markBroken super.speech-tagger; + + # upstream issue: missing file header + textmate = markBroken super.textmate; + + # upstream issue: missing file header link = markBroken super.link; - # missing OCaml - merlin = markBroken super.merlin; + # upstream issue: missing file header + voca-builder = markBroken super.voca-builder; # upstream issue: missing file header - po-mode = markBroken super.po-mode; + window-numbering = markBroken super.window-numbering; - # upstream issue: truncated file - powershell = markBroken super.powershell; }; unstable = shared // { - # upstream issue: mismatched filename - ack-menu = markBroken super.ack-menu; - editorconfig = super.editorconfig.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; }); @@ -388,9 +357,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - # upstream issue: mismatched filename - helm-lobsters = markBroken super.helm-lobsters; - # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; @@ -406,9 +372,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac HOME = "/tmp"; }); - # upstream issue: mismatched filename - processing-snippets = markBroken super.processing-snippets; - racer = super.racer.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' substituteInPlace racer.el \ @@ -416,9 +379,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac ''; }); - # upstream issue: missing file footer - seoul256-theme = markBroken super.seoul256-theme; - spaceline = super.spaceline.override { inherit (self.melpaPackages) powerline; }; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/metaweblog/default.nix deleted file mode 100644 index a5633cdfabaa..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/metaweblog/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, emacs, xmlRpc }: - -stdenv.mkDerivation rec { - name = "metaweblog-0.1"; - - src = fetchgit { - url = https://github.com/punchagan/metaweblog.git; - rev = "ceda65048afaa4c7596c7f50ced998c59ef41167"; - sha256 = "a4c10bb1b4be574e560f87d5f07da4e24e5fffe9ecc83e6d4f9325f3a7eb1e2f"; - }; - - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ xmlRpc ]; - - buildPhase = '' - emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el* $out/share/emacs/site-lisp - ''; - - meta = { - description = "An emacs library to access metaweblog based weblogs"; - homepage = https://github.com/punchagan/metaweblog; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/monky/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/monky/default.nix deleted file mode 100644 index 8e35a4e2b571..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/monky/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip }: - -stdenv.mkDerivation { - name = "emacs-monky-20150404"; - - src = fetchurl { - url = "https://github.com/ananthakumaran/monky/archive/48c0200910739b6521f26f6423b2bfb8c38b4482.zip"; - sha256 = "0yp3pzddx7yki9n3qrriqa5p442qyrdivvlc4xbl024vzjyzddrj"; - }; - - buildInputs = [ emacs unzip ]; - - buildPhase = "emacs -L . --batch -f batch-byte-compile *.el"; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 9f8d408dd5a2..becc2dc5dc9b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -5,7 +5,8 @@ let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; in stdenv.mkDerivation { - name = "ocaml-mode-${version}"; + pname = "ocaml-mode"; + inherit version; inherit (ocaml) prefixKey src; # a quick configure to get the Makefile generated. Since diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix deleted file mode 100644 index e03b1a42ab1a..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/offlineimap/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation rec { - rev = "646482203aacdf847d57d0a96263fddcfc33fb61"; - name = "emacs-offlineimap-${rev}"; - - src = fetchgit { - inherit rev; - url = "git://git.naquadah.org/offlineimap-el.git"; - sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - substituteInPlace offlineimap.el --replace "Machine.MachineUI" "machineui" - emacs --batch -f batch-byte-compile offlineimap.el - install -d $out/share/emacs/site-lisp - install offlineimap.el offlineimap.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "OfflineIMAP support for Emacs"; - homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/org/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org/default.nix deleted file mode 100644 index a8250ead7b48..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/org/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ fetchurl, stdenv, emacs, texinfo, texlive }: - -stdenv.mkDerivation rec { - name = "org-8.3.3"; - - src = fetchurl { - url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "1vhymmd41v7an457xdjhk5zfc4q1x7z64b25rs1ccam5p550cq65"; - }; - - buildInputs = [ emacs ]; - nativeBuildInputs = [ (texlive.combine { - inherit (texlive) scheme-small cm-super; - }) texinfo ]; - - configurePhase = - '' sed -i mk/default.mk \ - -e "s|^prefix\t=.*$|prefix=$out/share|g" - ''; - - postBuild = - '' make doc - ''; - - installPhase = - '' make install install-info - - mkdir -p "$out/share/doc/${name}" - cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}" - - mkdir -p "$out/share/org" - cp -R contrib "$out/share/org/contrib" - ''; - - meta = { - description = "Org-Mode, an Emacs mode for notes, project planning, and authoring"; - - longDescription = - '' Org-mode is for keeping notes, maintaining ToDo lists, doing project - planning, and authoring with a fast and effective plain-text system. - - This package contains a version of Org-mode typically more recent - than that found in GNU Emacs. - ''; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ pSub ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/org2blog/default.nix deleted file mode 100644 index 5c1aec7e02b7..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/org2blog/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, emacs, org, xmlRpc, metaweblog }: - -stdenv.mkDerivation rec { - name = "org2blog-0.8.1"; - - src = fetchgit { - url = https://github.com/punchagan/org2blog.git; - rev = "5f573ff3e4007c16517a5fe28c4f5d8dde3f8a77"; - sha256 = "e83c08ceece92bb507be70046db4a7fa87a4af34ad3f84a727e0bd6a1dd99a33"; - }; - - buildInputs = [ emacs ]; - propagatedUserEnvPkgs = [ org xmlRpc metaweblog ]; - - buildPhase = '' - emacs -L . -L ${org}/share/emacs/site-lisp/org \ - -L ${xmlRpc}/share/emacs/site-lisp \ - -L ${metaweblog}/share/emacs/site-lisp \ - --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el* $out/share/emacs/site-lisp - ''; - - meta = { - description = "Publish directly from Emacs’ org-mode to WordPress blogs"; - homepage = https://github.com/punchagan/org2blog; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/pcache/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/pcache/default.nix deleted file mode 100644 index f4dcf03dee84..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/pcache/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, emacs }: - -stdenv.mkDerivation rec { - name = "pcache-0.2.3"; - - src = fetchgit { - url = "https://github.com/sigma/pcache.git"; - rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6"; - sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs --batch -f batch-byte-compile pcache.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install pcache.el pcache.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Persistent caching for Emacs"; - homepage = https://github.com/sigma/pcache.el; - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/php/builder.sh b/nixpkgs/pkgs/applications/editors/emacs-modes/php/builder.sh deleted file mode 100644 index 85c448480571..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/php/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/share/emacs/site-lisp -cd $out/share/emacs/site-lisp -tar xvfz $src -mv php-mode-*/* . -rmdir php-mode-* diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/php/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/php/default.nix deleted file mode 100644 index 2b3cf7b29712..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/php/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "php-mode-1.5.0"; - - src = fetchurl { - url = "mirror://sourceforge/php-mode/${name}.tar.gz"; - sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq"; - }; - - builder = ./builder.sh; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix index b01c526aa8e4..337a1585b1b4 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -17,5 +17,8 @@ stdenv.mkDerivation { homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/; description = "Prolog mode for Emacs"; license = stdenv.lib.licenses.gpl2Plus; + + # Has wrong sha256 + broken = true; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix deleted file mode 100644 index 0f7ac1d1dc80..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }: - -stdenv.mkDerivation rec { - name = "ProofGeneral-${version}"; - version = "4.4"; - - src = fetchFromGitHub { - owner = "ProofGeneral"; - repo = "PG"; - rev = "v${version}"; - sha256 = "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8"; - }; - - buildInputs = [ emacs which ] ++ stdenv.lib.optionals enableDoc [ texinfo texLive ]; - - prePatch = - '' sed -i "Makefile" \ - -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ - s|/sbin/install-info|install-info|g" - - sed -i "bin/proofgeneral" -e's/which/type -p/g' - - chmod +x bin/proofgeneral - - # @image{ProofGeneral-image} fails, so remove it. - sed -i '91d' doc/PG-adapting.texi - sed -i '96d' doc/ProofGeneral.texi - '' + stdenv.lib.optionalString enableDoc - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - ''; - - patches = [ ./pg.patch ]; - - installTargets = [ "install" ] ++ stdenv.lib.optional enableDoc "install-doc"; - - meta = { - description = "Proof General, an Emacs front-end for proof assistants"; - longDescription = '' - Proof General is a generic front-end for proof assistants (also known as - interactive theorem provers), based on the customizable text editor Emacs. - ''; - homepage = http://proofgeneral.inf.ed.ac.uk; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; # arbitrary choice - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix deleted file mode 100644 index de72b24f87ac..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: - -stdenv.mkDerivation (rec { - name = "ProofGeneral-unstable-${version}"; - version = "2018-01-30"; - - src = fetchFromGitHub { - owner = "ProofGeneral"; - repo = "PG"; - rev = "945cada601c5729edd16fcc989a3969c8b34d20a"; - sha256 = "1zjmbhq6c8g8b93nnsvr5pxx6mlcndb0fz152b2h80vfh9663cn8"; - }; - - buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; - - prePatch = - '' sed -i "Makefile" \ - -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ - s|/sbin/install-info|install-info|g" - - # @image{ProofGeneral} fails, so remove it. - sed -i '94d' doc/PG-adapting.texi - sed -i '96d' doc/ProofGeneral.texi - ''; - - preBuild = '' - make clean; - ''; - - installPhase = - if enableDoc - then - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - make install install-doc - '' - else "make install"; - - meta = { - description = "Proof General, an Emacs front-end for proof assistants"; - longDescription = '' - Proof General is a generic front-end for proof assistants (also known as - interactive theorem provers), based on the customizable text editor Emacs. - ''; - homepage = http://proofgeneral.inf.ed.ac.uk; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; # arbitrary choice - }; -}) diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch deleted file mode 100644 index 704e4b6c8c7a..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r c7d8bfff4c0a bin/proofgeneral ---- a/bin/proofgeneral Sat Sep 27 02:25:15 2014 +0100 -+++ b/bin/proofgeneral Sat Sep 27 02:28:16 2014 +0100 -@@ -73,11 +73,7 @@ - - # Try to find Proof General directory - if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then -- # default relative to this script, otherwise PGHOMEDEFAULT -- MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`" -- if [ -d "$MYDIR/generic" ]; then -- PGHOME="$MYDIR" -- elif [ -d "$PGHOMEDEFAULT" ]; then -+ if [ -d "$PGHOMEDEFAULT" ]; then - PGHOME="$PGHOMEDEFAULT" - else - echo "Cannot find the Proof General lisp files: Set PGHOME or use --pghome." diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/quack/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/quack/default.nix deleted file mode 100644 index 94cb3104ecc6..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/quack/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ fetchurl, stdenv, emacs }: - -stdenv.mkDerivation { - name = "quack-0.39"; - - src = fetchurl { - # XXX: Upstream URL is not versioned, which might eventually break this. - url = "http://www.neilvandyke.org/quack/quack.el"; - sha256 = "1q5bsllxkibiddwp32306flqm8s3caffnpbqz5ka260avllp4jj5"; - }; - - buildInputs = [ emacs ]; - - dontUnpack = true; - dontConfigure = true; - installPhase = "true"; - - buildPhase = '' - emacsDir="$out/share/emacs/site-lisp" - - mkdir -p "$emacsDir" - cp -v "$src" "$emacsDir/quack.el" - emacs --batch -f batch-byte-compile "$emacsDir/quack.el" - ''; - - meta = { - description = "Enhanced Emacs support for editing and running Scheme code"; - homepage = http://www.neilvandyke.org/quack/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix deleted file mode 100644 index 2b4223cdc1fd..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, emacs}: - -let version = "1.3.13"; - -in stdenv.mkDerivation { - name = "emacs-rainbow-delimiters-${version}"; - - src = fetchurl { - url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; - sha256 = "075j3nsk4jm0rs5671n28c1wksrfbvpl9a4f89kzcd7sk1h6ncvl"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 00bcb16b31b4..def54a99e68d 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,11 +31,11 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20190801, - 902 + 20190819, + 1232 ], - "commit": "129585c4096e78f46b741c7729915f666bfee501", - "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889" + "commit": "9d195764bfd1f2da7dc50ed73e70f3e5ac8610f5", + "sha256": "1x99ifgsxb3xn18hihral1qc6c30w824blqjhr9kpx4shh42g9f5" }, "stable": { "version": [ @@ -961,22 +961,22 @@ "auto-complete", "yasnippet" ], - "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b", - "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95", - "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" } }, { @@ -987,8 +987,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20190601, - 622 + 20190816, + 548 ], "deps": [ "dash", @@ -998,14 +998,14 @@ "s", "xcscope" ], - "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b", - "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], "deps": [ "dash", @@ -1015,8 +1015,8 @@ "s", "xcscope" ], - "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95", - "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" } }, { @@ -1065,8 +1065,8 @@ "auto-complete", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -1812,14 +1812,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20190218, - 2331 + 20190828, + 1828 ], "deps": [ "cl-lib" ], - "commit": "3803f24020ef0a656dc5345713c4964073aec9a8", - "sha256": "0dbg4lmzq0r7pvqx0wqxdcnmqz76nk9sdbwg276cmflqj9m0q7z1" + "commit": "c28246ba09d53e32cd9d8cafb1830f50387d9985", + "sha256": "19qklr4wqy55cb2133qlnrhf9yggsf096l14glw4jwpvx3cn61dd" }, "stable": { "version": [ @@ -2136,16 +2136,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20190607, - 1635 + 20190816, + 2205 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "ee1326aa8f1a0146ea10dc6f91d0a72584fa8b18", - "sha256": "1h7b606wcmasqxcfbgxfq1m06zns9yi1vi3smp1qgj5rpkrlhxz0" + "commit": "95a735e6947b0d09dbf9b9a944a21e5f5c1e6ee1", + "sha256": "0dqk6jnmfqhxcy4hd9a09632c9gfl7hg4vksp6p0k6wrz9yx6qsf" }, "stable": { "version": [ @@ -2854,10 +2854,10 @@ }, { "ename": "ansible-doc", - "commit": "1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9", - "sha256": "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "1gn334v5k1i3wsh1i53vnjj2y7kv4vba9yiwgiwz0pn7wd26wk5s", "fetcher": "github", - "repo": "lunaryorn/ansible-doc.el", + "repo": "emacsorphanage/ansible-doc", "unstable": { "version": [ 20160924, @@ -3325,11 +3325,11 @@ "repo": "ukaszg/aria2", "unstable": { "version": [ - 20141107, - 2317 + 20190816, + 25 ], - "commit": "7a944c5100812269369225af7aa9580fedab175f", - "sha256": "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji" + "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261", + "sha256": "0hsmjmgbsvdim1vxzh0qh41f9vmpsh8rlsy2h508ydw82rpc2q6f" } }, { @@ -3764,11 +3764,11 @@ "repo": "DamienCassou/auth-password-store", "unstable": { "version": [ - 20190812, - 936 + 20190813, + 1026 ], - "commit": "2039468bb800d676ff02a76c8fabda168696b564", - "sha256": "07q7hjk40rz0cji1ygmybkwn6pm86m8fzkisdv920qpi6i2jhgvz" + "commit": "847a1f54ed48856b4dfaaa184583ef2c84173edf", + "sha256": "0g48z5w6n3c54zqfpx65dfyl9jqbl15idvbb1hhw2pd9f9r8fykk" }, "stable": { "version": [ @@ -4382,14 +4382,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20190809, - 735 + 20190821, + 209 ], "deps": [ "f" ], - "commit": "4d7aeeeff339683a5d4eed05de357058a11f2e02", - "sha256": "10zbillf66bnhni08x159w4nrd08x8zsagam3c7c7555p1ccf5rk" + "commit": "b589d7c8653204fe07b3355a51d5b622ac6a647a", + "sha256": "10ini7q91gbkvmk6j7fcybgdv5jrhfpk6dfwyl2vcb1nlkxfbnzc" } }, { @@ -4583,8 +4583,8 @@ 20190331, 2230 ], - "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", - "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" + "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", + "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" } }, { @@ -4690,14 +4690,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20190630, - 1538 + 20190828, + 951 ], "deps": [ "cl-lib" ], - "commit": "66886e265cf41c6061dc70440eb5b61fad8f48e0", - "sha256": "101qbj6cx3358r1hr0jj8y1bsz24ci5qbc8k4lcw35llcsdvaivw" + "commit": "034de4c0e900717ebcb6e19a973cf66beea54420", + "sha256": "0ssvnbvmdvjqpdswn68lwv2xi8mdfx8iyvs38mqc45f4502ahbjx" }, "stable": { "version": [ @@ -4961,11 +4961,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20180629, - 2159 + 20190821, + 1808 ], - "commit": "096e632bf100d318754d6c961c90ebb0ef29dce5", - "sha256": "0w9ng4rhsawcf96mnpy71h50j4mankmvjnfknxlmwiwlmx4sp0f1" + "commit": "5a7a9b70f368fc77bac2c9c2d10dee4ad9f03987", + "sha256": "0sbmvyf6y73c0rw5yi6rgri29qidr1hpwqlgdass9rrzdnq5i3zg" } }, { @@ -5082,6 +5082,21 @@ } }, { + "ename": "baidu-translate", + "commit": "c9cdf13f64a1de8c57dcb90229da0f62a8e14e7a", + "sha256": "0m8pqnp57bmk41wij5a0dcilg09p992q5413llfac41b6biqf2yd", + "fetcher": "github", + "repo": "liShiZhensPi/baidu-translate", + "unstable": { + "version": [ + 20190817, + 1318 + ], + "commit": "b04a74d09ff5e3fbefd1b39b2abe79a9e272321a", + "sha256": "0qja8xw2sk2wn7w6qa5zj2i0j5c8a7cnldrag99ip2b5m02f1z4l" + } + }, + { "ename": "bang", "commit": "d9830cce42339243091f4463490954a8a955c65f", "sha256": "1dx1130095ij09ix20jyqradkjw9gpdfpw0d9f3krrx6xjqfn2sk", @@ -5089,20 +5104,20 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20190727, - 2122 + 20190819, + 1339 ], - "commit": "55f3e2a7fc240bf7754dc3de47514095c76f89be", - "sha256": "1mcyvwzbbghz3k9ww0iml55awkkndk57bdvl6apcljwgjqd6rkrb" + "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", + "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" }, "stable": { "version": [ + 1, 0, - 2, - 0 + 1 ], - "commit": "253d4bc87ec6beb12e5c6f5569a354907adb8679", - "sha256": "0gjzzqj46fc2ifzrp33cy4q0wbqdjmwmnc6mq042n1imdg5s0hg3" + "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", + "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" } }, { @@ -5204,11 +5219,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20190516, - 1854 + 20190820, + 1804 ], - "commit": "61592a1ce11efdff1d18bb7675c651a8f914c10d", - "sha256": "09chkvcwy12h24wlb92hjyanrsfc1nc735h8bpi0ffy1i8lxmlfm" + "commit": "504dd26b1de326ec03d2c45f2d2db1ad59481adf", + "sha256": "041zrjlc0n3l1r8gyd78i14jkl2mf3pfsk37malmsllf3067ambz" }, "stable": { "version": [ @@ -5495,26 +5510,26 @@ "repo": "unhammer/bbdb2erc", "unstable": { "version": [ - 20170221, - 1354 + 20190822, + 907 ], "deps": [ "bbdb" ], - "commit": "15db2bd29df0f6ee32c499fdeffb960b6a7f97a0", - "sha256": "0jlm6qffhh84vy5wmkxmsm5i4dp87cfh7zr5kvrw72zyww986kn4" + "commit": "40b89e961762af3e7ade3a1844a9fbcd4084ac65", + "sha256": "1faa32ya515rkx5pwz6bsav0ffyajq8vq8d3vzn9j81d9in2rh5j" }, "stable": { "version": [ 0, 1, - 3 + 5 ], "deps": [ "bbdb" ], - "commit": "f39a36351e1e6f1105c9e32970e7502b77b0dbcd", - "sha256": "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs" + "commit": "40b89e961762af3e7ade3a1844a9fbcd4084ac65", + "sha256": "1faa32ya515rkx5pwz6bsav0ffyajq8vq8d3vzn9j81d9in2rh5j" } }, { @@ -5932,8 +5947,8 @@ "a", "pdf-tools" ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -6680,29 +6695,29 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20190802, - 959 + 20190828, + 655 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "a1df9a6d8d01ead25583ec086de71e3d5840eba9", - "sha256": "0ak04sh49zkgz66hbgwvjmdxnxs4zsx1aw5yx79r0fd5rpxscxfi" + "commit": "623174d015d4ba867e4decf0fcd439b51262f0a9", + "sha256": "19qm2i4pba9kbaw70cdchvmv9jgs2vxnlrz9jqpcn864z3k887iw" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "d9f0545708bbbbe3df23b2b91cdd2824beb0df56", - "sha256": "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8" + "commit": "270ae67b3136ac355d2aed5b4690ae28edaf7c29", + "sha256": "1ss9bjs34q41pa0g0nbdzd8fwpjcbd2239rdlx5aykfv9v0b8j77" } }, { @@ -7160,15 +7175,15 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20190622, - 317 + 20190815, + 502 ], "deps": [ "choice-program", "dash" ], - "commit": "e6b896aca7f62a6587b593c500b31624d4414eca", - "sha256": "10mkss1dmnx1qzgra4xf1jl7gjv61rjdrszkcwwnhf65wa2pjhbk" + "commit": "47852b908a0d9a059e9f8cd7797229ecf6259b8c", + "sha256": "1zxlw2kkkfa0pgxzk7qcjxy77g0r3grnnv4sa6zjhmh9kh7jgf75" }, "stable": { "version": [ @@ -7580,11 +7595,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20181202, - 1607 + 20190828, + 2027 ], - "commit": "810fa6fb8dab06610dbf2b5ccbc64b4d0ecc7485", - "sha256": "0dckgcyzsav6ld78bcyrrygy1cz1jvqgav6vy8f6klpmk3r8xrl1" + "commit": "9d172a74373916f571f6fe3292bdc66cd3f28779", + "sha256": "10xm856x58zgki2d9gr4rqqlkd3f8pl24z657qa7d3lkzs2av9a2" }, "stable": { "version": [ @@ -8026,8 +8041,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20190709, - 444 + 20190828, + 2340 ], "deps": [ "anaconda-mode", @@ -8036,8 +8051,8 @@ "ivy", "tree-mode" ], - "commit": "ef4845e7bd8ae577f9b919b6a74380493bca5de8", - "sha256": "1sypqnlwsv5gmrvcfz7dgfc81b24672njjw2va3yycvpv68pbii7" + "commit": "8ccb0323651155e3407ee5649b1a0355fd70ffe2", + "sha256": "0xflaqv88saq6i2wdggrwh06i9svp7v5070rmd860wg1pwi0qm81" }, "stable": { "version": [ @@ -8137,30 +8152,30 @@ "repo": "kisaragi-hiu/cangjie.el", "unstable": { "version": [ - 20190322, - 1134 + 20190829, + 1530 ], "deps": [ "dash", "f", "s" ], - "commit": "f4dcb691e3bda6971cb89b07f368dd285179a8ff", - "sha256": "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2" + "commit": "b34a28dd06bd95a16b655f1917227925975314bc", + "sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1" }, "stable": { "version": [ 0, 7, - 2 + 4 ], "deps": [ "dash", "f", "s" ], - "commit": "f4dcb691e3bda6971cb89b07f368dd285179a8ff", - "sha256": "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2" + "commit": "b34a28dd06bd95a16b655f1917227925975314bc", + "sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1" } }, { @@ -8204,15 +8219,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20190729, - 708 + 20190816, + 1046 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "626fd89986eab229e2fe36b38ac60697ed7a805b", - "sha256": "0aa57v2gxmj67i7dlqhg934nj023ldfn32pzjs2hnqnq3w3srnfv" + "commit": "f70b060c97f0df6ec6487968dfdfae8ec97a080f", + "sha256": "1qaz6m34j4khw27nkb8yfcy1iprcldbl7jjwzsljw1i2yfc1xqj0" }, "stable": { "version": [ @@ -8803,8 +8818,8 @@ 20171115, 2108 ], - "commit": "2a473e3acb297086c988a84972ab37f77fabaaa9", - "sha256": "0piak5l66al28xg9m7ypv83l12q3v9fcndvnnarqvpmh5db1alp1" + "commit": "35d777b0fd54b574b42cf61c202bf077ed986e8f", + "sha256": "1p63w0i71vsysdp05mh05pvbpmhdvbjmiv3zgfdsim9k55lbn5pz" }, "stable": { "version": [ @@ -9335,14 +9350,14 @@ "repo": "SavchenkoValeriy/emacs-chocolate-theme", "unstable": { "version": [ - 20190811, - 1414 + 20190818, + 756 ], "deps": [ "autothemer" ], - "commit": "7b005d9ef522ccde84fc9488fa6ea3cc429f9c48", - "sha256": "176f7gcpzzsr74cspcm0f44bxpb8a4244zzljlqfpksfg8qpf23d" + "commit": "7de46341adcc7a5eaafcddc0d3a9d63274f5e9c7", + "sha256": "0s61lx5vhx01xzzqxy0blz6jxvljb8qjj3567nz17pwwdfcskc5v" } }, { @@ -9353,14 +9368,11 @@ "repo": "plandes/choice-program", "unstable": { "version": [ - 20190721, - 1854 - ], - "deps": [ - "cl-lib" + 20190817, + 2153 ], - "commit": "215e8ab6acc47f240b12bd11ab387da7f5de885d", - "sha256": "14sp47l7j7sv3bsrnwzqz6mzn3wwv4s75r5my6vjh39pn0qshfh1" + "commit": "583242445e7890a12bb674b43244bf27c84d91f6", + "sha256": "08pbh4z3xbpk62a2m6shdpw2g44158di8pb9rjszfcpd5m6m2lf2" }, "stable": { "version": [ @@ -9445,8 +9457,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20190811, - 1423 + 20190829, + 613 ], "deps": [ "clojure-mode", @@ -9457,8 +9469,8 @@ "sesman", "spinner" ], - "commit": "31f83dfadbf0d180a6273f8b19429e12bc23ef3a", - "sha256": "0bwjg4fgn9l9xjk4q7mkn56nlvygfjg5hzfdy3hy2k6a2w4s9ka0" + "commit": "f350c7431330ca7cd2f01a1fddefbb637d3e3493", + "sha256": "0zvk6kcs1v6gfv7d48inqqa7hwn5aghhkmycn0wdiarkcdhagjmi" }, "stable": { "version": [ @@ -9534,15 +9546,15 @@ "repo": "clojure-emacs/cider-hydra", "unstable": { "version": [ - 20181015, - 727 + 20190816, + 1121 ], "deps": [ "cider", "hydra" ], - "commit": "5956c3909cd9beae11f64973e4f0d830cea7860d", - "sha256": "1hnari85c4y5sc8cdv2idkg2qv058crz54xdidnphr1wgw5zhvpk" + "commit": "c3b8a15d72dddfbc390ab6a454bd7e4c765a2c95", + "sha256": "0qrxja9bxx07m1ij8ly36sib901a6qhczgxsp4ap4wszy63lx93r" }, "stable": { "version": [ @@ -9803,8 +9815,8 @@ 20181130, 230 ], - "commit": "e205b96f944a4f312fd523804cbbaf00027a3c8b", - "sha256": "03xmpgpd4zw9x4shkz9aa744ifnwfblnq369qsp3r1awjacksrg3" + "commit": "f215866d7d7c52e84220cd541f40608a5b85abf0", + "sha256": "1k8x48cayanwajz81h5kfysqvnf58wrb9j4f9rbaqzg2nrnqw5sm" }, "stable": { "version": [ @@ -9834,6 +9846,24 @@ } }, { + "ename": "clang-format+", + "commit": "9ee8e3de203fb3259202bf847f020259a7f07a74", + "sha256": "0r9n962q0nq8x3r4vyrdfmw74wsvxw7lxizvklxcsm421qpnzyfa", + "fetcher": "github", + "repo": "SavchenkoValeriy/emacs-clang-format-plus", + "unstable": { + "version": [ + 20190824, + 2216 + ], + "deps": [ + "clang-format" + ], + "commit": "ddd4bfe1a13c2fd494ce339a320a51124c1d2f68", + "sha256": "0y97f86qnpcscwj41icb4i6j40qhvpkyhg529hwibpf6f53j7ckl" + } + }, + { "ename": "clean-aindent-mode", "commit": "ee9dac7c10e652f026643620418dfea9237a0d23", "sha256": "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4", @@ -10388,11 +10418,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20190811, - 1842 + 20190826, + 2117 ], - "commit": "195ef1d55cf0e9aa25a257c93f1cff5ecf807374", - "sha256": "011f7x1qdjpz9vz76nd743fzlk2lp696286x2q3gmdhrmg7h3csc" + "commit": "9422a25a1d7e73176b0c8b81cf4be1f722d6304a", + "sha256": "085kj8wzm21fdli0ycdj117306pc9j0a6r17w9kzy7ckzax54zc6" } }, { @@ -10526,8 +10556,8 @@ 20190710, 1319 ], - "commit": "7d194f7d8331a127e0b2b921dc6bc0abfe21a0f5", - "sha256": "0gqpm4cgcx176kamgx8p3vxxf9r41ckxy20gdw153fqbba2prsip" + "commit": "c0d21d763b13e280ccf7a387ba690650db014646", + "sha256": "072m458y9sazjmp7z0i1c3wppnwqry1lb2crf6k0v9fk3l78zknz" }, "stable": { "version": [ @@ -11021,11 +11051,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20190809, - 1314 + 20190826, + 1340 ], - "commit": "025cda606860800fe32a81e25e81e18e2d841069", - "sha256": "0c6ibf29gxnm53q1xsrnfcl8r93apqpcljgj4m9knzswizxb2mqs" + "commit": "2ef60a4de1d0973e53e97cc08db4c0a510a2669f", + "sha256": "1f0829zipvckcgnl5kv9msdpya8q67p72rlkg0hb6z5ik095n2yq" }, "stable": { "version": [ @@ -11407,11 +11437,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20190430, - 1852 + 20190821, + 658 ], - "commit": "ad6ff0eecca99dc5ac8b6a8a6174df7d2ad88ae7", - "sha256": "0cps5sl9iij1wrpcnhi7xqv58cqsrswhc8r7hj1c00w8288z978w" + "commit": "1120b56bd1154a17e4c0b950cbdba4c85be28e2a", + "sha256": "0pi6n1ggxb2i8x8f2wf1il8wcm6rd6ilvgbbh7ni95by1c987vbp" }, "stable": { "version": [ @@ -11601,14 +11631,14 @@ "repo": "randomphrase/company-c-headers", "unstable": { "version": [ - 20180814, - 1730 + 20190825, + 1631 ], "deps": [ "company" ], - "commit": "41331192b3961c8e3a51540678e1d11eaa346f03", - "sha256": "1hl14pv8splirzr9riak8m48ngxy1c6wa2q6ds6aq849zx9dafqh" + "commit": "5e676ab0c2f287c868b1e3931afd4c78895910cd", + "sha256": "18zyzhjnlbwblgqgr876ynrc7k736lg5s6bgxmxph7gymdz4fb4h" } }, { @@ -11925,6 +11955,25 @@ } }, { + "ename": "company-fuzzy", + "commit": "3c3957d27d4208db45e7545f86ad1c25f53ec532", + "sha256": "0yxr0j3zdsf8xfy2mk4ybnjfv6g861772dshbd6v4p3q0pbhhhg6", + "fetcher": "github", + "repo": "elpa-host/company-fuzzy", + "unstable": { + "version": [ + 20190812, + 204 + ], + "deps": [ + "company", + "s" + ], + "commit": "a97f55b60f427e536e637898d12792154d134aab", + "sha256": "1iw1vk1pgdacvfh17n45kk98rxml3f6kxnijmpp7fzz4q07yiv7w" + } + }, + { "ename": "company-ghc", "commit": "28f6a983444f796c81df7e5ee94d74c480b21298", "sha256": "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn", @@ -12373,22 +12422,22 @@ "cl-lib", "company" ], - "commit": "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b", - "sha256": "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "710aca14d2d5035f338b8e76ed042d3bc7524e95", - "sha256": "01hrsxq1m9rxmsn1xfmj8k8w19gf9xj4hqy0aqrqs0cx2f74rxrw" + "commit": "4490d168778a61a4ee8623defe760164cd9745b8", + "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" } }, { @@ -12399,15 +12448,15 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190812, - 1454 + 20190823, + 1219 ], "deps": [ "company", "phpactor" ], - "commit": "01ced487c673e027332ecb99c444f819b05ab40b", - "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" + "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", + "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" }, "stable": { "version": [ @@ -12647,15 +12696,15 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20180730, - 338 + 20190821, + 449 ], "deps": [ "company", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -12829,8 +12878,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20190811, - 2013 + 20190829, + 1801 ], "deps": [ "cl-lib", @@ -12839,8 +12888,8 @@ "s", "unicode-escape" ], - "commit": "df5e5fbfdb2ac174c031b75576a059429c6fb3a3", - "sha256": "0vxj9dm7h082i4jj8h8nh164jgdyxqr2fdavn2biwxijmdykp63p" + "commit": "2cbfea20d342d1a259b27b99185c2d822aba3094", + "sha256": "06vndicjzm19hk5kb7sxs3ljf559wfnvql1hlpfqlhhgjhgsw17c" } }, { @@ -13584,14 +13633,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190809, - 1548 + 20190830, + 1557 ], "deps": [ "swiper" ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -13683,16 +13732,16 @@ "repo": "nathankot/counsel-dash", "unstable": { "version": [ - 20190510, - 708 + 20190823, + 1334 ], "deps": [ "cl-lib", "counsel", "dash-docs" ], - "commit": "5856b8766956428c183a2df911a05f845d014041", - "sha256": "1x0y6w5ivicckllznvljad42hgmbnilkrx9bz7rs4clr1baxzvyh" + "commit": "24d370be9e94e90d045c49967e19484b9903fce9", + "sha256": "18gp7hhgng271c7bh06k9p24zqic0f64j5cicivljmyk9c3nh7an" }, "stable": { "version": [ @@ -13725,8 +13774,8 @@ "counsel", "ivy" ], - "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8", - "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9" + "commit": "d7fcec59c4ba919b93018d4d61da0c154233c66b", + "sha256": "1pawczhhb7im1q314wsba9fwcks04kddg1vv8mcpiad237mf5dx4" }, "stable": { "version": [ @@ -13874,15 +13923,15 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20190724, - 1903 + 20190817, + 102 ], "deps": [ "counsel", "projectile" ], - "commit": "90d3792ab90559a9de6ad419dbfb2435a36a224d", - "sha256": "0m1rcmk9qnwr5zlsw8wzyvs3an1jqy5nvlm7lcsvzfkvzpn52ad0" + "commit": "fda7f0bad93a471fddf5fa01d6fdee5684e7f880", + "sha256": "097ksmy85lf9zfi6v2xz9bxl54l0il6v0ybj1305qg6g8xampbdw" }, "stable": { "version": [ @@ -13935,6 +13984,25 @@ } }, { + "ename": "counsel-test", + "commit": "5b21ac3eaacfff27ca4def04f6cf7b4888b7fcf4", + "sha256": "0604kmj0ydfps2si0wvgjw41x2ds7dmsd53x50219f65d4w44nqr", + "fetcher": "github", + "repo": "xmagpie/counsel-test", + "unstable": { + "version": [ + 20190819, + 1920 + ], + "deps": [ + "ivy", + "s" + ], + "commit": "7fc4e5d0d65c53edbcb4c25917bcf7faaea36ec7", + "sha256": "1xlcn99iizfv3wi701r6q176wicvpdsrz9k1jbyr65r6aw8am8fl" + } + }, + { "ename": "counsel-tramp", "commit": "e1822b735b6bd533f658bd64ddccda29e19e9a5e", "sha256": "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5", @@ -14396,11 +14464,11 @@ "repo": "emacs-pe/crontab-mode", "unstable": { "version": [ - 20190304, - 1423 + 20190827, + 1300 ], - "commit": "090ed61e919df6391df45a7645a0d8d5b0dae1cb", - "sha256": "1yz9vvh2x6s2y02n1z8aqgb40bxgs2s2mxmy1vmp2piffq81d09y" + "commit": "9acbb426c6bfb832e1e83f10fe01a8829452eb7e", + "sha256": "04wyngg5n5dr4ninfljl3n0gqx0pik5jbj6ny79bchrnxlh22f3k" } }, { @@ -15063,8 +15131,8 @@ 20190111, 2150 ], - "commit": "8cf109c0f19ad8c36b8a5368d138912495963387", - "sha256": "07wmv5hgi7db1cx6xrjsa8r337frm3cx38l1jglr9kf5qkw917q1" + "commit": "00c1dc96af0e44741dc777f96a2eb5769f572bb3", + "sha256": "0hkh3844kaawhqh90cqpskh9ifm6cs6i3d2bwkbrrjrkyig9qp38" }, "stable": { "version": [ @@ -15099,20 +15167,20 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20181205, - 607 + 20190826, + 2244 ], - "commit": "b5d936dfd4c1d0b68a0d911aadd4ba25df7af0e4", - "sha256": "0915kb9jcaixgindhj85fmykkhvj31ckp1yg6746fznwdgfrlifv" + "commit": "f3843276e235c6b633ba5367f78d74fe7c04e244", + "sha256": "066kjyvginjp2cqmdi8ybrr558074m8wqd0jrwsicn4dps3njvcn" }, "stable": { "version": [ 2, 0, - 9 + 10 ], - "commit": "98af62e67026fee1dda9155e1a463917fc83802e", - "sha256": "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj" + "commit": "b5d936dfd4c1d0b68a0d911aadd4ba25df7af0e4", + "sha256": "0915kb9jcaixgindhj85fmykkhvj31ckp1yg6746fznwdgfrlifv" } }, { @@ -15230,8 +15298,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20190629, - 652 + 20190826, + 1656 ], "deps": [ "company", @@ -15242,8 +15310,8 @@ "lcr", "s" ], - "commit": "8090286a5dd498de281ce1b1c14a47b9913198c8", - "sha256": "0yq03jk34if8qzxxbxvgszw0rly0l3k13rkc2msq0hx5j98z0yrj" + "commit": "a25ae9e5b5425cffdd88d498777e90ea8655fa37", + "sha256": "1ziw3snbs2z2cg8a3jbyjd48qkgrkzs4bh8lrbs0h2c87nzldvhd" }, "stable": { "version": [ @@ -15271,8 +15339,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20190810, - 1131 + 20190823, + 1240 ], "deps": [ "bui", @@ -15283,8 +15351,8 @@ "s", "tree-mode" ], - "commit": "f01c7d2a32ce04d6643771a6e4d38fd1fb3bfbe6", - "sha256": "1nv7h16wy60rhylbc5zd79i4mf5gy76j7h6qgq0jql607pqkrjxr" + "commit": "368a0ac922d03b6ad0d2d782823ef30b3072866a", + "sha256": "0zml4kskwz01myki3acbfrfqzgwyw1bsvppijmfi4d24jk04lydk" }, "stable": { "version": [ @@ -15470,11 +15538,11 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20190808, - 2226 + 20190827, + 2102 ], - "commit": "9b65aae8c79132275733ee4324948446c88a6b93", - "sha256": "0149axzm52f2j80qpcafb6db2knzrmp43ln0zcx4dj1qsrmq5mbj" + "commit": "04fcd649f19d49390079fbf2920a10bf37f6a634", + "sha256": "1rpdrq8w8vishjpakxvj20dgnnp2qksi1nrd0qllllb5sjyih56d" }, "stable": { "version": [ @@ -15493,6 +15561,42 @@ } }, { + "ename": "dart-server", + "commit": "e798e4fbe5a1d1dbe08c9bfc5c54d32cfe4bde62", + "sha256": "1w7qxd78cnxycg34hxlcw8yda2ixkl683k7mxm20wfqyg5f46bxm", + "fetcher": "github", + "repo": "bradyt/dart-server", + "unstable": { + "version": [ + 20190817, + 1254 + ], + "deps": [ + "cl-lib", + "dash", + "flycheck", + "s" + ], + "commit": "aba838e8ee2f30309f366e8a91c17616549003ce", + "sha256": "0lwss1s1n2kfy0i8nwwfmz5fnw137zkhjs6zv81piniad6hrmn1l" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "cl-lib", + "dash", + "flycheck", + "s" + ], + "commit": "bbc66eb981d17046ab98584c950baf963ac5da61", + "sha256": "18my32ni61z9dbr8cfkx0cjk4pqhdcmmz3l1hh57vzysscdxldh5" + } + }, + { "ename": "dash", "commit": "57eed8767c3e98614259c408dc0b5c54d3473883", "sha256": "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz", @@ -15500,11 +15604,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20190424, - 1804 + 20190814, + 2006 ], - "commit": "77f3bf40c9c85386a50f2dab3dc950513f6f88bd", - "sha256": "1h1v12f94i4a4kbcqi3njlf60p8n0601pp3vyahg0k06ms2aj46i" + "commit": "11907f4592ff1813536366d54245d3ecf6b99198", + "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" }, "stable": { "version": [ @@ -15579,8 +15683,8 @@ "deps": [ "dash" ], - "commit": "77f3bf40c9c85386a50f2dab3dc950513f6f88bd", - "sha256": "1h1v12f94i4a4kbcqi3njlf60p8n0601pp3vyahg0k06ms2aj46i" + "commit": "11907f4592ff1813536366d54245d3ecf6b99198", + "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" }, "stable": { "version": [ @@ -15897,15 +16001,15 @@ "repo": "conao3/ddskk-posframe.el", "unstable": { "version": [ - 20190623, - 1529 + 20190816, + 1855 ], "deps": [ "ddskk", "posframe" ], - "commit": "3505204b7bb96872312055bdc8ee5fb419b247e3", - "sha256": "0gn0vfi2pi0wykl2p3cjck89aprw659fgfwn3jm4dc8baqidip4c" + "commit": "f062a2a2a0fb3746ba01a7f56d051adf4cf4c7d8", + "sha256": "1lkvbix25p5jlhz5164vnyfldq1fk7m10w6q7q4rm2plnmxfbv1y" }, "stable": { "version": [ @@ -15964,8 +16068,8 @@ 20181020, 1513 ], - "commit": "a499822afc2154ca83edf6a605ed22c5a932fa12", - "sha256": "0bfgh6v0q93lfd0q628r11jd45cys89z4874a19w61cb0mfpvks0" + "commit": "8ff1f5d73d5d56bee65e45e9d8ac4e75aa8b8e4c", + "sha256": "0hqxl0gi9csp2zfc65s01c3i6himh38fia46cn68i3hh5d6kb6qx" }, "stable": { "version": [ @@ -16281,11 +16385,11 @@ "repo": "howardabrams/demo-it", "unstable": { "version": [ - 20180404, - 332 + 20190828, + 26 ], - "commit": "2760d2eed88ef854ce489a5f77627aa641af12bf", - "sha256": "1acfpkdwx8pvfhsqa7dp1n4q3cz5vks7b4gj5nc9rgvlmkv10j5c" + "commit": "9cfa5c3f92a0dca7eebb1f1a2011643c9b009d26", + "sha256": "1fcmrhm6h0j7jjw6kijrcacv628fy80ssxn6h5bilwmw0r4c7wm6" } }, { @@ -17707,8 +17811,8 @@ 20181225, 2206 ], - "commit": "74f520e8e8064d5e3f4cb33149f840fe59839c38", - "sha256": "1rj4qw34rzc085d1sra0hnc01dkj1xaxd1xyds45mxh41407zzfl" + "commit": "689ea9f3d702529a5b5ac2493e28eefca65c7abb", + "sha256": "0na9kkx2rjakgxq416cr2wjdggzf4ycki7jj7ywpra966zldf84s" }, "stable": { "version": [ @@ -18324,8 +18428,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20190812, - 1155 + 20190813, + 1431 ], "deps": [ "dash", @@ -18335,8 +18439,8 @@ "s", "tablist" ], - "commit": "55635cb15b1dc3945174de04f4bab22129e675e8", - "sha256": "0wv36b7w5cya6yr0phvg8ws3kc138ya1b4vimjf6chzhx3r6mhy7" + "commit": "fe74a499ce3246fb9a7d72e6931864b94ce5261d", + "sha256": "1prxz9fy9ca6lrv3qff408igxc1hic2laz528ba9mzyr5bc9qsq0" }, "stable": { "version": [ @@ -18599,16 +18703,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20190812, - 1448 + 20190830, + 1605 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "a6145d435ae380dbbff4d148e3c200b89a60d010", - "sha256": "0mny8zz3l4bqgbshmfgrf5y7zn0jkgawfgzn189bw68x87i8fwp3" + "commit": "b433d87f428061cc7477b444b7dc9101e575095d", + "sha256": "0k0kdr7alxwz0zf14zz92zhacza8izzc38117x4zcixx3yrsspnx" }, "stable": { "version": [ @@ -18633,14 +18737,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20190812, - 2115 + 20190821, + 2117 ], "deps": [ "cl-lib" ], - "commit": "ae18b84e01496c4ebd572cad00a89516af089a94", - "sha256": "0zcsk2z5z0hh9plbig4ba1ywzbdy0mar1jfm0c5mi46vl0vb29i7" + "commit": "470dd52ec4761a0b2c1f2c0309233e1fba04e598", + "sha256": "1wj9f7rxr2330fqgwsaqhz5mp1247a1x3a7zr6jdnr6h819ji74p" }, "stable": { "version": [ @@ -18816,14 +18920,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20181022, - 8 + 20190824, + 2314 ], "deps": [ "debian-el" ], - "commit": "a80f8ac5d81720cce90cf3bc5fbb45d50b1953d7", - "sha256": "0358c6gvyb85zr5r79ar3q46c83gz39rawyhgcg1h1hqxgj6a2lx" + "commit": "aafb047e03c642e6ae4740a7fbc0a789e0ec1291", + "sha256": "1sfan4pil51jrc0b6fxf5vjyrif0dx1xmx92yhgwap684kpsarv4" }, "stable": { "version": [ @@ -19252,17 +19356,17 @@ 20190808, 345 ], - "commit": "0f9863467c7a2dbacc41e62adc858765474c4ff0", - "sha256": "0ddhg3qbs4z6wkc680m5vmp2q6wdjs863h375rl1k114z4qdwn4z" + "commit": "823a3c66d11b30333f511c03348bd4714e736f46", + "sha256": "1fdca3rk599xfq02cihk30p29v4ng3hn3dvdzq5l90kfigpanaz9" }, "stable": { "version": [ 1, 11, - 1 + 3 ], - "commit": "2f40f29f8eab3f7ae044f1c522f3e34036a16d9d", - "sha256": "1ax0lf7h191l772s0pr2xyy1kxpzjalm44ck265jihiga07dk0m5" + "commit": "1fb491280dbe7e3bc7c00bb75ca837edc538333b", + "sha256": "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr" } }, { @@ -20020,8 +20124,8 @@ "repo": "ecukes/ecukes", "unstable": { "version": [ - 20190731, - 1558 + 20190822, + 2127 ], "deps": [ "ansi", @@ -20031,8 +20135,8 @@ "f", "s" ], - "commit": "73f1b07dace22eff692568b9d29f9755d4138f30", - "sha256": "0w6ja73a3gnpnf58v3dmk04sb22gnwxdsn3wpvp5hlhsvkxrar6j" + "commit": "d835ce619a8f0057a133c08060af4b026e1c9359", + "sha256": "1iqrb6lmvmsfk1g6hcc304b091nv3x7f5pv7zpn87kvvw7xw6lqg" }, "stable": { "version": [ @@ -20618,6 +20722,30 @@ } }, { + "ename": "edwina", + "commit": "050188e81b045bdadf722db552a42864121d9b81", + "sha256": "1581cwgfnrlcmbmrnfj57w9hb9jx9sinz6zw6zy2yk7g1r9vgbzl", + "fetcher": "github", + "repo": "ajgrf/edwina", + "unstable": { + "version": [ + 20190821, + 1850 + ], + "commit": "8d6f7ce117c622e19576888fbff9145615683815", + "sha256": "12rvmr8r85k9hfgbz2qwp0ryvy4qdarr82hq16ilppq5vlkiar02" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "cc0a039a400e8ef07b0d96d2169f1407e0af107a", + "sha256": "0l8w5f4bkqzb8pglvh516q91s6lvc1s1lfilxc9h881vl3934y7l" + } + }, + { "ename": "efire", "commit": "4150455d424326667390f72f6edd22b274d9fa01", "sha256": "0dhgms6s0c889xx75khn1mqfn8i32z4rjlx2w7i0chm2abxbgd3m", @@ -20729,17 +20857,17 @@ 20190714, 236 ], - "commit": "ba135b498cfa92e60634c4318fa0073bd60ba230", - "sha256": "1fxnvrqxdyqr7d88fdvr8hiwfrc3nrxddg6zpbqjw2jc3ijmzq0p" + "commit": "9fbaf81114ffd3550801457257c983a077a7e17e", + "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5" }, "stable": { "version": [ 3, 9, - 0 + 1 ], - "commit": "6ddf45cb589c6a191df21f8debb3a6b8d0fa41ee", - "sha256": "1krkba41vczhghz31dww1dw41r1l2h3di5564pqhs6c00shmds01" + "commit": "9fbaf81114ffd3550801457257c983a077a7e17e", + "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5" } }, { @@ -20750,15 +20878,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20190812, - 2013 + 20190819, + 9 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "6a7ce6634fcf79853a6bd89cf1c81bad2ac25540", - "sha256": "0qxkpn4mx2xjp98gwps0wric7c8c2g1ixdjy4jypya6alyc5b28x" + "commit": "7a70c977fdb6a16182d375993edd528653a2cb5d", + "sha256": "0s48k733nyk21h22c98ckch0kcki3snn1dw5ymqx2n9gl0w18gkh" }, "stable": { "version": [ @@ -20843,8 +20971,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20190812, - 1512 + 20190813, + 2156 ], "deps": [ "auto-complete", @@ -20857,8 +20985,8 @@ "skewer-mode", "websocket" ], - "commit": "52f304d038019f3eed6e1afbccc31878e161183a", - "sha256": "0wds8xddp4v1i4rimzp5gva2v5wvhx4hdjhxl6m7lih95vlpnq6v" + "commit": "a2872eff6c18a0706c531e9316c792a9fb99826f", + "sha256": "0i182ic59wnhqmik15qsqjsqza5fn67qw18i5gvvj7dsn3v05vac" }, "stable": { "version": [ @@ -20931,8 +21059,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20190812, - 2255 + 20190828, + 919 ], "deps": [ "auto-complete", @@ -20941,8 +21069,8 @@ "direx", "spinner" ], - "commit": "524a00d23c60c4718e39f4b963086fcc497afc25", - "sha256": "0qw12rk3cw1f2i0s2fm5630w5dnn6z0f1fxif1lrkky4yjp9ybxi" + "commit": "5a2b3580e362841f51d262eeeeaa396fcceb4fe9", + "sha256": "1xgppkabl2lwfqrgylab25v4pqfkhfxy780hlmsys1yha2r1167l" }, "stable": { "version": [ @@ -21383,15 +21511,16 @@ "repo": "DamienCassou/elcouch", "unstable": { "version": [ - 20180809, - 936 + 20190820, + 1641 ], "deps": [ "json-mode", - "libelcouch" + "libelcouch", + "navigel" ], - "commit": "ae9b6261c5167d538914bfdbc4d34a36e50b5bc2", - "sha256": "0z9ypk2f0q38cxq6fb53kbi0flq7bi09yhzs5mkd65kxgcsicl43" + "commit": "8e1b7ddec91ae863c3951776a0fcbfead8ca7a80", + "sha256": "07psfjynphzpm5jgajf31cigs5jyj8qnq491xrk88jvxm63sq55c" }, "stable": { "version": [ @@ -21596,20 +21725,20 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190809, - 1358 + 20190824, + 1213 ], - "commit": "87433438e10d851d57d76bea4403cbde936647e9", - "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" }, "stable": { "version": [ 3, - 1, + 2, 0 ], - "commit": "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e", - "sha256": "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" } }, { @@ -21697,28 +21826,28 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20180829, - 1716 + 20190824, + 1213 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "87433438e10d851d57d76bea4403cbde936647e9", - "sha256": "1spyrvq0zsfnhckci5kprkzy6yh4vx2fafx43dih92ccsi513hw5" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" }, "stable": { "version": [ 3, - 1, + 2, 0 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e", - "sha256": "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i" + "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", + "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" } }, { @@ -21807,20 +21936,20 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20190720, - 1301 + 20190816, + 421 ], - "commit": "8a517e8457c42735538c38555c6ac799f33855ef", - "sha256": "1wrq69sqkzkmlfrjci7wiwlfsnpwmc100hhg9a419w121kljsabc" + "commit": "628ade09bf24331003f7f69a3ebfa57da09288c0", + "sha256": "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66" }, "stable": { "version": [ 2019, - 7, - 20 + 8, + 16 ], - "commit": "8a517e8457c42735538c38555c6ac799f33855ef", - "sha256": "1wrq69sqkzkmlfrjci7wiwlfsnpwmc100hhg9a419w121kljsabc" + "commit": "628ade09bf24331003f7f69a3ebfa57da09288c0", + "sha256": "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66" } }, { @@ -21954,8 +22083,8 @@ "deps": [ "cl-lib" ], - "commit": "34938422929800839e2f935aca890cd4a229ca99", - "sha256": "00v8iqlf6pk8a0656s14jd0gv5msqy6q2af15q21f2nl4j0gl9qj" + "commit": "be36d66b4781eab7218bff419f3ec79573bbd15c", + "sha256": "0q0nisc0k4dl67n8c1068g32z8a642dawmq1h9licad71c42s95p" }, "stable": { "version": [ @@ -22037,15 +22166,15 @@ "repo": "walseb/ellocate", "unstable": { "version": [ - 20190811, - 1123 + 20190819, + 211 ], "deps": [ "f", "s" ], - "commit": "10845fc5722d833f20944ecc5586b429974e383b", - "sha256": "01wy71gdkiwglbndc96jx3hm0w6pia18cr76810hffrfkbsywgd8" + "commit": "f5b222777d063d8ba3c851dcd9a132d6f74fbe08", + "sha256": "18cxqsxsgks7s31gmx9azsv26wdb979d24ypy44rhrwc5r4yk292" } }, { @@ -22056,8 +22185,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20190222, - 2125 + 20190815, + 555 ], "deps": [ "dash", @@ -22067,8 +22196,8 @@ "s", "seq" ], - "commit": "b59b66a5369816c3a6d47b3702b9007431b7b4cf", - "sha256": "13y4xhf4czir4fdl36lk9zhn6292x0lbxhdywpq55fy9ivz4pk6q" + "commit": "834fb5037424c47155518ed27537ef7ad6addcc5", + "sha256": "1jqp9n28xgxbp1xfqw1vpv9h5q41xirxcfj9257p2gvk1lg1w7jr" }, "stable": { "version": [ @@ -22126,28 +22255,28 @@ "repo": "Silex/elmacro", "unstable": { "version": [ - 20180628, - 1411 + 20190823, + 1308 ], "deps": [ "dash", "s" ], - "commit": "89b9b0feabafd01fee48111d67131c4c9b5fed9a", - "sha256": "06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha" + "commit": "5bf9ba6009226b95e5ba0f50489ccced475753e3", + "sha256": "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "dash", "s" ], - "commit": "9ed19a362b63d9c7436a78feb91bc694194cfefe", - "sha256": "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9" + "commit": "5bf9ba6009226b95e5ba0f50489ccced475753e3", + "sha256": "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a" } }, { @@ -22338,20 +22467,20 @@ "repo": "tgvaughan/elpher", "unstable": { "version": [ - 20190710, - 755 + 20190816, + 1414 ], - "commit": "f0b76ab6fa09b0e29ff68ff72a7d5c73dcca6adb", - "sha256": "0aryai4m2ngffgwbr3dvi27jqcdnzj48w7f54wh5lr703wjmqpig" + "commit": "40ec805063c480dfdc01c8328be12f7c8f823c9c", + "sha256": "0g36b7pil5vihwx2v55ga82k9l31wl3w0ba0s3af27wh058zz7bq" }, "stable": { "version": [ 1, 4, - 6 + 7 ], - "commit": "0e8eb2e0c919a07aa5db733d02e7669ccfb4276d", - "sha256": "07xansmhn4l0b9ghzf56vyx8cqg0q01aq3pz5ikx2i19v5f0rc66" + "commit": "e5471b9460610b3c3af3842c6ac009bcbf70ecac", + "sha256": "1sf91x2spk7nkpnn7ss2vkjfzvxw83z3pw7nyvra45gvq11vmy3c" } }, { @@ -22454,8 +22583,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20190331, - 1558 + 20190825, + 1513 ], "deps": [ "cl-lib", @@ -22463,8 +22592,8 @@ "f", "trinary" ], - "commit": "eb88fb357e14777cf4ae71054791d1482aaeef29", - "sha256": "0lh30zm5k7x7sq6yyzf91f5ajp71bi0nqqb0f6ns25bjpc6vz45l" + "commit": "fa12fcfa37f399b56c8b45323e03c3328ae4fde3", + "sha256": "0aphgjzxm4qhpp5rc72mx7d6n7mfm1ah7gn5064j7kzdi630msjn" } }, { @@ -23155,14 +23284,14 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20190620, - 1526 + 20190827, + 1610 ], "deps": [ "cl-lib" ], - "commit": "e70459caaadeb715116abb45ddf5e98921d46c14", - "sha256": "1b5krxc55ac5jsvbsikczh1shl5jgra58b306lhhsidmbmlisyx6" + "commit": "f209b44c76f4a8532783909384ae7492b8d9b6e7", + "sha256": "1m68vpsbkcmnlj35h31qikifvah8b9gazwk5yv4wafabpg3bdav2" }, "stable": { "version": [ @@ -24472,8 +24601,8 @@ 20190404, 928 ], - "commit": "65449e9e54fd765abdbe546590e4da044f36c2a4", - "sha256": "0yj4vfpz6vjxsraiab45c4lw313yd7c88sa10fsr974h0wfp9rnv" + "commit": "a56c1dc1fb996040ab192b0c96dc32e5ebf47a06", + "sha256": "1dm7l2kizbg3d878b16hca5qyfaf2yvskhwlc3h2kldchw4xgrby" }, "stable": { "version": [ @@ -25069,14 +25198,14 @@ "repo": "xuchunyang/eshell-z", "unstable": { "version": [ - 20170117, - 438 + 20190823, + 2341 ], "deps": [ "cl-lib" ], - "commit": "c9334cbc1552234df3437f35d98e32f4d18446b8", - "sha256": "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh" + "commit": "ee30761bd368df5f2e55c744ccc44089c7a46b6d", + "sha256": "0ywwvm1xx0p2iqzqmbb908147l8zlyf7gqsz0mgrzj0amqx1rhg2" }, "stable": { "version": [ @@ -25273,14 +25402,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20190809, - 1459 + 20190814, + 1054 ], "deps": [ "julia-mode" ], - "commit": "d625e9ccdb612812b90fe427563db4b910da7159", - "sha256": "0fnfcxlngc7rwnkhs1fwir1ax7hi9qhl7zlalbl5m7yfly84dl4p" + "commit": "5b12e56a52144b2393858236e56e1c5ea828b753", + "sha256": "0gcz8r7mdjmrcrisqr1w4pmnyj4m76fc1qg773y2b1majkdv7rbj" }, "stable": { "version": [ @@ -25913,15 +26042,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20190807, - 214 + 20190828, + 2159 ], "deps": [ "cl-lib", "evil" ], - "commit": "d226a50061a5033846ae819472e3c86fb54cc5f1", - "sha256": "155ajm7h9wpjg9ca60a4ib5fyp1sk4i54m5825595n43laqyd5p9" + "commit": "da75a170ea5485b7c0083624ca4e6cacc6aaa028", + "sha256": "1s4sr8lfdd2k11588gzylwbwmyigs29jfmvv9h0mjmixhaz85z1w" }, "stable": { "version": [ @@ -26760,6 +26889,24 @@ } }, { + "ename": "evil-owl", + "commit": "306209c3e3669b962dfd0abf649865164ed8bba3", + "sha256": "1629ca2n3i6nk1vsxfn9rnzdy40kmiy18hqa4dw9v56jb9p47xh5", + "fetcher": "github", + "repo": "mamapanda/evil-owl", + "unstable": { + "version": [ + 20190828, + 435 + ], + "deps": [ + "evil" + ], + "commit": "24c5f43df375194386344e69bc720ea3986c9510", + "sha256": "0bqzch14whlmrcasakah3psrzswvkzd7mmi8hx5s64kfp29wbdhi" + } + }, + { "ename": "evil-paredit", "commit": "88db86e1351410bcff6f3ed80681946afcec9959", "sha256": "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy", @@ -26934,14 +27081,26 @@ "repo": "porras/evil-ruby-text-objects", "unstable": { "version": [ - 20190729, - 1653 + 20190821, + 1527 + ], + "deps": [ + "evil" + ], + "commit": "0ddc4c256a0c778fa65d75b707f20df874e5b5fa", + "sha256": "1ppwcyfy5dssswfzd16i1rx14si5r80mdvrnfwaf9jr3c2ws23lg" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], "deps": [ "evil" ], - "commit": "781f134d9484481b0b4ad32f9cfe90dc00219902", - "sha256": "00ybb6y5lnfsk44cy6dks46n2cl1ms4010vfqqrji64i19wd1riq" + "commit": "93cfc5ae3da0ffb19319e301734c51ecb43506b5", + "sha256": "0jizvchrisrdc7bl6xfc59axyjz1dmr6hi36jyv1bdwyayj2ifqi" } }, { @@ -27363,14 +27522,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20190810, - 2054 + 20190818, + 2331 ], "deps": [ "evil" ], - "commit": "b1c64532ad754591c472e0615a10c9a9f8ad3df0", - "sha256": "0d7ijy067rb6wf1hzyyrk1nqh891b95fs0f39lbgawc0hkqk9bzw" + "commit": "4eec121e2abc0dd8f32b3d7cbdbf676302c4904a", + "sha256": "0hqrw3jda7qci0f3xqc35x0dhc2hrkd8fddwvlgicdj628wsm7ng" } }, { @@ -27572,11 +27731,11 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190807, - 240 + 20190828, + 1542 ], - "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", - "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" + "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", + "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" } }, { @@ -27587,14 +27746,14 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190807, - 240 + 20190825, + 335 ], "deps": [ "ewal" ], - "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", - "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" + "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", + "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" } }, { @@ -27605,15 +27764,15 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190720, - 829 + 20190828, + 1542 ], "deps": [ "ewal", "spacemacs-theme" ], - "commit": "9807c3d7bb3bab3676ef15b1b438eb9ea8c419f8", - "sha256": "10dprjijh10npgh0k3vxcmcdsxg8yx32ly5106p8rqjipfdva0ka" + "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", + "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" } }, { @@ -28018,6 +28177,36 @@ } }, { + "ename": "exwm-mff", + "commit": "78f94ec4d5f83020003cbdb7b954213dfb0f242b", + "sha256": "10qjdhdkvyavjl43cyq9czvfbx8s0riiby0fss6v0snxdhg4qysd", + "fetcher": "github", + "repo": "ieure/exwm-mff", + "unstable": { + "version": [ + 20190810, + 1744 + ], + "deps": [ + "exwm" + ], + "commit": "a6a4b3dda01cbcf411fc2824981eaa9e85199a52", + "sha256": "1f4yr4q5dayxmyvrdxbbviks6l02amqhgfa97k7cz9rwscsavg6c" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "deps": [ + "exwm" + ], + "commit": "74a05bb1cc9444bb57d7a5361a15ec38deb4295a", + "sha256": "128j1xqg1k2z0lp7ivnszx8aai8y0zg182n1fhwc3iryrz52fn5q" + } + }, + { "ename": "exwm-surf", "commit": "4fc27fae2b58c7af87dadba9217cc05f8ab4890c", "sha256": "066qbn1w63irh9b03qs0fv77x71cind22kdj6wygaznrpgwr0kny", @@ -28085,26 +28274,26 @@ "repo": "wasamasa/eyebrowse", "unstable": { "version": [ - 20190322, - 933 + 20190827, + 1828 ], "deps": [ "dash" ], - "commit": "52e160997a1c4b1d463e8b9cc2ba3e27408c2a89", - "sha256": "0y2n08ykfc3hga5m969syysa2r4h3d2i1xfi0jjhpw3h7qrisbw8" + "commit": "d75e37a048718d6981c366c431b93ccbe884f356", + "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7" }, "stable": { "version": [ 0, 7, - 7 + 8 ], "deps": [ "dash" ], - "commit": "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5", - "sha256": "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq" + "commit": "d75e37a048718d6981c366c431b93ccbe884f356", + "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7" } }, { @@ -28272,6 +28461,36 @@ } }, { + "ename": "face-shift", + "commit": "e55d2d30525602726c3c63025f5fce671efac416", + "sha256": "1y0m6yv64q76x6i2r5npn97c2axsy2k7b3m58zxh8p7c5lpwjdpa", + "fetcher": "git", + "url": "https://git.sr.ht/~zge/face-shift", + "unstable": { + "version": [ + 20190818, + 1551 + ], + "deps": [ + "cl-lib" + ], + "commit": "8dd6fb5f6277d3a594654aeb3e6a7b7b5581656a", + "sha256": "003k8i18s782zf1g0c9wi8p9lyk0viz76dah8hd3y622hmx8sdlb" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "347e9a1c801c80be546fbf3be808f8245fb049d8", + "sha256": "0lkrbbhgv2a101rsf78ik27ni66spml3z9ljsajwjwhv3hvky0rq" + } + }, + { "ename": "faceup", "commit": "a10bf2928b93c3908e89ca8ad9649bb468ebca05", "sha256": "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx", @@ -28321,11 +28540,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20190711, - 1511 + 20190821, + 1918 ], - "commit": "49710f7bf8bebf6cd82e67f0ca3a718cff3b504d", - "sha256": "0ba1ayc1ccs1ygr66zpihm4wmnrhbvb48rrhha6lidyvmbxrxsa6" + "commit": "c88ed079add4e2c39401dda9fdeef96ea4ddb13c", + "sha256": "1a0ff8xmkkhiwj5809vrxfaj4mkdcvwyw8m656l6iidijskqnmh6" }, "stable": { "version": [ @@ -28373,10 +28592,10 @@ }, { "ename": "fancy-battery", - "commit": "eae3af4145c534992d1c1ee5bb6420651c7c5d82", - "sha256": "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "09qlkij9lbkaq46yb1860nkfiqpcn0h67zmm9lyz28475686759j", "fetcher": "github", - "repo": "lunaryorn/fancy-battery.el", + "repo": "emacsorphanage/fancy-battery", "unstable": { "version": [ 20150101, @@ -28650,11 +28869,11 @@ "repo": "tautologyclub/feebleline", "unstable": { "version": [ - 20190711, - 713 + 20190822, + 1401 ], - "commit": "fe971abb6e0142513a8c6e453e9d3b2eac6a3f08", - "sha256": "0zisc4sf2fi0fspfzkvs8crlrvzrzrc72b379p5ngv53hmdmvkhy" + "commit": "b2f2db25cac77817bf0c49ea2cea6383556faea0", + "sha256": "0f2nynx9sib29qi3zkfkgxlcfrwz607pgg6qvvk4nnads033p1yn" } }, { @@ -29576,15 +29795,15 @@ "repo": "Fuco1/flow-js2-mode", "unstable": { "version": [ - 20190627, - 1240 + 20190814, + 1402 ], "deps": [ "flow-minor-mode", "js2-mode" ], - "commit": "c7a300d7fbe5d14b55deed11e31175ea3237c85d", - "sha256": "0x00472q6vz9i1zc9wplqcjis0xdn7a58jbggzvns9fbnva5b7pl" + "commit": "bfb23b73d47ea9902bcdc13b48511b23d704fd22", + "sha256": "1pz2mhavs0jbfq8qswzvz3fz7nw7glcysybjyng9i0463vr8cwc9" } }, { @@ -29796,8 +30015,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20190807, - 813 + 20190828, + 1147 ], "deps": [ "dash", @@ -29805,8 +30024,8 @@ "pkg-info", "seq" ], - "commit": "37c1f9d65c4a16c58aff9f2fa210ccf070a97c86", - "sha256": "1yqrb7r6ykjzmflk3259xpasmz2xgxxazvvhhjcy36krhwwj825x" + "commit": "ea176a4f6bfebd70b71a8a5e2988b49e1a58fe52", + "sha256": "0ys9cvhbxxq51sipk6ay13jcahgcbv869bxlhivdpjj7gmhzj5db" }, "stable": { "version": [ @@ -30109,8 +30328,8 @@ "flycheck", "let-alist" ], - "commit": "1dc8fdd691bcf950e95a0f00b71b53854923543e", - "sha256": "12abxdr75rjf9qas3q0wk220l3413cmddj45habz2ml9a9f7i41y" + "commit": "4c5d0c723bd564d632a4b93046679ed19d0e49d9", + "sha256": "17g5z02gjpyb5nwgwwcc0lxzd4l2jg0q2bndbxscsf5iw41p0irq" }, "stable": { "version": [ @@ -30662,25 +30881,25 @@ "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20190801, - 1813 + 20190817, + 935 ], "deps": [ "flycheck" ], - "commit": "0ca2659c18f1e7e4963afbff8dcb9e5fef238f3b", - "sha256": "056hs0abyisqh9wsnykj1y05rw8qn8n6j1wgijy2k97yvg3rq7x3" + "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0", + "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "flycheck" ], - "commit": "8ba9d41dad0c9c96760614ce7594ceb823f560de", - "sha256": "1l2n3vi7krd61bgwj7dg7qpkccimwfx3m0946fmxgrp0k6q41fn0" + "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0", + "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv" } }, { @@ -30735,8 +30954,8 @@ "dash", "flycheck" ], - "commit": "eab1fc184854341a56154623a131cab6ff0ce18c", - "sha256": "0prmrix9a95zr39ybajp7fha03wknxyhrf1kfxsms1brxsc8bqim" + "commit": "8248ebaf8376ee5e37ff47c814a291550a7bdcf2", + "sha256": "1al9kyj7n0cjc4s1m41389bzvvrckg28598v506zd5hqvaiynsp0" }, "stable": { "version": [ @@ -30968,8 +31187,8 @@ "deps": [ "flycheck" ], - "commit": "8d7f52a4c7f80ca396ef0fc6c7d8e9f005778dfc", - "sha256": "0m5zhyzrh4lx7vzwdgdwcfkipdvi3y8kavhckbd7vd9zwx539ij1" + "commit": "0fdb067ebbcc8bc1a3f9d2109e341049516b71da", + "sha256": "1p7sns041iqsnmmhkcx2651plz3wrb2nr3s78w2pd7kagx5hwksb" }, "stable": { "version": [ @@ -31247,8 +31466,8 @@ "flycheck", "package-lint" ], - "commit": "6d99248b45eea1e5236062f38e524230efdb1a84", - "sha256": "00wyi2adiv9cb3x8bid2fhg3cjqlkc7z70i18vldbpmrpppjg4x5" + "commit": "31fe5d9731f30d076f14392401b3b101c9ca2260", + "sha256": "1j2jk11cag1scy4cid89lcvjspanhpamazqggksaaadg9b71ay04" }, "stable": { "version": [ @@ -31582,8 +31801,8 @@ "flycheck", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -32176,11 +32395,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20190720, - 1501 + 20190828, + 128 ], - "commit": "5624f61c782c91710014620ebbaadab44a7e2b1f", - "sha256": "113hbdsgp950safyry3a2bpml3h2jjhypmfyjjyj3fibiigx9fmi" + "commit": "86268e1faf904bc8844dea313fe1bdaf02398ae9", + "sha256": "1xsj29z0qmijdb97cpy11dmqw8536amdz76664yzzn5gzin12fw7" }, "stable": { "version": [ @@ -33376,11 +33595,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20190124, - 1828 + 20190829, + 1514 ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -33457,8 +33676,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20190809, - 1808 + 20190820, + 826 ], "deps": [ "closql", @@ -33470,8 +33689,8 @@ "markdown-mode", "transient" ], - "commit": "a60bd64056ec910fdbd1400dd8f583b8eec6145b", - "sha256": "1dhpsnb82mxpv3krf3apsbcirlcizw3g9gac9sfn0fad20qjwpgj" + "commit": "6c43971a78a08954c20992cb6b0e98a7e7295908", + "sha256": "1hlk6jmn4w7bq0x7syrxmk2gz4dn7iswi73dixcfkv3m97qiqxd1" }, "stable": { "version": [ @@ -33526,14 +33745,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20190721, - 1032 + 20190830, + 1152 ], "deps": [ "cl-lib" ], - "commit": "dbed2d1ea8ee9a86d6e5e5f2aab4e73aaa88e918", - "sha256": "1v12b067dca73qy4s3ladhrqdkhfiih1d1hkbgxh0x9q0yhci871" + "commit": "15e9837a9e2d74bbb12fbaf1dcb400d0153754ba", + "sha256": "0bpz3i20vkd22y16cb7cllikj0sd91km2697wmix5wjsc370nimh" } }, { @@ -34018,8 +34237,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20190626, - 1238 + 20190815, + 1357 ], "deps": [ "company", @@ -34029,8 +34248,8 @@ "quick-peek", "yasnippet" ], - "commit": "ddb653cb3d6ba6568ffaf531ca57c9ea3e7498f5", - "sha256": "0mr48y24p81srv2m4glif1d7iy6i7jpx98lbv9577xry22d3vvhb" + "commit": "5af6fea23d1631f3f6653f804f17cd1b7358ca6b", + "sha256": "1wpr8hsvf923k7fwadl6j47k50vvfhzvpgrpj91j8208g8br87l8" }, "stable": { "version": [ @@ -34060,8 +34279,8 @@ "deps": [ "cl-lib" ], - "commit": "2f2cb869f19e1ab10931a2228ad02b2cfbf8fc0e", - "sha256": "1pg1i85cx1zk10k333qzmc8i9dmry7nz6h57p13ysa7pnyi6d521" + "commit": "e6eb7be61c35d4a7b7d5eeb528b582639c57f08f", + "sha256": "10ndvjwg4c77qkh0a2ab7vdkz8z6fyk5ji7ra68cq75g7gclli77" }, "stable": { "version": [ @@ -34225,6 +34444,30 @@ } }, { + "ename": "fuz", + "commit": "aed40e85cf9a9906ca7a9fe34469083d21254e42", + "sha256": "0bpm2p5i8zyjsbn4d7i7rghwbap9mw4f5a5q47r6nxnr0fciarz5", + "fetcher": "github", + "repo": "cireu/fuz.el", + "unstable": { + "version": [ + 20190810, + 507 + ], + "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", + "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "90ca9207a9c1decda24a552b94ff41169ecccb14", + "sha256": "0v1advw2yr8b4jwd713fijd1kx4yc5xzz5ck2qfdxy5ixi1b39nm" + } + }, + { "ename": "fuzzy", "commit": "9e0197df173fbd7ec1e7e35c47476fcf2aaa483f", "sha256": "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h", @@ -34573,11 +34816,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20190806, - 149 + 20190826, + 1736 ], - "commit": "8f801fbf01586e33bcf0060bd1d3172d4afb48cf", - "sha256": "0cxd8zjgzkxjsgv1wfb6afc75brvs6hal7if31cj5ip7z38qzksx" + "commit": "d7bcfde6303b420ca76d9364c6e8f2c6827112e6", + "sha256": "01n3vxczv02vj9h7w1syq62qpnaw44wryk17ssk72ihg3zrrri6v" }, "stable": { "version": [ @@ -34602,8 +34845,8 @@ "deps": [ "cl-lib" ], - "commit": "1907358fed4ad1ee61fb2a2e1a353b27822a3edd", - "sha256": "1v3645sgpr5i7alh08ik2dmlc3bl6idpfgdgf8763l7x8r41wa55" + "commit": "f032c3a77079487d0ea563b17ee3e5b2fb084611", + "sha256": "0lgh5z17ag5wvvnqwagvam29cp1n1vd50amn6df02xln80bsbllx" } }, { @@ -35255,8 +35498,8 @@ "dash", "with-editor" ], - "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", - "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" + "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", + "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" }, "stable": { "version": [ @@ -35526,20 +35769,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20190309, - 2326 + 20190829, + 145 ], - "commit": "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885", - "sha256": "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq" + "commit": "267bd81c228bdab434172dbef896f3f3b82713fa", + "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6" }, "stable": { "version": [ 0, 7, - 3 + 5 ], - "commit": "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885", - "sha256": "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq" + "commit": "267bd81c228bdab434172dbef896f3f3b82713fa", + "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6" } }, { @@ -35865,8 +36108,8 @@ 20190701, 630 ], - "commit": "6a05025663789e6daab80a5dd47c3efbe607795f", - "sha256": "1mkdsg1pzwgyyxdlizwcspppvh6kb7z1s55bszxwrfasnpqk30jl" + "commit": "e3a410dd1113bdff382a745465ea48d9b1fe860b", + "sha256": "1yq9bsy2qry49q1asdxnfyhahsp499b37l2yabwhpbxjlb7mmnp6" } }, { @@ -35950,16 +36193,16 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20190803, - 1701 + 20190830, + 1639 ], "deps": [ "dash", "ghub", "s" ], - "commit": "20b2e47f54587a39dbd8db9ec5ca33d5970dbcc1", - "sha256": "1slnggvsjzsqvdvm4nxnxba93hfjnz676bagmw79g7z6iswwz4sg" + "commit": "a13a3b4f1b6114a32af843971a145ab880f51232", + "sha256": "0injfpxzgfhmqalba845j5l5cdcxxqz43knhxwinf36g52nfabl0" } }, { @@ -36110,26 +36353,26 @@ "repo": "joewreschnig/gitlab-ci-mode", "unstable": { "version": [ - 20190425, - 2058 + 20190824, + 1528 ], "deps": [ "yaml-mode" ], - "commit": "dac4e5125c78aa3ae12d2e35a66196d709676236", - "sha256": "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0" + "commit": "2651e831aed84ee2512245952fac94901b086549", + "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59" }, "stable": { "version": [ - 20190425, - 11, - 10 + 20190824, + 12, + 2 ], "deps": [ "yaml-mode" ], - "commit": "dac4e5125c78aa3ae12d2e35a66196d709676236", - "sha256": "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0" + "commit": "2651e831aed84ee2512245952fac94901b086549", + "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59" } }, { @@ -36940,8 +37183,8 @@ "cl-lib", "go-mode" ], - "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", - "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" + "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", + "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" }, "stable": { "version": [ @@ -37033,11 +37276,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190808, - 2249 + 20190819, + 2109 ], - "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", - "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" + "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", + "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" }, "stable": { "version": [ @@ -37141,8 +37384,8 @@ "deps": [ "go-mode" ], - "commit": "fdc1545d0ca494eb533d006b42c4bb4a6fb73d6e", - "sha256": "0scmn5vg6bprshcipkf09lif93al3wrx3y8fm2v09jfpz1wghgi5" + "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", + "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" }, "stable": { "version": [ @@ -37434,8 +37677,8 @@ 20180130, 1736 ], - "commit": "5beae3f4dacad9b0b86a8a4ab308459475feda0e", - "sha256": "0f1x1vjzlr0i41b7nqziw7yiawfw8sb1ssqwii7a5nfgzsv19z7w" + "commit": "dceb47fb3ea99ad7cc4308fa2c9ecb0d012639e1", + "sha256": "184llmywxm3fi20lpyni3vx4wxg2z8aag8ahirka2ipnykl1z9id" } }, { @@ -37808,8 +38051,8 @@ "magit-popup", "s" ], - "commit": "7b40d3e162becb69c99f2b71a26e1966adb34384", - "sha256": "16yqh892rfpg6mbzqxc8isxh3z3s9h14n6chm1h2qxsa82wqrrk2" + "commit": "3e2022d00278b8d47ea40793d299365c5d7b53a1", + "sha256": "1gmfsqn46lb4anqzb0s8yr21kzg5k2arw1daz056vcspq4fy3ix1" }, "stable": { "version": [ @@ -38415,6 +38658,30 @@ } }, { + "ename": "grip-mode", + "commit": "de97f1c15b3ab53ca5e314b679c289705302bb64", + "sha256": "162ss93hbkxv5zd0vid6xh77ln7bsx2ngzr7h1y4dmcg36npmy5d", + "fetcher": "github", + "repo": "seagle0128/grip-mode", + "unstable": { + "version": [ + 20190820, + 1726 + ], + "commit": "e3f5143d34ec47ee3c01a21e1d7c5dbf744bfe1a", + "sha256": "09ikf88nl7mig525m4432f8bjff4rdgiw3a5vjnmilmsx85n6gpd" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "7777b694751c0da754712b964052617de1740e42", + "sha256": "1kbyr3rfdbclpvxbbv66rirj7bn507izafjssvkwgjrrd6vfhdv2" + } + }, + { "ename": "grizzl", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", "sha256": "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb", @@ -38972,20 +39239,20 @@ "repo": "marcowahl/hack-time-mode", "unstable": { "version": [ - 20190529, - 855 + 20190827, + 956 ], - "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb", - "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh" + "commit": "74465859154314228482b4f41fcda726c82c71c9", + "sha256": "1q9k7r09y532fcvzjkgcqnk5hdms55hrshawgxhiz3qwxxc3svsi" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "95ed4c8a2410e1232453b3a49274a46afb740b1e", - "sha256": "083b9kwhh4bq0dwn6iskrrmsgxicqg08p8k6n1m1xadgs61lgkjb" + "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb", + "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh" } }, { @@ -39734,16 +40001,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190811, - 602 + 20190830, + 1604 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", - "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" + "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", + "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" }, "stable": { "version": [ @@ -40000,8 +40267,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190708, - 909 + 20190814, + 1056 ], "deps": [ "biblio", @@ -40012,8 +40279,8 @@ "parsebib", "s" ], - "commit": "8978ba5236af767023976c5b793a2b3e29e43c7a", - "sha256": "00fw8j3mjrq8y3qbcgj0baxnspq94a8qgxlyvrc6siraryppw65h" + "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", + "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" }, "stable": { "version": [ @@ -40588,14 +40855,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190809, - 1008 + 20190830, + 635 ], "deps": [ "async" ], - "commit": "b3ca0c03188afd173c7f8c6bb51a5aa0457e10c3", - "sha256": "1f5395949i6hb01cm932slxnqn3wlz8zrj51b1shqn0yiv0vqhvg" + "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", + "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" }, "stable": { "version": [ @@ -41133,14 +41400,14 @@ "repo": "elpa-host/helm-file-preview", "unstable": { "version": [ - 20190630, - 839 + 20190825, + 247 ], "deps": [ "helm" ], - "commit": "6c67cc9a17f6e951dd79cfcdc6997b6357f5bf3b", - "sha256": "0fvmdhhkpa079zrz15h1adrff01c1csxwww5im8kqn2hk4qdycv2" + "commit": "7b332fc3ceb730d054bac464b78e4d6e009ff432", + "sha256": "0klcgqqyx4zkxy0vnqfkbydjv59za8g247x0rgk64iq62fsmm3k8" } }, { @@ -41297,6 +41564,38 @@ } }, { + "ename": "helm-fuz", + "commit": "7b411e46e9246beb36acb3e468980e84c77c6015", + "sha256": "1j3fpmqn526pkrrms578fm470svqd2yran4mpxjx0xps45nsklsc", + "fetcher": "github", + "repo": "cireu/fuz.el", + "unstable": { + "version": [ + 20190815, + 401 + ], + "deps": [ + "fuz", + "helm" + ], + "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", + "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "deps": [ + "fuz", + "helm" + ], + "commit": "90ca9207a9c1decda24a552b94ff41169ecccb14", + "sha256": "0v1advw2yr8b4jwd713fijd1kx4yc5xzz5ck2qfdxy5ixi1b39nm" + } + }, + { "ename": "helm-fuzzier", "commit": "51dc6f01e0e5ee0593bea6616894bc0163878cd0", "sha256": "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc", @@ -42343,14 +42642,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20190410, - 1718 + 20190819, + 1311 ], "deps": [ "helm" ], - "commit": "7793d96694505380c470cb7b31b4bd8a2781e529", - "sha256": "01410wi46ljpy1040wk9dp2k21nyhc3k6kwxpy35874bqhqn5r3i" + "commit": "481964fb26c59ea280a1ec7bce192d724ddf7d12", + "sha256": "08cszx5iqr65sz66ank722c1kdvjff2k7kvhxdilhf3gb6f8ph9p" } }, { @@ -42475,14 +42774,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20190813, - 604 + 20190819, + 617 ], "deps": [ "helm" ], - "commit": "7926896aa1195db7ca6394c1ce60152b98f5fca1", - "sha256": "0cxxjxh89qhxfxc5gwqm5jwvdcnmsyipzwibvmqmq800ims09fka" + "commit": "542dda7bc9a3b9dfb439e4f8a1e5f60cfb6cc256", + "sha256": "1xa32w80icrykpyfb89fhb0s4l7ysi0sc7f7lfwqz5najwbgqipl" }, "stable": { "version": [ @@ -43215,8 +43514,8 @@ "helm", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -43378,30 +43677,30 @@ "repo": "emacs-helm/helm-slime", "unstable": { "version": [ - 20190703, - 714 + 20190821, + 1304 ], "deps": [ "cl-lib", "helm", "slime" ], - "commit": "e51f756f2a6e00231a34f2b46aba6c746a112624", - "sha256": "1aam9zxx7j3g2kp6n62hjrcw6rkdnyk90anihbm1z89kb2b00bgw" + "commit": "e0dbf04d447098a1d074bc04e125764ff82091b7", + "sha256": "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "cl-lib", - "helm-core", + "helm", "slime" ], - "commit": "ebe80eebd1dfba1f1c837876c8f73cefc8c4db87", - "sha256": "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv" + "commit": "e0dbf04d447098a1d074bc04e125764ff82091b7", + "sha256": "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0" } }, { @@ -43530,26 +43829,26 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20190813, - 920 + 20190822, + 501 ], "deps": [ "helm" ], - "commit": "8ae7c47365d3cef4b81abe97af1532340821a21b", - "sha256": "06rfhd38fvfnzjxk119pwwddszv1sczxn5dn6r7qki39wwxcsqww" + "commit": "3cc15383fae9063de817d320e87a1f868a46eb83", + "sha256": "1jm1yvwbfqhrj0256n5ihvxb1zxhhhqv07yfzkfg2pv6k71hpd9h" }, "stable": { "version": [ - 1, - 7, - 4 + 2, + 0, + 0 ], "deps": [ "helm" ], - "commit": "c66336b8245ddc51c4206f19c119f1081920985c", - "sha256": "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk" + "commit": "c5ec1f3acfb07155273c2de021f3521e198e4a9d", + "sha256": "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd" } }, { @@ -43850,14 +44149,14 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20190721, - 1455 + 20190821, + 1252 ], "deps": [ "helm" ], - "commit": "cc90ed9e04f848b252ba50951f332f4c4208651b", - "sha256": "0gzfmnnvjc42r0pk1jxlcacl0bmr3jqav6rnj7cfk2g05af10xli" + "commit": "5290e2a05209b742d7efcd3e03b5f51ac1eab6ad", + "sha256": "1jkjm43fnwc4n9h5rrpkb2sgs2k0nb5fmxxn08b4iyz992lgmk7b" } }, { @@ -43961,8 +44260,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20190807, - 2141 + 20190814, + 308 ], "deps": [ "dash", @@ -43971,8 +44270,8 @@ "f", "s" ], - "commit": "69474e9c49076ce82cea4eff237933b6cec0b5cf", - "sha256": "1jf0rj5k9aa1gbsvwwhnj5vkwpv1am5ya1xw5sxhzl3iabqz680i" + "commit": "e9e958a5643619d0e32b9934bf4e9195c57cb71f", + "sha256": "1xhcl3i4cpm5j0q0qd3rcgv5cqfikgqxp4wnw96xkalmyhqdgi28" }, "stable": { "version": [ @@ -44021,6 +44320,35 @@ } }, { + "ename": "hercules", + "commit": "c0a3b713c6c8465dc461d9776ccd27f06659993e", + "sha256": "1ggb8ax18nvcrcf1rqf8lkjjxb90kl05ivk0110h6pb9270x03hy", + "fetcher": "gitlab", + "repo": "jjzmajic/hercules.el", + "unstable": { + "version": [ + 20190820, + 1712 + ], + "deps": [ + "which-key" + ], + "commit": "aace3409bc4d78fec3006b2906eb2ae99cadd9f4", + "sha256": "1s88hmw671in3lrmsbbc3w6fs1ccgzip8k46j79gyf50vzzfcpk7" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "which-key" + ], + "commit": "8d156df2b7ae2866bfe44ee1b9c038379524147a", + "sha256": "17izhdq6pgg25nkl1zlqri18dhjgxwkw95iy230adsbk8m0iys4g" + } + }, + { "ename": "heroku", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp", @@ -45237,14 +45565,14 @@ "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20180929, - 1214 + 20190818, + 1144 ], "deps": [ "cl-lib" ], - "commit": "374525133b96a801d7612cb65a026740a6d0361d", - "sha256": "06nwgwl165b5y7w5v6lgz0njapgn65fxbdxi0biw2qaswnz8vcwx" + "commit": "e011a70f5955b8eb2e30f7baf2f3833fc6d3216f", + "sha256": "0p8gphaqkyl9cmbs85vi31jgbc56j6ghwf5zhn523sy22vcw5j0j" } }, { @@ -45273,14 +45601,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20190611, - 2131 + 20190830, + 910 ], "deps": [ "dash" ], - "commit": "5650a8cd190badb49d28d21e72a2f55c9380de7b", - "sha256": "1hgd6nrj69283k240ngz7422776lw4fc9mvgwg7nvh41qb70vwgg" + "commit": "a5a046e7c26fbcda0b757a64b30ca3e5b1cc6d69", + "sha256": "15vqnl72ahydj0qjg7y7na1i6n8800fl0na2glgrrwyhzy0z2sa2" }, "stable": { "version": [ @@ -45718,15 +46046,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20190617, - 859 + 20190821, + 939 ], "deps": [ "cl-lib", "lv" ], - "commit": "a91dd72529aadd2d3cc14e132a3e0545eb2975a6", - "sha256": "1bbyj0l6176277qp20034lgs8ghx01fasnikkc76fndn3v4vsljn" + "commit": "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f", + "sha256": "0nzbjx5rnmzl0dhbrrmb5kbcmww6hzs1vwa62nlg9zfwq99zk42l" }, "stable": { "version": [ @@ -45994,15 +46322,15 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20190710, - 306 + 20190815, + 501 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "3d66e588556686563b8fb72d7654f840d88046c5", - "sha256": "0r6654zddbxsbqbrjdd9rbhvfvvdffbh4ggg67b3kcwmzwwjp92p" + "commit": "5e5cd04e3f3ad9963c29759293c1f7a54257866b", + "sha256": "0y9nsdkw8sahb3vgrgc278dys7m3nqzq6wgcifhhcsvv1bgs93hd" }, "stable": { "version": [ @@ -46231,21 +46559,21 @@ "memoize", "s" ], - "commit": "41b42779e22c064192b95e4de855ff7ebad45af6", - "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" + "commit": "61c6fc60c2c7c70cf07fa533914bd2dae27c902a", + "sha256": "0qwi4prdx6flfzkzhqz15xbvlcxdb9gg3i1hz350p7h2kcfjkqpa" }, "stable": { "version": [ 4, - 12 + 13 ], "deps": [ "cl-lib", "memoize", "s" ], - "commit": "d56125deac540a2ab396d6d71f7c1eeae7f37588", - "sha256": "11wn2xf7dbgfhwdrjazshf4c5im1yxnqpyvq8633fjc1cn9s7vxw" + "commit": "41b42779e22c064192b95e4de855ff7ebad45af6", + "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" } }, { @@ -46698,11 +47026,11 @@ "repo": "jrosdahl/iflipb", "unstable": { "version": [ - 20190427, - 1809 + 20190817, + 547 ], - "commit": "47d310a4576ae2195777d755cf86d5ea7525ef74", - "sha256": "0s35iiki06302q7bn2p5gdfv03y7w3d8rkk84hxr5azwhw1v2hcg" + "commit": "aeeb85633566ed3c13dbe94a6a4925d8930b7b85", + "sha256": "07010alf6ymhs0nyj3arafksba0rdvgzjw9wqqhayzw6qqannbb2" }, "stable": { "version": [ @@ -47663,11 +47991,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20181119, - 706 + 20190816, + 715 ], - "commit": "054c125b49247a08af5a391992817776fd0e8af6", - "sha256": "06g4xsirag4gjd9khii4yhca29g5z9507lyyxxk35k36ckarg07i" + "commit": "54adc447d30e60b6e6c39220e8b36d93d63fecac", + "sha256": "0pk8wgbxrly5lz0xzbk0kf5rx8z3cbyv9wj6l8s1zdc0bzj7i1nk" } }, { @@ -48496,11 +48824,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190809, - 1551 + 20190825, + 1023 ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -48520,8 +48848,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190708, - 909 + 20190814, + 1056 ], "deps": [ "biblio", @@ -48532,8 +48860,8 @@ "s", "swiper" ], - "commit": "8978ba5236af767023976c5b793a2b3e29e43c7a", - "sha256": "00fw8j3mjrq8y3qbcgj0baxnspq94a8qgxlyvrc6siraryppw65h" + "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", + "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" }, "stable": { "version": [ @@ -48555,6 +48883,25 @@ } }, { + "ename": "ivy-clojuredocs", + "commit": "ef20e3b6fa8d4586d6f17a4e9a6746390dbb2b50", + "sha256": "1p3fnj6zz2cxirn2dv54hnwabflxsj04vxjf0f7fbs931c7hrshx", + "fetcher": "github", + "repo": "wandersoncferreira/ivy-clojuredocs", + "unstable": { + "version": [ + 20190810, + 258 + ], + "deps": [ + "edn", + "ivy" + ], + "commit": "7af9cef998a608a7f505120af4754779f3014106", + "sha256": "1zg730gby1l0h1vrhbzwba2ybh1rk7n9gj1a369mcd2kkdlsvw2m" + } + }, + { "ename": "ivy-dired-history", "commit": "ad37f6b04ff45fbffeadefc94db16baa27bcc2ac", "sha256": "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl", @@ -48741,15 +49088,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190731, - 1602 + 20190829, + 630 ], "deps": [ "hydra", "ivy" ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -48913,15 +49260,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20190727, - 959 + 20190819, + 657 ], "deps": [ "ivy", "posframe" ], - "commit": "8ad466802de90d47992024394ea5f864c1cf0ac1", - "sha256": "013nsykqp50hdfady8j650lp3bfpmcl1ingf8b4pcwp6mcz2vg0w" + "commit": "d9ceee94171767b4aba6c55ebe93e51ccbe0fa8a", + "sha256": "1ghn9n4lc50p94byi0z2vfgkwyh4q4i19j26dkqr2lyvfhsvvdwj" } }, { @@ -49024,15 +49371,15 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20170523, - 454 + 20190821, + 1946 ], "deps": [ "ivy", "rtags" ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -50160,8 +50507,8 @@ 20180807, 1352 ], - "commit": "4c184256c4ccee3451357d3277c3e1bb16de2d98", - "sha256": "1mlqpzy5xg3wni1dchnmbs01dmlqimy167fknd6bsfb7ydf6ilqg" + "commit": "b4fec1497c76d36f7d8a2aad44983f8b6f501180", + "sha256": "0s80f6sq3ly9wiz5az1imrn5lyqhn0cdlq0vvfadk2ycvb370989" }, "stable": { "version": [ @@ -50333,14 +50680,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20190606, - 1008 + 20190815, + 1327 ], "deps": [ "cl-lib" ], - "commit": "999c0e7d96f4d5be0950b6506d732dc3d7c53635", - "sha256": "0nwhw0qw1hbdh0jrdbsgzv4z9yc93x9yjfpan93cbcw0i9qfai8h" + "commit": "b3841a7a304d9d1328fdb0868fbbecf0c2f9831f", + "sha256": "0rl9vz194c29ljiwgk7xfcgc047hi2ybda7mlj3r1plhk80768n6" }, "stable": { "version": [ @@ -50520,6 +50867,30 @@ } }, { + "ename": "json-process-client", + "commit": "38cf8baad750427268659c8b25d35270add18317", + "sha256": "0lv4xdihjphpg31zdzkzrhp715sj7y2sl87c6cz6akhlfz2mmm0h", + "fetcher": "git", + "url": "https://gitlab.petton.fr/nico/json-process-client.git", + "unstable": { + "version": [ + 20190827, + 1858 + ], + "commit": "422606a7bf08d13646e3db4f6c2bddb69bd61dec", + "sha256": "16fyb0gwm4llwbmg12m4r9r8h540hcvhrsnlly6cry60h9p8dpc1" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "1d4a1fe2ecc682890dfc75e40054c9697c3046f6", + "sha256": "1r1mcd9xqibr7np2gsq8gpl310l05h75y2pnldlqqsszkhivyixd" + } + }, + { "ename": "json-reformat", "commit": "f8c7976237f327fdfa58eea26ac8679f40ef3163", "sha256": "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na", @@ -50735,11 +51106,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20190407, - 2119 + 20190813, + 1326 ], - "commit": "1eacdc608b6ce1947db0a86e61f2061f00a96bc1", - "sha256": "01bz57d8hnlr9g9xm987zaziyssgd5iacxcbgmg9lynksjgnpwsz" + "commit": "db84928742b3e4189dcc81997e4a3cad3eac7b68", + "sha256": "0hv43r037jacizmgql0sxxjj2g0f51k5zcxn7h30if86a6hhx659" } }, { @@ -50750,11 +51121,11 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20190420, - 1455 + 20190828, + 1646 ], - "commit": "71380e8139e28ea527a85ddb9146f2980d62c1f8", - "sha256": "1kmmk5wf0ifyn894qadqxfpwy2j6m397r0lg14sa73r01ql2j010" + "commit": "94761603d368f05eaed3573312503db940f4edfe", + "sha256": "1h3h5s0ls3shwgg6fl3sk0iszqdd90nz2kl5cpj1bbqfgw0fivmj" }, "stable": { "version": [ @@ -50916,8 +51287,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20190809, - 349 + 20190828, + 2043 ], "deps": [ "cl-lib", @@ -50925,8 +51296,8 @@ "websocket", "zmq" ], - "commit": "c4dc513c52c57a6f67d3c25c09079365dd2b06f5", - "sha256": "1bfxv5y8w0c3n81yb59f74014sdvdqf294kw01bq68kcg0xk6bx8" + "commit": "aa9b634e7b26347a9b938da4cb97184b73651a64", + "sha256": "0k1piakj4rzygy73jd6wv9hd6nhci3d056xfiaaala6vywfllvxg" }, "stable": { "version": [ @@ -51202,6 +51573,26 @@ } }, { + "ename": "kaocha-runner", + "commit": "7be32636579e00518b81644ba88e2ed9c1cf7346", + "sha256": "1j68vpbqsqyx54igqpihpzlmr4w38i52ms1aj41s4bgr953fmr43", + "fetcher": "github", + "repo": "magnars/kaocha-runner.el", + "unstable": { + "version": [ + 20190826, + 916 + ], + "deps": [ + "cider", + "parseedn", + "s" + ], + "commit": "5973bf9619d8c8b8f69824246210f31ea644127b", + "sha256": "1sr7zbdbg3hkcbmpr7fwpw26d6j4vk0a3cxnlr2pq2f5zy9n0hax" + } + }, + { "ename": "kaolin-themes", "commit": "043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4", "sha256": "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw", @@ -51298,6 +51689,21 @@ } }, { + "ename": "kconfig-mode", + "commit": "c359713acdb396c16d39fb6013d46677b5afa245", + "sha256": "17dhx5hjqhk4bljmj0v2xy379a0l89h8454x53mv6m9qm3rsnrhd", + "fetcher": "github", + "repo": "delaanthonio/kconfig-mode", + "unstable": { + "version": [ + 20190818, + 2030 + ], + "commit": "02bb919596cf673828e95872dc329f2424a99864", + "sha256": "1h0v9528d2ssjgqa8813l3anhz15aggsmf8yln0qpphhrlrkfmpz" + } + }, + { "ename": "kdeconnect", "commit": "c363866d30fb86ae636d30def8c3847711ada762", "sha256": "1bcwpnwmm1l2jzc5znw8z6f5knysinidsbm12v4r1j8v6v80ydw6", @@ -51846,8 +52252,8 @@ 20180702, 2029 ], - "commit": "3ab5fde4ba63865333766685e025aae01933dbaf", - "sha256": "1k5qnrih9y8w49cbgi6prg98qqxrrn106g7h71azgpbav1mlfyk7" + "commit": "cefc5a72118021e01660734d08d1ad2433c7131e", + "sha256": "140h62p9i4h3jhf7rpsxn4ymg0dnxgf9kg070zc1fdvkj52gxxlw" }, "stable": { "version": [ @@ -52101,20 +52507,20 @@ }, { "ename": "kubel", - "commit": "f1c7ff1c44946f232730066d6c8c25d5b41ffda7", - "sha256": "1rm85bwpsqj600jvri508nn5i17ynyd84aanf8cqqxk5d2wf9x1n", + "commit": "6fe35f90b858d0b6710b4bae8a2b80f97f1b8228", + "sha256": "17xsy0kj2dskmr8mmrlvhkrylzgbfd0jqay9qa9avzlh24v85jcm", "fetcher": "github", "repo": "abrochard/kubel", "unstable": { "version": [ - 20190627, - 246 + 20190819, + 1434 ], "deps": [ "transient" ], - "commit": "4e5009540bb3305c9a0a298ffff25b933d6bbbdf", - "sha256": "08qshza3ph800n2wll4mdrgjv9mv41vq9aq7sa5v73ys3ghm4g7s" + "commit": "88995f796e6ba20cc91abfb012c23fe5ab29e19f", + "sha256": "0b33gp6qkclb1jxsxwjkwa74wri1zj2gx4sw11igbs58kkyzja52" } }, { @@ -52125,16 +52531,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20190813, - 239 + 20190822, + 913 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", - "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" + "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b", + "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj" }, "stable": { "version": [ @@ -52165,8 +52571,8 @@ "evil", "kubernetes" ], - "commit": "e0eff360c83c61d531bf0a0032efa6b963ce2b57", - "sha256": "09zqayzl05yszxh619i2ri12g3c0lbbvbh4m4isyxvancxk88igs" + "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b", + "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj" }, "stable": { "version": [ @@ -52593,11 +52999,11 @@ "repo": "galaunay/latexdiff.el", "unstable": { "version": [ - 20180521, - 2232 + 20190827, + 1651 ], - "commit": "024ee7a4fd235695dacd9f53594fef3d79bee88b", - "sha256": "17xpkbrwfck0m6zp5d1b9b4slkgyvm8d92nzilb4s1rf9nqf9mvw" + "commit": "56d0b240867527d1b43d3ddec14059361929b971", + "sha256": "1gkhzladgh0dj5pvak822x6nq7f4h6382647flhv7c65fqszscbf" } }, { @@ -52721,11 +53127,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20190728, - 1307 + 20190828, + 1538 ], - "commit": "7868e13bc2b10259245dd4bfc4b830ddc136b4bd", - "sha256": "15899b2fpck7k7ksm1x2v5gcq6y3rb9l4xi5i8myj356lgk8ycv9" + "commit": "daa8b5194f5a05b74a9eb46f6787f46ddfe5778d", + "sha256": "05f9vdbk31jpqpc5afnwpnzwaswmlrvz9cr09ncrbjwcap06705i" }, "stable": { "version": [ @@ -52745,14 +53151,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20190716, - 2321 + 20190816, + 1859 ], "deps": [ "leaf" ], - "commit": "4191bab8346313c17a151bf98007781fb5f894df", - "sha256": "0f09d112fsj2gy5nfwsp39llpwl113y0f2jhfhhs20slxqi3hfcm" + "commit": "c314c8295973f75034f0dc2946b18087d3408e66", + "sha256": "114g469016pjar5wmr126cpd6cfiliz4w0lmw1rlmafc53h3wbr7" }, "stable": { "version": [ @@ -52903,16 +53309,16 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20190706, - 1622 + 20190827, + 1032 ], "deps": [ "graphql", "request-deferred", "spinner" ], - "commit": "90324e6b57660c55f5c9fbf7bbb19e9855304206", - "sha256": "013bli8q39d280z1kknc29dsacq4g8wzk0119dhsl3acah5a168k" + "commit": "2b2f44bbd46d3c8db23473833824a237073f6c23", + "sha256": "1bcknygmz1ay2j90cs6rmiax5gsdwrysvv2w13cmz601bv3prrgf" } }, { @@ -53086,11 +53492,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20190308, - 1534 + 20190829, + 921 ], - "commit": "916c0f3b562b5b0e4f4294b83decda941fb183b1", - "sha256": "1garn9rkn1jmv1w329qdw0mbn11j467kfp64902ncajl3590x2ly" + "commit": "69ab5c2db93cf58a57354a5d78e825d191109717", + "sha256": "1bsshad7y9yicbzp2fp53jv4kkli1slkyw7b15db4bgzj8br55s5" } }, { @@ -53134,8 +53540,8 @@ 20170121, 1254 ], - "commit": "0775432025f43cafbb7063b5923286bbd700cdf0", - "sha256": "0q6svybyd73zadr0ymq0a6qydsrg547c5ax4f8kpgla0mc086w9m" + "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a", + "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w" }, "stable": { "version": [ @@ -53154,26 +53560,26 @@ "repo": "DamienCassou/libelcouch", "unstable": { "version": [ - 20180604, - 753 + 20190820, + 1632 ], "deps": [ "request" ], - "commit": "1faa877fd83c31f612eacb1d12645b2b4cfb57ed", - "sha256": "01b72d98h00rkkrpdimm1c64f7470z92yjb46y8gv1r76n6zcfy8" + "commit": "fd90ff7989632452434fc19a609805f7276821f3", + "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1" }, "stable": { "version": [ 0, - 8, + 9, 0 ], "deps": [ "request" ], - "commit": "1396144ebbb9790d4c744db0d4aacc0211b8e8e6", - "sha256": "1r0wrqiqar3jw5xbp1qv7kj7m1fdzciyy9690hwiq99dcm8nlri3" + "commit": "fd90ff7989632452434fc19a609805f7276821f3", + "sha256": "0rpipbcfvi8ysx8aykj9sd23gkzq3knn656g84lb9h1zdjvc4zf1" } }, { @@ -53214,20 +53620,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20190427, - 528 + 20190827, + 1905 ], - "commit": "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe", - "sha256": "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj" + "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", + "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe", - "sha256": "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj" + "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", + "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" } }, { @@ -53297,8 +53703,8 @@ 20180219, 1024 ], - "commit": "4abfd658dd0985b960da08a3ec426cd860d57d2a", - "sha256": "1fqgwydk5cw98nb7m9rq7cmmmmh3qfhwvq2b4lvv47ahk9113402" + "commit": "a00f8e380a8b87269a8ea0b68af63383a74ca5e8", + "sha256": "024hsx5jhr9myssmw60mxyizbj184hq6zxv8b0k1ivll026hbnpi" }, "stable": { "version": [ @@ -53505,6 +53911,30 @@ } }, { + "ename": "lisp-butt-mode", + "commit": "ec923a5f6018404171e6ffc3fb36a649e8defb1b", + "sha256": "0n6inbcjcpw5l95r3z63bdzld3bn3i5ywl2niqfhh9dfv2k1k5wc", + "fetcher": "gitlab", + "repo": "marcowahl/lisp-butt-mode", + "unstable": { + "version": [ + 20190822, + 1102 + ], + "commit": "3199954a70594405ccb7b193e6e471264eae7b87", + "sha256": "12qvycibrxsd3mlpj7x673kwfxhyhg3266ghf3r11179yh12hgy9" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "commit": "f6ccceda1618aad0ec5a665dab912a7ebbc32f08", + "sha256": "0w4i478aybp9ca09ixmzsda83l9igqx5ryv0g8vpkmd2vg3r0dcy" + } + }, + { "ename": "lisp-extra-font-lock", "commit": "13e01d4faf9ecb4dde8b6eb4acdb0e48e3e5b6ea", "sha256": "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk", @@ -53542,8 +53972,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20190802, - 1214 + 20190827, + 1516 ], "deps": [ "ace-window", @@ -53552,8 +53982,8 @@ "iedit", "zoutline" ], - "commit": "beb939a1afaf8ee39955b7bc0bc65326df817f48", - "sha256": "101hqw794a8hcrcwvjjzxydcdlwdvxxfhbablcafpiqj1dr4vn9m" + "commit": "7130b9d36f6d7eaed61e911772ba23e0c36659b3", + "sha256": "1swihyr4ir3a74kl8vppbl8s4yf3mwrvrjrpdfgvva0jys03bhsx" }, "stable": { "version": [ @@ -54445,11 +54875,11 @@ "repo": "jschaf/emacs-lorem-ipsum", "unstable": { "version": [ - 20140911, - 2108 + 20190819, + 2042 ], - "commit": "4b39f6fed455d67f635b3837cf5668bf74d0f6cd", - "sha256": "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir" + "commit": "da75c155da327c7a7aedb80f5cfe409984787049", + "sha256": "04h97vnd758gsdfg30wkrhnh4hz7k63xbrw178dxfcwsylq32wi0" } }, { @@ -54514,8 +54944,8 @@ "haskell-mode", "lsp-mode" ], - "commit": "8f2dbb6e827b1adce6360c56f795f29ecff1d7f6", - "sha256": "00j6d5rpsi7h5jz54zpjmbpg38fda4xy67xc4x67r834493ldzlq" + "commit": "64106be79350f9ce6903d22c66b29761dadb5001", + "sha256": "1d2jvcsx0x7w7f9q93gdi4x2fc6ymyr7d213m9ca5jj52rxjfsm2" } }, { @@ -54544,8 +54974,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20190726, - 817 + 20190817, + 1436 ], "deps": [ "dash", @@ -54556,8 +54986,8 @@ "markdown-mode", "request" ], - "commit": "f407a9a7742fb3890bf9e2d8b8a83a0b9b39ee78", - "sha256": "0yyvbw398fn7dpjq3hj7hpc79fi1xzq9ggwldrfmb3717b4ba680" + "commit": "ccc40d3249c031e34fec13d4b82da694addb0274", + "sha256": "1nb40nnj7caz2mvfwnpwnicck1ippvnqhypqcglp6bvvz75h32z9" }, "stable": { "version": [ @@ -54604,8 +55034,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20190813, - 451 + 20190828, + 1641 ], "deps": [ "dash", @@ -54615,23 +55045,24 @@ "markdown-mode", "spinner" ], - "commit": "e4efbab6704e6b1241cccfa0992dbcc4ba08cdcb", - "sha256": "0by7frvvf1swarswa7vfv1pgq2pirvx5jl61nxdw3q2l1ak4v7mr" + "commit": "4835feb8189fab4b00ba54ba73837c931022931d", + "sha256": "0f859fhy245aq6r0w4ibyaqjr1i4s1f850w4867f9knfw67zj64h" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "dash", "dash-functional", "f", "ht", + "markdown-mode", "spinner" ], - "commit": "789b672500dcbb2350bb5b667ffc0fd037a8b2e3", - "sha256": "1v1mq6ixzlgiazj8fmg4xaqhsqn3l89iqy74yndhvzh2rdf0pbkl" + "commit": "50ddaf439cd62033d3bc0d12cca341fb0d4e1382", + "sha256": "0jn5slhv9zfs446a5966bfg9dq144g22v79wnkx9hxq7if78p652" } }, { @@ -54708,8 +55139,8 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20190809, - 640 + 20190826, + 1758 ], "deps": [ "cl-lib", @@ -54717,8 +55148,8 @@ "lsp-mode", "python" ], - "commit": "8b18a98ad68373aa4d7ef24ec728a250ca570a2a", - "sha256": "1mz6hy1k0g3m5x4cvyqb68811aa2iabmjw4v2qbjfwd5jbmyvy21" + "commit": "d2f9bddc3988a43e680b858e9da44f7b0a0eae55", + "sha256": "0hmmv8rjg89bgkhsf2wcllmz3rljhnnncg00wsiz6fiwh0dw8lpp" } }, { @@ -54766,8 +55197,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20190724, - 1649 + 20190829, + 2110 ], "deps": [ "dash", @@ -54777,8 +55208,8 @@ "lsp-mode", "treemacs" ], - "commit": "e3e049cb441ec5a8f43730da93996f73f6a6db95", - "sha256": "14v8lww136np4pmaq1hqlrpqi6kkpi367cjvfy0s92m3dv7yywsf" + "commit": "3adf416da2fcd7dd4eac33f87c3eff66d5b67624", + "sha256": "0dqa7ny01v7k16pjrb42393blccvck650803hbsf1bp40ainaks9" } }, { @@ -54789,8 +55220,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20190809, - 1907 + 20190823, + 541 ], "deps": [ "dash", @@ -54798,8 +55229,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "1cfff2135ffbf7ac52d9c2ece3f2bd157ac51167", - "sha256": "1pbqjrhdv3n73p785fj3gl11rpaim0my78gp530239w10q5i7g9z" + "commit": "845fbd40f20d63b9eff592ddefeefd2263f6b27c", + "sha256": "0z8cds09wv275ckx13dbw6z84lfldij2lfx0az7cj1hkfsrwhxd4" }, "stable": { "version": [ @@ -54902,11 +55333,11 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20190716, - 1741 + 20190821, + 947 ], - "commit": "a91dd72529aadd2d3cc14e132a3e0545eb2975a6", - "sha256": "1bbyj0l6176277qp20034lgs8ghx01fasnikkc76fndn3v4vsljn" + "commit": "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f", + "sha256": "0nzbjx5rnmzl0dhbrrmb5kbcmww6hzs1vwa62nlg9zfwq99zk42l" }, "stable": { "version": [ @@ -55232,8 +55663,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190812, - 1330 + 20190825, + 1416 ], "deps": [ "async", @@ -55242,8 +55673,8 @@ "transient", "with-editor" ], - "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", - "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" + "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", + "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" }, "stable": { "version": [ @@ -55303,15 +55734,16 @@ "repo": "abrochard/magit-circleci", "unstable": { "version": [ - 20190722, - 1533 + 20190814, + 1723 ], "deps": [ + "dash", "magit", "transient" ], - "commit": "a423b12d3158982cccf39a3d72f6fa00c4c6f387", - "sha256": "00xwfqdnajrykj0l3kzh4y3hp4rrbmyaj8wrwffswyylsacf9kca" + "commit": "03101bd9cdbdfd779471a4c6d3d00ebadc8ca4a2", + "sha256": "10jr06257g3wx45rrx8jp1lxrlf5xx9w07832p2jpwfvqwi9w0xh" } }, { @@ -55556,8 +55988,8 @@ "libgit", "magit" ], - "commit": "75d0810d131e2e61ae3c683797a10a2caca96073", - "sha256": "19ynyx1648riwnpiwzk1mk36z4fw4j4bggr7mf7pinsvv9191zmq" + "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", + "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" } }, { @@ -55713,14 +56145,14 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20190324, - 1459 + 20190821, + 1455 ], "deps": [ "magit" ], - "commit": "f7dad9b0f6b81b23550ea5cca0f3219f184b746c", - "sha256": "1dpljj5l0jf28xsynj9wsgbn6wh6llx0wxvigrv37ccvrz4k2fgg" + "commit": "2cff1a30a30f2b3963342a7d185ec13fc12279c3", + "sha256": "0c4bn9wjjwb0f6hzh7d6vz33lrf75kal62329drzmbh1sla2s3h3" }, "stable": { "version": [ @@ -55837,6 +56269,38 @@ } }, { + "ename": "magit-vcsh", + "commit": "9ee290ad797511ccc4ee2e1d3d773672796da3f9", + "sha256": "025ggdb40js7nmg0fqw3ncki4krswwyvl4q1m8250k09g5r57zij", + "fetcher": "gitlab", + "repo": "stepnem/magit-vcsh-el", + "unstable": { + "version": [ + 20190817, + 2014 + ], + "deps": [ + "magit", + "vcsh" + ], + "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca", + "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj" + }, + "stable": { + "version": [ + 0, + 4, + 1 + ], + "deps": [ + "magit", + "vcsh" + ], + "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca", + "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj" + } + }, + { "ename": "magithub", "commit": "e555b46f5de7591aa8e10a7cf67421e26a676db8", "sha256": "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab", @@ -55936,28 +56400,28 @@ "repo": "jerrypnz/major-mode-hydra.el", "unstable": { "version": [ - 20190715, - 937 + 20190814, + 952 ], "deps": [ "dash", "pretty-hydra" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "dash", "pretty-hydra" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" } }, { @@ -56374,6 +56838,24 @@ } }, { + "ename": "mark-thing-at", + "commit": "bf5429d251d45fb9eb6d3c677b695f5298b1fb91", + "sha256": "1hzahlfxyqs47k406grxsi0qfgcx76884scnnlj2xirszd6j5mpz", + "fetcher": "github", + "repo": "plandes/mark-thing-at", + "unstable": { + "version": [ + 20190817, + 1623 + ], + "deps": [ + "choice-program" + ], + "commit": "0d2220fdc81c33a36ab5f136856f9f2f79cd01a7", + "sha256": "0xxip63gkq76lhlafpgklpnj3n345fw95pdwhn5blzsjrx77ig6h" + } + }, + { "ename": "mark-tools", "commit": "9ca36020392807aca9658d13481868d8b6c23d51", "sha256": "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq", @@ -57278,8 +57760,8 @@ 20190718, 1023 ], - "commit": "bd94d345bf19e612c11737de2d7d401bcc4348a6", - "sha256": "167bh65vjpmqvfn6wvi8dd2c4n3dd1zw3m5y96wcgpiqvwjb01gm" + "commit": "a2fff37a09159ce94a3229ce137bb4e6e552339f", + "sha256": "12786wl1zmhdj5kkvfm9zv02j0lnrja18yrbc286v33xa77lpiwc" }, "stable": { "version": [ @@ -57299,14 +57781,14 @@ "repo": "Khady/merlin-eldoc", "unstable": { "version": [ - 20190314, - 806 + 20190830, + 517 ], "deps": [ "merlin" ], - "commit": "09760346e34ac22f2b55f43f0e36a2865c3b8026", - "sha256": "12bba6f6qxi6azlafzhymqyaf57qi479n34crixmk8v69ivdch8y" + "commit": "db7fab1eddfe34781b7e79694f8923b285698032", + "sha256": "1c13cgmi8z69b5imd9zlagfgrsdl3qv73n24wgc4ih99w1c7sc08" }, "stable": { "version": [ @@ -57483,11 +57965,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20190415, - 338 + 20190825, + 2345 ], - "commit": "70d6da044a4f6ac8e40e489d4963b8a3d530b8a9", - "sha256": "0j569nski5f3z26qa1scpzbsx3xdvmw9sxhm1m9wj3ac5kvgk9hn" + "commit": "3bc70db24c4f1410eb91017ea37173ba7da70281", + "sha256": "054fcl303jjkswnjyx5apas8l6v8f8m3haxsvhn7f1xbcxvjmr9s" }, "stable": { "version": [ @@ -57524,8 +58006,8 @@ 20190324, 1908 ], - "commit": "b18648118144c0a3f7c1d74aad3e98ff16402e2e", - "sha256": "0i8gc4n691fhfn4p99k08bcd5sddn9wjh3cr5djbfh3x78gm4m32" + "commit": "b79e48dd775de3e1a08e445953243f1491e244cf", + "sha256": "0b4kmm09c70jsidrvpla99p9sy9n2d3x628fxrd2z0l6rfwpcyrj" }, "stable": { "version": [ @@ -57551,8 +58033,8 @@ "deps": [ "calfw" ], - "commit": "56e58bb8f22d621d271ada64b98eb6e09595e462", - "sha256": "1bz5s7y7jb00acgk140rbd2rr1i6ajnqvxbgs3yp19cxfnspbcj5" + "commit": "86d3682ff9491893da671237be3cde0b0010ca85", + "sha256": "0md61pfjvx8xakahpig39ldfzvwdjgr19qxr78c7bzl98hbjpgq4" }, "stable": { "version": [ @@ -57721,6 +58203,24 @@ } }, { + "ename": "mini-modeline", + "commit": "d8d20ab65df4c4a85a59a2a926ea14a262375490", + "sha256": "17zm255a85vmxc07h5cr6gcsb92gf8q5ma52z622ridbvzvfc5yc", + "fetcher": "github", + "repo": "kiennq/emacs-mini-modeline", + "unstable": { + "version": [ + 20190824, + 1308 + ], + "deps": [ + "dash" + ], + "commit": "d0ed5f1ac1ff5cdb1db5fb2a99f2a09b9bc6f089", + "sha256": "0i1b220b5kb0h0yhn5s3dgnlvf6r9hd0iazh9nqbnw28n92gvp01" + } + }, + { "ename": "minibuf-isearch", "commit": "ebfd2f3f6a2dbd251c321738a4efaacc2200164b", "sha256": "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh", @@ -58298,8 +58798,8 @@ 20181029, 516 ], - "commit": "4985ba42f5a19f46ddbf9b3622453a9694995ce5", - "sha256": "13n3di05lgqfm4f8krn3p36yika5znhymp5vr2d747x54hqmgh7y" + "commit": "bec2268fb42db58d22479a7b7ca3a956ead1af94", + "sha256": "0yqdc1z6n9cpa16drjij2r77yqk9jhj1z532cnyqnk7r90avbhzs" }, "stable": { "version": [ @@ -58683,11 +59183,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20180910, - 438 + 20190820, + 1114 ], - "commit": "a8820f19a8168ab395ba835872606280ad96916d", - "sha256": "1lpkmbabw9n50hf7yr6n4aim8x0km1wa15mpf7mv9w91ca2blg5d" + "commit": "52fe3ed21490e6a5266e5d2d7111199b997c2400", + "sha256": "00zk1ssfmks4bnw8j4zfxnjsvjzgdf9a3wb08h8jnbpkh48zff7i" }, "stable": { "version": [ @@ -58975,6 +59475,25 @@ } }, { + "ename": "mozc-cand-posframe", + "commit": "2c952ffcf7c2c358500df86e3ddeb6a10a119725", + "sha256": "0spxc1z7glls47k6cpq14cpbx9h0svl9qn954x8f1c7kcdy4wz6p", + "fetcher": "github", + "repo": "akirak/mozc-posframe", + "unstable": { + "version": [ + 20190817, + 2037 + ], + "deps": [ + "mozc", + "posframe" + ], + "commit": "20df08f0bf239bc2a686ff2c6d9390b5ea6d89fa", + "sha256": "0azcwdig6xp5vxr6yidmnbqbrfhgb7jwfmyk4cci5ca8sfm4ycvp" + } + }, + { "ename": "mozc-im", "commit": "4b651b7f1c15b44577b3c2b7493264ed802cf073", "sha256": "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10", @@ -59066,14 +59585,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20190507, - 1339 + 20190827, + 1854 ], "deps": [ - "libmpdel" + "libmpdel", + "navigel" ], - "commit": "1eb87264b6955235348880904378c199d65e3fa7", - "sha256": "0y43i4bngjnzv457kx7f6k38jsmsk4izfwx57pfp8bqz6f2yssb6" + "commit": "a16ff55e93109c37a204cde9a29699eb0b1d8e6f", + "sha256": "01kvgs4z4ppif339l8dq74ipjjyl8rdh0k03xy7zdivdna3mf06i" }, "stable": { "version": [ @@ -59631,14 +60151,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20190317, - 1211 + 20190820, + 749 ], "deps": [ "cl-lib" ], - "commit": "5ffb19af48bf8a76ddc9f81745be052f050bddef", - "sha256": "11cnwg0szk0fk6nf853pc1gisjh6gcq6ic0673qggg03ly77p87c" + "commit": "b9b851a7670f4348f3a08b11ef12ed99676c8b84", + "sha256": "0gg781vaa8jhmq5pdis3lwx3k114a0an2ggzhgqyrx0y3wic51ff" }, "stable": { "version": [ @@ -60444,6 +60964,36 @@ } }, { + "ename": "navigel", + "commit": "af52934237a069f70b8be136576562ba45c04ffc", + "sha256": "0ns2f1p943d2mfai6fdl87swcwh0sgmv0m3wz1kf73zh6vi4i277", + "fetcher": "github", + "repo": "DamienCassou/navigel", + "unstable": { + "version": [ + 20190828, + 449 + ], + "deps": [ + "tablist" + ], + "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7", + "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "deps": [ + "tablist" + ], + "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7", + "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m" + } + }, + { "ename": "navorski", "commit": "9246cef94029d2da2211345c076ed55deb91e8fa", "sha256": "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7", @@ -60864,11 +61414,11 @@ "repo": "aaronjensen/night-owl-emacs", "unstable": { "version": [ - 20190808, - 2050 + 20190825, + 1559 ], - "commit": "16fdaa15593cd86daf1100852045cdbd5c242d49", - "sha256": "0w4q9ar0kn0fgp554dwwb488za8kf80mi1dl0fh748b54m70j2c4" + "commit": "44c1b98f7c0d8b7ad31d6e1b3382bcf0294e03f2", + "sha256": "1nv2s0rz8ihixqxhxj3qn3h0zxfphgjzvldv3y32cg50gxnrb85n" }, "stable": { "version": [ @@ -60906,8 +61456,8 @@ "repo": "nim-lang/nim-mode", "unstable": { "version": [ - 20190710, - 2254 + 20190823, + 1009 ], "deps": [ "commenter", @@ -60915,8 +61465,8 @@ "flycheck-nimsuggest", "let-alist" ], - "commit": "0d46c05cdfa65d37f8cb5da860ff3052782f6bbd", - "sha256": "1lzrfllmcya7l2aqbh0j5wly3dx3wvag3b8gbmpjzd7cm4m6nax7" + "commit": "3fb6643ff684c5b5f3812cf66ea370a9c0e9559e", + "sha256": "1smv4a8rx9minmnw2vx8542lq6wy6n2prcxsvzrrilpykz1qdg38" }, "stable": { "version": [ @@ -60942,11 +61492,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20190810, - 1848 + 20190815, + 1740 ], - "commit": "0bbdedd23361ffbd7199c70481803b708fb65d59", - "sha256": "1v4cisqlqh2lqql29459lb475r4k95gz8qdvsn89hl58s27iq420" + "commit": "d2e627024ab7ce608b5203d4084c6a1588621545", + "sha256": "12zdk161d18f1yl6linx2g4fw1p4x68n5fbikkklw0ssqj0liqy2" } }, { @@ -60960,8 +61510,8 @@ 20181024, 1439 ], - "commit": "bd17f236231a58c44f1f5f09ff925aa666d672b7", - "sha256": "0xgb954shsahj8vm0mncl85cmy74xxxdqh4fp4bjv10gl8z2p8hf" + "commit": "61f90e918b608413daf07ffcb5c5c0930416951a", + "sha256": "1wsq7ap7yn5lvvb52ggzh7qk8wr8s4lfiip9v2qp73q25mlqnxww" }, "stable": { "version": [ @@ -61214,8 +61764,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20190812, - 2056 + 20190819, + 2331 ], "deps": [ "anaphora", @@ -61224,8 +61774,8 @@ "request", "virtualenvwrapper" ], - "commit": "3e6c4a5cd073d3d02aad0620cb00201e1f659fa5", - "sha256": "0k85hvp88i4rmv4igwhflw1rf307wxqk7l0qipybgbccs2zca5hc" + "commit": "c16a75a6fd99f5c47f10b349131be1c3d85bbe9b", + "sha256": "0gabznnvg9gxd6rrvcik2iyrlmpl409vc5k37c3vfjrnjqnwk6ra" } }, { @@ -61251,14 +61801,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20190730, - 2037 + 20190811, + 1527 ], "deps": [ "cl-lib" ], - "commit": "b36e1d28b97693850da258e103f24c40ec882753", - "sha256": "17y0m1n8vn6p0qykphbpbjbm3gzd2wprw6i2nwfd4g718hbsrkwi" + "commit": "e1e79c0211ad924ca220dac3a7a1a2e40710c073", + "sha256": "0cc4x62wynf71hzqk7gwx8g58gl4hm65pv0df8cir8g344li1c15" }, "stable": { "version": [ @@ -61564,8 +62114,8 @@ 20190525, 1602 ], - "commit": "17806ecc955ce0375146ea1df51eae061a72bef8", - "sha256": "1ishc13x25c4gxkgb9h1c7s16b5h2wrsxn1pk8vpykziippkjwxs" + "commit": "e13862f127394fd4addc5d2cf604b3af399c8377", + "sha256": "0w2jzv378bkkvwb6k7i6sfpis6hf8zpgwx8m2sa44ry3hixqmbgw" }, "stable": { "version": [ @@ -61614,28 +62164,28 @@ "repo": "wasamasa/nov.el", "unstable": { "version": [ - 20190611, - 922 + 20190821, + 1920 ], "deps": [ "dash", "esxml" ], - "commit": "b57fae0814502496796ce5b8170d779b64df42a9", - "sha256": "15s0r64w37m7a8kbcm47svvadaz6amqb9zirmyv7placbrfyaqzp" + "commit": "ecbdecc927a3b3f7e0927d225e6e6464c244c2ae", + "sha256": "0z6h3vgp0vawr96ni7814csdzkq7q710kya8raf9ii90fkzwhpi1" }, "stable": { "version": [ 0, 2, - 8 + 9 ], "deps": [ "dash", "esxml" ], - "commit": "b57fae0814502496796ce5b8170d779b64df42a9", - "sha256": "15s0r64w37m7a8kbcm47svvadaz6amqb9zirmyv7placbrfyaqzp" + "commit": "5184fbb1f3b3540be58a28f6dd469ff212ccc9bd", + "sha256": "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3" } }, { @@ -61762,8 +62312,8 @@ 20181022, 2154 ], - "commit": "b16092e8058af63ad2bc222f166b0aa3cb66bf9d", - "sha256": "0m1ih8ca4702zrkhl3zdvwbci96wyjlxhpfx95w372k25rca87dq" + "commit": "1efc30d38509647b417f05587fd7003457719256", + "sha256": "0px64jsdps477s9xiw96mhcf1fmgxf0gsp30gzhqfb1b1k4f306j" }, "stable": { "version": [ @@ -63171,14 +63721,14 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20190731, - 811 + 20190826, + 718 ], "deps": [ "org-re-reveal" ], - "commit": "e6cd154de8cfa0382495a047804e3b1ac90b431c", - "sha256": "1kf7daxs7p58lw7m09ygisyhm8hnzsdp74f1wqwb5fbl5zxhhmpq" + "commit": "f62fe1497be473d776d22094a02cfff381c61cfc", + "sha256": "088khyvflg4akdszkpalv2j49g25g10b0xzrjji2h2lgb1w5dg1m" } }, { @@ -63548,10 +64098,10 @@ }, { "ename": "opam", - "commit": "fc4e2076ebaefe7e241607ff6920fe243d10ccd0", - "sha256": "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "0hd08sb645jxz72m4g0jaggxa6l1dgimzgvd3mvvadihj6xkr2p3", "fetcher": "github", - "repo": "lunaryorn/opam.el", + "repo": "emacsorphanage/opam", "unstable": { "version": [ 20150719, @@ -63897,6 +64447,30 @@ } }, { + "ename": "org-analyzer", + "commit": "1e264f0cbd4ce919d28ae7b2fa00752dc83491fc", + "sha256": "18390jllqx2md5y5fjprx90nx11i0h1mdqx2q8jzv7napw957b1d", + "fetcher": "github", + "repo": "rksm/clj-org-analyzer", + "unstable": { + "version": [ + 20190827, + 2211 + ], + "commit": "e55960609c1ccd5feda307e28e72eac1f07e8e28", + "sha256": "0y1x04046gifmky3i46i23anr6q2f7ynj7lxp18v2iah3ri99v8f" + }, + "stable": { + "version": [ + 0, + 3, + 5 + ], + "commit": "10fe5da1bbad72093b784fb8c4c262e9daaa8b97", + "sha256": "0gf3bw8c5yll07mvh0ippvkqyf3m5bf36mwxabmmc64fpy0xb3jc" + } + }, + { "ename": "org-attach-screenshot", "commit": "f545cd8d1da39e7fbd61020e178de30053ba774b", "sha256": "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn", @@ -64048,14 +64622,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20190809, - 1315 + 20190830, + 757 ], "deps": [ "org" ], - "commit": "0f984e01a982ded563df9fab5355a29f781b2430", - "sha256": "09m4vsfmqfni5jdwxpkhfg3jzbd69d3di1z9wdc9bvbxrrd03a3a" + "commit": "e8a0dd5dd04c17dbbc954f3f2ec985996a539f01", + "sha256": "05l2yy3886nvkplca09q45lpzpwzx8fxd7fr96b4nb5i1187bagx" } }, { @@ -64090,14 +64664,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20190812, - 1918 + 20190817, + 1004 ], "deps": [ "org" ], - "commit": "1fd520490303d9a3e45187f2fe56f00ac403c214", - "sha256": "1m1ics2pd7x07ylbkmm1darbqdzrp29x3jlckr1bwizk9dwaz0r4" + "commit": "a563500c9884f38ce08793e2964f8274adde163d", + "sha256": "18qi1iv5dc0gsvkv9ifal3cjpm568nlb907v8a53cnm4439x1l0l" } }, { @@ -64153,14 +64727,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20190807, - 1453 + 20190815, + 1459 ], "deps": [ "org" ], - "commit": "f42d75a9787f9644f03b6f9a379bbc40f6397605", - "sha256": "0ra8ky67i2f4saqv265dby0r1x9n4lv8vn607g0z7c9myff6bxnf" + "commit": "8715302a16b5dc2cafee732a4e6b10a263d65328", + "sha256": "0l656xd2zp7l7xb5qs8fw8qsa8sdw5fp305lwiz66zq041xcpg4w" } }, { @@ -64421,14 +64995,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20190604, - 1340 + 20190830, + 1448 ], "deps": [ "async" ], - "commit": "ac72bf8fce3e855da60687027b6b8601cf1de480", - "sha256": "0ax5wd44765wnwabkam1g2r62gq8crx2qq733s2mg1z72cfvwxqb" + "commit": "10c9d7c8eed928c88a896310c882e3af4d8d0f61", + "sha256": "0i8wlx1i7y1vn5lqwjifvymvszg28a07vwqcm4jslf1v2ajs1lsl" }, "stable": { "version": [ @@ -64700,8 +65274,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20190812, - 951 + 20190826, + 2152 ], "deps": [ "alert", @@ -64709,8 +65283,8 @@ "org", "request-deferred" ], - "commit": "f0f9dc2ba7a5075b4f6755f96399c9dfee299ac7", - "sha256": "0s6bcyhg059409s0w191m1hpd8nfi1478jsilnby5fn1jhgdjmga" + "commit": "149ea8ee6ce538742d65d5a7925ab4536f421b1d", + "sha256": "02myllpdlizaqxfa8c8dk14481ly3c1yzb79dg1acna132p6sn93" }, "stable": { "version": [ @@ -64810,11 +65384,11 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20190703, - 1328 + 20190829, + 1443 ], - "commit": "eeed0584b1ebcc29bdbfd354e23141fe9f94b945", - "sha256": "0bfxl3ab1xpbpyvcr0qx6nk4lc1xm9ci29klqnr9msy5i94i6b8k" + "commit": "687c10cb4a2c4a66730bdfce161068bc6b0d2fa2", + "sha256": "1nnj7zzcbrmlnnd6q6739pqm8jsmlik2ci6zlfpd05sj7kmg0l19" }, "stable": { "version": [ @@ -64889,11 +65463,11 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20190701, - 1600 + 20190826, + 1919 ], - "commit": "eb7f9ab2f3e322586551c2f94c548868f8fb7aa2", - "sha256": "1h2w608a5r841bjcbacy2z5ph4mhykrg1zphrflz91ypsygn0qnj" + "commit": "cb15adcec09a891911bd2a85cbbfd45502e65f00", + "sha256": "10daayd273fc1vz6zxzjbi2blww12y2vzg93awmhn9awy5plg75z" }, "stable": { "version": [ @@ -64928,7 +65502,7 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20190802, + 20190821, 2107 ], "deps": [ @@ -64936,8 +65510,8 @@ "org", "s" ], - "commit": "1f9e420fd0030049714690c3d98cc75da83255bb", - "sha256": "0m9l4xsalavwm82wvlyfphi65lb65mkyp5dvpyjf86ijc9w8crvf" + "commit": "dd259135a4c3a320e020a335ea27fb4a2e488a53", + "sha256": "0k62s4kz8qmfq21r2jz7kfcyn6ydwxzfa5s2s2f26jny8flqva1d" }, "stable": { "version": [ @@ -65068,8 +65642,8 @@ "cl-lib", "seq" ], - "commit": "50bd8c22cde3b9b091889861e44a5043b53556f7", - "sha256": "01xz10xicsq07cyd6b42q3r8wnmsn91zjqkrh014d54alakkwhjj" + "commit": "65c09c5deba065752eb88875c54dc26abcdfaffb", + "sha256": "11chlfvil0wbvzaplzdymn4ajz85956hcs8bh3zds6ij806mqa4y" } }, { @@ -65222,14 +65796,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20190710, - 2230 + 20190822, + 2115 ], "deps": [ "htmlize" ], - "commit": "2e01080507e2276d5c52140f2c66f692e8e62f47", - "sha256": "18l8rjzkrrqmfq86s0m23xry8c92mls8bw019drbqix5g7ijw2gv" + "commit": "df89f46a86abed5c39d66ad35b47ab763dd27781", + "sha256": "1xm1ym4x1916h8nkm5zpj5q25sj2n9iawibmf2ifk0yr8faaz2jb" } }, { @@ -65290,15 +65864,15 @@ "repo": "weirdNox/org-noter", "unstable": { "version": [ - 20190807, - 1809 + 20190829, + 2358 ], "deps": [ "cl-lib", "org" ], - "commit": "d3df267a7432ecf0fb287a645e06dee7e7b80671", - "sha256": "0hj2h88zcg6vp3h1dash91gg2k1dqw2bib2glv0cp39b0xaspcsf" + "commit": "54e1bc5c1dbb291d4ed55c7961633b2977374055", + "sha256": "1kyxphldkqggn384mplvj8r3rbfwz7q8ba64i43b4j0ldglbvwgl" }, "stable": { "version": [ @@ -65527,8 +66101,8 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20181216, - 1436 + 20190823, + 1530 ], "deps": [ "a", @@ -65536,8 +66110,8 @@ "dash-functional", "request" ], - "commit": "84b026741a3f06ac4979b970a04f5c9bc38b8be1", - "sha256": "1dvr40i6zxkyimypk9m3p8jl2ff0xkp9pxdiggi5s6kkcrdw3cl7" + "commit": "11bde7699634926369fad0081d5e6d7525ac3260", + "sha256": "03zs5y0wm49pma739574sq6aky26l64j3bi6c8k52zzmg3pm3shy" } }, { @@ -65753,8 +66327,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20190813, - 146 + 20190830, + 1527 ], "deps": [ "dash", @@ -65762,8 +66336,8 @@ "s", "ts" ], - "commit": "5174aca4e8fe956abae7161d15058702bc8874c1", - "sha256": "1r2a1j4cdkw7rf981r06c3qc30c2irs3gawzkwxiflslkimpav42" + "commit": "58b298153c482e6517995bb94f28e03aaf9924bd", + "sha256": "0zkfczvmfwm09diihxr2yn1mdi7hxcd7p4hj4j0fkq6yrf296ca4" }, "stable": { "version": [ @@ -65855,28 +66429,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20190802, - 642 + 20190826, + 749 ], "deps": [ "htmlize", "org" ], - "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", - "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" + "commit": "84edfb6c359b4cdd489a92adf7e31c40a3c893e8", + "sha256": "0lz38sjkfja3f4szjw3gb15ckggkr4bjjyb3zdcfli89781zdjrq" }, "stable": { "version": [ + 2, 1, - 1, - 10 + 0 ], "deps": [ "htmlize", "org" ], - "commit": "dcbfcb80a3c6fd0f5af25d1fd17d8e0c6582e791", - "sha256": "0nm87rmbljw9mjv7fc6ivpqxnwak4xs0wjc903ihwd3y9vmc36p8" + "commit": "6941394ce00f02a1fe8e7db99fe0c0bfc0a19824", + "sha256": "0bfbgjlp37ysik8y6a4gcqhbmy73i5p87lhjhp4d13f7dxq9q07p" } }, { @@ -65887,15 +66461,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20190804, - 846 + 20190819, + 921 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "094fd1d320c64ac361a57402501f0e43787b357c", - "sha256": "0r1ns3fm22yxc6zf4p5rvbk49r6966fqfl1caf0w3fyqgvwvllxi" + "commit": "12a85e3f6f1b2f4c9e0169c8642a78f71d933633", + "sha256": "0c03rd2rr43hbm4s9fd05qmhy98yvqdxg8da3dkwizkynr47f2yn" } }, { @@ -65906,8 +66480,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20190807, - 1016 + 20190817, + 624 ], "deps": [ "dash", @@ -65916,8 +66490,8 @@ "org", "s" ], - "commit": "c1984fe70322c35ee48b2d8bc410dd0a13ffbbc5", - "sha256": "13kcrki9v0w594g8q6rdzfx4002xzs8sz7c5fg7rvrm03sp93dqa" + "commit": "6336a0c36ef1048ba1f4e07716a421dce106d082", + "sha256": "1lpkjvlm969pr64j25zkpmsacjnr7qbq9zfwwzb9xyqlhaf5zzz0" }, "stable": { "version": [ @@ -66195,15 +66769,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190720, - 1012 + 20190824, + 814 ], "deps": [ "dash", "dash-functional" ], - "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", - "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" + "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", + "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" } }, { @@ -66214,15 +66788,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190812, - 215 + 20190817, + 1823 ], "deps": [ "org-starter", "swiper" ], - "commit": "cf99a57ec95773a765e71b764abaff974d7fa278", - "sha256": "0ipqzbc3az4mayz49kc504kw0q3pcy6izbcdg8fmqrckgv79x54y" + "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", + "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" } }, { @@ -66287,17 +66861,18 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20190809, - 1550 + 20190815, + 2140 ], "deps": [ "dash", "ht", "org", - "s" + "s", + "ts" ], - "commit": "4ad333643276ba1a604e8bec4a72ab68bafb8a94", - "sha256": "1rbivi5xjpbs4rbfldhrf0lw7q1nh99nlf8yi11kxf76z6d75vik" + "commit": "f65ff8109c97368ad640a6a50aaebd24046ce54a", + "sha256": "08aqq5sgj6y8mdj244j8024ampij49q08maws2sb1s40f0a7s697" }, "stable": { "version": [ @@ -66707,8 +67282,8 @@ 20190409, 1815 ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -67025,11 +67600,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20180522, - 1620 + 20190828, + 922 ], - "commit": "200ac4a636eeb6faf1793d1937e62a343debc437", - "sha256": "18a04grh4k9npf566xki9fiivy5qvpvv5v8mpj66wfx919fwa44c" + "commit": "cde171651b08ef24326127a62992062e25c3e699", + "sha256": "0a970fv8y2pvbxw2iy09zyl70c2raacdsysdi6ywkxi63fid5l8r" } }, { @@ -67443,10 +68018,10 @@ }, { "ename": "osx-trash", - "commit": "1f4c86e5b86df6c5c2c484f041fa3e434bbfbbb1", - "sha256": "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "05saq6w66n55m0wihwia6v2dd08xvblaw1zsbpf40l901flh9mrf", "fetcher": "github", - "repo": "lunaryorn/osx-trash.el", + "repo": "emacsorphanage/osx-trash", "unstable": { "version": [ 20160520, @@ -67951,14 +68526,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20190802, - 1755 + 20190830, + 1623 ], "deps": [ "org" ], - "commit": "470a708152c4a17eca80c49e042d4eeb57645539", - "sha256": "0dv068ghbci85y88zcqp6w4qkc8xpgwayh1van05r1k6krms8jms" + "commit": "a8e0c6e1ceeecebd5d2cd17dd3062b3e8aecbfcb", + "sha256": "0j2prlgb3gprdg9ynaka7y9390qdns6182zj6qpjvayvxkzfi0p5" }, "stable": { "version": [ @@ -68065,15 +68640,15 @@ "repo": "jlumpe/ox-json", "unstable": { "version": [ - 20190802, - 350 + 20190819, + 1506 ], "deps": [ "org", "s" ], - "commit": "ce99a8a7cb2e2a483d23ebc2f821f3a183cf4b50", - "sha256": "0lgcrd4ckjfph4h0ias6cr83bnj903xiyak6pcvskp3wfgwg09wa" + "commit": "96b7d330b77b02f7039adabe488595847a008bda", + "sha256": "1whysxp4s84lhvgz8vnj2r51dfnk91v5plvbj61rac0077md6df5" }, "stable": { "version": [ @@ -68097,11 +68672,11 @@ "repo": "linktohack/ox-latex-subfigure", "unstable": { "version": [ - 20190718, - 1529 + 20190816, + 1905 ], - "commit": "2e5b679212c33064eb25a8887e19a74897545389", - "sha256": "0mfjwwymlbyzppqicakyfl2yimlk48xvbr7sy2maip358898m5rj" + "commit": "5436eaf0cb036fed0a2042533ec1466a33cf9493", + "sha256": "1j9z7qr5nxbi96s22kkjp10jf29k7i61pwhs68j0lb4v238vdpsj" }, "stable": { "version": [ @@ -68646,14 +69221,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20190805, - 1628 + 20190818, + 1456 ], "deps": [ "cl-lib" ], - "commit": "64a6ac2343c791092ec2e43bab0c91293509c230", - "sha256": "0ac6kq9k6n3mznl0x5sgpalfa3v4cx9m0b7jc3s89dnyw6m4wp6h" + "commit": "4b71d9a5034953b0beac02b4722f09f43c5e0dbf", + "sha256": "1kc20sg0if2g3a2m6pjvwb7ddgcivmqfi104236s04dy4npzkwbm" }, "stable": { "version": [ @@ -68895,8 +69470,8 @@ 20190519, 2238 ], - "commit": "6f19d894bda6a981c10a58df5e23419f4d2ba353", - "sha256": "0b9jlqf5hk5m5zywwfcgxjb88aqhij73fxwkp16psfm4bv0zy78p" + "commit": "2e1d274e11071bb8daea4d6f4c0369c84466de7a", + "sha256": "1w6ckbb8rmi65knwnapyjy9amzcikgw088c6d9h5gqzdknbfdrqc" }, "stable": { "version": [ @@ -68999,16 +69574,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20190630, - 1842 + 20190827, + 1127 ], "deps": [ "hydra", "lispy", "worf" ], - "commit": "ef33bf4a84fa6fdd045e6e3d182429952f240c88", - "sha256": "07nlp4wfr7d856jjhxb8zqb9wsb425d6h48k2isy7jm4h7ksfm70" + "commit": "6fc4759d5431430ef9b3a182883d7e49ff7369fa", + "sha256": "0fmjii2j773alxj6nzg38qhyp3vsxh5x5mkbcazbchq1idfbhzlc" } }, { @@ -69113,11 +69688,11 @@ "repo": "coldnew/pangu-spacing", "unstable": { "version": [ - 20190422, - 514 + 20190823, + 401 ], - "commit": "3a741c1b669c7194fb766b784c10d52a8de9b87f", - "sha256": "12980pwsk4pvvya2x9nbwzkyxy75qfqzs0jxl4jdblgrhh104bs0" + "commit": "2e2dc6427b4427b045df37ba793884c6225c262e", + "sha256": "00zqb68vzcqd1mcxz3nsdydima14381dvqc4nncqm1l6hnapxf1h" }, "stable": { "version": [ @@ -69139,8 +69714,8 @@ 20190124, 1828 ], - "commit": "1c4b082f6f19c2563dbfbc48b996a915843624bb", - "sha256": "10ys10m6mxyh7hblsqcpjmglnh9lwzl9b6bmbcankpvrl0zh094z" + "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", + "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" } }, { @@ -69259,8 +69834,8 @@ "deps": [ "paredit" ], - "commit": "653d7a58fb370d5f7df367464d8d05e23a70b29d", - "sha256": "0q6a3cvanjh3j0kdpqa812yql2axgga45g6nljvxijm8i9ba2hqf" + "commit": "f04c522e6b088a11255a95cb1e6a08198b4d6537", + "sha256": "1jp6wk4zkfcma4akchbdh8wg5fi0i74m4cgnqnmvbyzwkbj6sf0q" }, "stable": { "version": [ @@ -69369,8 +69944,8 @@ "cl-lib", "dash" ], - "commit": "a7c041454e05ec2b88333a73e72debaa671ed596", - "sha256": "14ld7r2867aqa1rzk75bzf6qivqd1va4ilawggnxbbx5j2d82r1d" + "commit": "eaad857ae4351f72a561ee3dec8943713510003f", + "sha256": "1yjq2ddqmsl9jfy4qggwk5f8602ybvsx5qd544whm2b5xm0c5z9y" }, "stable": { "version": [ @@ -69673,16 +70248,17 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20190804, - 2004 + 20190829, + 1054 ], "deps": [ + "auth-source-pass", "f", "s", "with-editor" ], - "commit": "e93e03705fb5b81f3af85f04c07ad0ee2190b6aa", - "sha256": "0sxwz6awr60xh27q3ng90mmgjs9dpcjkags9dyvr3kc45dmdb931" + "commit": "b87e91f984f45615b6459ff3829baa9130b8ef75", + "sha256": "1xgfw238ph6fa8inrwqzfzfzqi16w4rr5sg79djb7iqz8njczbn8" }, "stable": { "version": [ @@ -70964,11 +71540,11 @@ "repo": "j0ni/phoenix-dark-pink", "unstable": { "version": [ - 20170729, - 1403 + 20190821, + 48 ], - "commit": "4defbb76b00c1a29f060813898578152d6be623d", - "sha256": "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc" + "commit": "ddd98a45775be105984ec598384e68df3d3e8046", + "sha256": "02fhna45wq3wja51yrwm0xysdvyck1r0a3dx41i5sh89504gl6a9" } }, { @@ -71091,14 +71667,14 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20190812, - 1711 + 20190827, + 1721 ], "deps": [ "cl-lib" ], - "commit": "6969d273992fd49c730fcc3170f17771a272b67c", - "sha256": "0p1bqabzlxp56vgvz42salqfjv7h3ffmnjv76wbzpx1jx5hx8yqd" + "commit": "5a5b9073585b7afb679e32f1d61086d9122c8b3f", + "sha256": "1595ncllpfzgjwq8lwcpk8wxgjvcsigpppf6y5s8gj5g7rz4d45c" }, "stable": { "version": [ @@ -71189,17 +71765,18 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190812, - 1454 + 20190824, + 500 ], "deps": [ + "async", "cl-lib", "composer", "f", "php-runtime" ], - "commit": "01ced487c673e027332ecb99c444f819b05ab40b", - "sha256": "0ish3kvzn1j1arg6n1mglzsb46sc7hr7gqgnw2084kj56y5q6rjp" + "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", + "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" }, "stable": { "version": [ @@ -71360,29 +71937,29 @@ "repo": "ahungry/pickle-mode", "unstable": { "version": [ - 20190122, - 1748 + 20190816, + 341 ], "deps": [ "cl-lib" ], - "commit": "0d0b1925b7b79e2c80a1877351e3c6ce52935c4b", - "sha256": "0hbymja9109fzw34ra5iyxvhfv0x8ffr8sayqihdfmrs2ymh045z" + "commit": "0dab75b9f75dc2d0cf28f876cc9e2d127e6dca15", + "sha256": "03jp4nhca78k8kl6r5g8c2spjxsamhmqq5p3fqhiniqm3sz5v6cf" } }, { "ename": "picolisp-mode", - "commit": "fe116998dadeef6e61c0791efb396f9b8befa5d6", - "sha256": "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5", + "commit": "33b151c3aba268977b105965c816716d8b35ad6d", + "sha256": "1g45gmg3wd52yi3838bjlz3ccf71fznm6l3nkp7a7929q3rj9d90", "fetcher": "github", - "repo": "flexibeast/picolisp-mode", + "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20190811, - 1431 + 20190824, + 806 ], - "commit": "bf358e5e75adb7cfa1b7cde24209428a88d86b56", - "sha256": "15zb3g6b3n9242p10frzcyxa9gasnbmdjplsvjibzhxrrnhapans" + "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", + "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" } }, { @@ -71773,10 +72350,10 @@ }, { "ename": "pkg-info", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n", + "commit": "29dc2ef3801a1cd7cf8edd2eae68b03bf00e96a0", + "sha256": "1pg26fnni5yi4agqmy1lf1k0wkrcjz1d845d8xryai6bf8fiwf0c", "fetcher": "github", - "repo": "lunaryorn/pkg-info.el", + "repo": "emacsorphanage/pkg-info", "unstable": { "version": [ 20150517, @@ -71883,26 +72460,26 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20190812, - 1540 + 20190822, + 1403 ], "deps": [ "dash" ], - "commit": "1e5f8beedd940458d043832c7d972dbfe492155e", - "sha256": "1pf9jpsbxqxd90y3md1h1fyd2v9swhf10kkknfln102k6chyy1jx" + "commit": "2f8170b30b9885b5a6992047662d5ba0f4ac2248", + "sha256": "0c9as4g2rc1py12wcmv4s4gn2cpsf55cm7b4yf8amld5viz7r7pg" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "dash" ], - "commit": "648feb5b12372bbf8ea37544c44ffcde0aceba69", - "sha256": "0xpnd9r2d2pb6dj3sj1b0bvhg6rm1m6y1ksvngc9yfpynrxgrxwv" + "commit": "b39c310e9cb5a2e7aa72d143348362307d561f88", + "sha256": "03sdkjs7al2g6kqsxr8z53lqsnir6wk2a59kgi08lki049zim0a0" } }, { @@ -72074,6 +72651,21 @@ } }, { + "ename": "plisp-mode", + "commit": "33b151c3aba268977b105965c816716d8b35ad6d", + "sha256": "157v6h0rss9q1nshq0s59nn8q4xm7lq8c83ljgc8g9cql5b632i6", + "fetcher": "github", + "repo": "flexibeast/plisp-mode", + "unstable": { + "version": [ + 20190824, + 541 + ], + "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", + "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" + } + }, + { "ename": "plsense", "commit": "fb1025f146514e9c142cd96cac9f2989d6d1a8c5", "sha256": "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va", @@ -73570,14 +74162,14 @@ "hydra", "s" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "dash", @@ -73585,8 +74177,8 @@ "hydra", "s" ], - "commit": "854827d0585a4fc9310708bfae2514957f4dc341", - "sha256": "0649wrm5zb68yfqxmim6rcg6ykv2dqxishjpas3hj3x62xn44qrb" + "commit": "d9fb688dae3e134bb1ff7f35474c58f33a5bb992", + "sha256": "0aq2dk7c9jqq13p3bv0cq1aym00chcr5f9p3v93wl9h6pc3spbnc" } }, { @@ -73699,14 +74291,14 @@ "repo": "travisjeffery/proced-narrow", "unstable": { "version": [ - 20190810, - 420 + 20190818, + 1923 ], "deps": [ "seq" ], - "commit": "df5cce50b3d1219b23d28e23cbf68e0c7807a15c", - "sha256": "00b2g7prijad6q2zw0vhwq1xb49kcc8ym116zfj5r8wxz9cmpzpr" + "commit": "079a6834869638ae3586a68474149575d7623ef0", + "sha256": "0771n655f4bhvw6qdjkk0m8l5qwbqdyk28whp52bmx95j56yfkvx" }, "stable": { "version": [ @@ -74450,11 +75042,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20190727, - 1325 + 20190821, + 848 ], - "commit": "aa36785c6e7166da0720e05ba708cdf22687a9d9", - "sha256": "0a64z8h3mw3hyfiq0grpagmjj63bh6ix97f9zaximzin0q6zfxkk" + "commit": "d53ded580e30d49e7a783280fd9ba96bc9c1c39c", + "sha256": "17hf4mxpijvgd2jrffibcz9ps4vv8w2alcgmh78xjlb6mm0p3ls0" }, "stable": { "version": [ @@ -74557,8 +75149,8 @@ 20170526, 1650 ], - "commit": "c132a4aa165d8ce2b65af62d4bde4a7ce08d07c3", - "sha256": "06cqi10q6w07pshmfkzd40k40rm5slgsrbb6n0jdskhbw97wqk6h" + "commit": "36bdcb5a7a79aff977617bd1a83a7b25055e38bb", + "sha256": "00fgcysw557mgs0wfh095djnxd94qklf6h45bh8zw1dyhwfbmqpx" }, "stable": { "version": [ @@ -74833,11 +75425,11 @@ "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20190420, - 541 + 20190828, + 1136 ], - "commit": "552206807c9af6ec150540bbdda5d08393196e0a", - "sha256": "1bb14xcglvamvlqsx3dz75zq5ws17774g32484x5ksfpajpibwas" + "commit": "c47ea8fca65c0f964365488a392e51798d698cdd", + "sha256": "0j861dp8jzkp6a6956x9jy00bc905bzf3rwylws2vvrz9wpzp7r3" } }, { @@ -75379,16 +75971,17 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20190812, - 222 + 20190826, + 51 ], "deps": [ "async", "popup", - "pyim-basedict" + "pyim-basedict", + "xr" ], - "commit": "d096fc941f3844825415e2d3a3a627babe003428", - "sha256": "10i54v0v8x8ljh5h06cw3zljfi1g8bdkiprainn59ik8mc8rhhlw" + "commit": "0b8a7ff8b0fcd1086ef938ae398c8efb4791e494", + "sha256": "0lac78442pyidlrnd8zy6c96adv1jdfismz0qd9a0rj4zyfnzp4r" }, "stable": { "version": [ @@ -75533,8 +76126,8 @@ 20170402, 1255 ], - "commit": "a6b1e810df608430b04b65ad1ddc9ba1b8a22c89", - "sha256": "06cv6mah6wjbbwi196vn3fncf4drrhhr3gn1jndf2s14j98zpkh4" + "commit": "6b3afd4f6d75debd7f286f0d3c760ed10ab1e79f", + "sha256": "19rq53qmk3vzlh9l29f254jpvjbf28j6bzmhzakhy8sn1vchpqsq" } }, { @@ -75634,6 +76227,38 @@ } }, { + "ename": "python-black", + "commit": "9e485ee04b19dda5d2165021da5018c3658a6cd7", + "sha256": "0jpr4zj8q4wfzfslr7v4a6975iz9jzd4ccmnci0ycbkbmrhy3mzj", + "fetcher": "github", + "repo": "wbolster/emacs-python-black", + "unstable": { + "version": [ + 20190817, + 1754 + ], + "deps": [ + "dash", + "reformatter" + ], + "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e", + "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "dash", + "reformatter" + ], + "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e", + "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk" + } + }, + { "ename": "python-cell", "commit": "0549866c5e96f673ec9dec298e7ff9d5779d443b", "sha256": "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf", @@ -75731,11 +76356,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20190724, - 633 + 20190819, + 1244 ], - "commit": "3bd6df77ddf41a3cfa10d8b634aeb8c65eb14b64", - "sha256": "07gai9b86cjsb9s0rh0601mznpsajmslp98sdig77qm9vvnj1x6q" + "commit": "31603f1fc1d8a7568b7259d7ccfef58dde72430a", + "sha256": "17rb0427v6nwjxy7b2364ihhlzhnqib1xvb547x8kdl971hw3ngx" }, "stable": { "version": [ @@ -76215,19 +76840,19 @@ "repo": "jstranik/emacs-quilt", "unstable": { "version": [ - 20190304, - 540 + 20190828, + 506 ], - "commit": "161ce2d8ba225bccef0ea8ae4937251b8ccaa892", - "sha256": "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14" + "commit": "b56a1f1acc46cdf8655710e4c8f24f5f31f22c6a", + "sha256": "1fk1cj0bwb4hrfcy868ll4jf3mq9ni0m8srf01dljh436aj2pc7h" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "161ce2d8ba225bccef0ea8ae4937251b8ccaa892", - "sha256": "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14" + "commit": "b56a1f1acc46cdf8655710e4c8f24f5f31f22c6a", + "sha256": "1fk1cj0bwb4hrfcy868ll4jf3mq9ni0m8srf01dljh436aj2pc7h" } }, { @@ -77636,8 +78261,8 @@ 20190529, 2238 ], - "commit": "b29fdd346d0d06bef4cafc75adbde51a46392e90", - "sha256": "0ahi9z3qpbg9zcb1fzbxqd6gb8ip44zdf9assimch7yklg5ph2ca" + "commit": "8372cc425967f055ba8a26f6098649467e776c5e", + "sha256": "1fmyqs06rrkyyclrsfrjsxcwkd0c20kimih2x5llhnxmw51i2y5s" }, "stable": { "version": [ @@ -77725,11 +78350,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190804, - 1931 + 20190830, + 1152 ], - "commit": "3e08d7bc123d6fbb84f7f8a5a6fc28aae4ec8c19", - "sha256": "0cwi5b89l7f21xq5cfms96vshz7swz0m2kjd5f71206f38rlcir3" + "commit": "5f52084d77c22df3b57e96a7ce0dc69679088f4e", + "sha256": "1p0q7dgchh9cjj0rknas3g40d5lfcp9qrxfbpq6hqzz569f6pc2y" } }, { @@ -78108,11 +78733,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20190730, - 1014 + 20190819, + 1735 ], - "commit": "f466ab1af578abd1942c3c70c101c585d9166bb0", - "sha256": "0jiqm701kn9xv9bxw4xd3qg9r2qkhws5qsly1749rs7zhbjfpzd2" + "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", + "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" }, "stable": { "version": [ @@ -78139,8 +78764,8 @@ "deferred", "request" ], - "commit": "f466ab1af578abd1942c3c70c101c585d9166bb0", - "sha256": "0jiqm701kn9xv9bxw4xd3qg9r2qkhws5qsly1749rs7zhbjfpzd2" + "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", + "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" }, "stable": { "version": [ @@ -78453,16 +79078,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20190403, - 1533 + 20190828, + 1339 ], "deps": [ "cl-lib", "s", "wgrep" ], - "commit": "450a1e54fb7c690166e61856b0d2002a71ccdf10", - "sha256": "01v5zz9psvkqw4cgq7b8r0b7wakxa5df4ki34g3nislrhmqp4n3x" + "commit": "64f25282fbba3cb436dbaabe73f5a5417f2daaa8", + "sha256": "003da113ak5bx2jdcy0ffkm2ihg013m1vk9v7pc5k65xb262c5wz" }, "stable": { "version": [ @@ -79001,11 +79626,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20190621, - 2006 + 20190820, + 502 ], - "commit": "3c071313d743b07a2ea4a02655f23cdc7010f0c2", - "sha256": "15gji4c4q19n7df7vsxigcyfc4pi95cq3arrcckmmm6r7ckb4y4w" + "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", + "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" }, "stable": { "version": [ @@ -79476,8 +80101,8 @@ 20190517, 2037 ], - "commit": "c62185ae1c6edf0335261f169241eb8ee9713ad5", - "sha256": "0jq8hb8j484vqnd743d2azw4zg1gn2j0l6h60bd0vcqd2hgag1nw" + "commit": "48290d331d923031156bbbaf8360b774bf983d1e", + "sha256": "0xws8mrbrzhfy9kf2p68kwxvshayzbhrnqs6jjvv89h4aaj3630i" }, "stable": { "version": [ @@ -79520,8 +80145,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20190721, - 1342 + 20190820, + 1448 ], "deps": [ "dash", @@ -79535,8 +80160,8 @@ "spinner", "xterm-color" ], - "commit": "af0c3b88cb2fc4fabd66209c4dd91a520d924ec9", - "sha256": "0g9z58cxq4qjmgil1kzsnmf0fyp07db77l2alp1f25cgdfd92nbs" + "commit": "cb03a31bff0b1a13ff1ac90c1fd9bc89c55fbb0e", + "sha256": "0n0vrlv9l9d8qa4vrkvy5jaj6j4qvlqkjz1p5rya2vmiv4wb56ba" } }, { @@ -79571,11 +80196,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20180331, - 818 + 20190816, + 1209 ], - "commit": "42f874467dfdce59b511f883496ce2624b133dd7", - "sha256": "0k9nmi014vb9c8rymy3w8xbnj1q85xlslpblacz78iqn1kr6wy1z" + "commit": "539abca4651dda2d667a44f172957df39fa76eb5", + "sha256": "1n3biqink9zfbj4r94519xn68xigkvx16caj35njfzc05pkmvawc" } }, { @@ -79923,26 +80548,26 @@ "repo": "clojure-emacs/sayid", "unstable": { "version": [ - 20181223, - 835 + 20190826, + 1037 ], "deps": [ "cider" ], - "commit": "559a335926c12b37ff2928097b3e7eaefb88920d", - "sha256": "02h1dkzgs6439l2fjflkgvq40gvb353y47zhlasfqxy9cjj76d22" + "commit": "6febf397d5d610d28100fb1381a82d5e77f0d261", + "sha256": "0ra8xjsmagjwa1qakr1x4f9l88f3zj686dyk88q9qj1bvyam8r33" }, "stable": { "version": [ 0, 0, - 17 + 18 ], "deps": [ "cider" ], - "commit": "56ec0343322cf30d689810a8f5cffee004bb8d07", - "sha256": "16dq2hg3k0vypb5rjyrz90abm7qxbjbs6pv0z9qvsyn0ahi65jn3" + "commit": "5412d0e129337f0f97a5501521f86dd7deee5804", + "sha256": "1immns40clz78frsd4dc5ck5n90ac5pfid40bw3phxwr4prhmgf6" } }, { @@ -79980,8 +80605,8 @@ 20190413, 1246 ], - "commit": "fc91c81ffafe07691cec7466399b18f267964328", - "sha256": "0i7jrxdfxin6aaz1v578vy50j0g5l3j9yj2pgn5dw5v04xk42822" + "commit": "c060053d3b4818bf6d0620b0711be845795c4157", + "sha256": "0w3s32kk7mr9605mmssxrh4izq1wllxccd1hs4hcn2fz04igd9b7" } }, { @@ -80343,11 +80968,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20190721, - 2218 + 20190826, + 8 ], - "commit": "e509c10ccdf6f4239d448da8aa6f8b9cc36bb340", - "sha256": "00yy0bx874ijg8s16bp13n0w5q2fmjiklz0kgbwh4wpb7fawk8vv" + "commit": "271b4aa6b38c2550119a36efac2b92cf1233e6e3", + "sha256": "1ia2mcl42r69dlyxabjh76c550x0nf0irhpsdbda0h3in62f7q6m" } }, { @@ -81159,11 +81784,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20190731, - 1807 + 20190818, + 2128 ], - "commit": "0e7c98455ef71be929005d1d6e2372712081de69", - "sha256": "025kyyyr4pd58lzm917dzlfk3l5z877rc97jp4mjknlf89idi7lk" + "commit": "1887f606db73846d7da6023cb8944efbc791377c", + "sha256": "1izivy5vz2x86yqbip69jz7sfrjwfm0gsya95ynic7q9qqnq7bmj" } }, { @@ -81502,11 +82127,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190808, - 238 + 20190826, + 741 ], - "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", - "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" + "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", + "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" } }, { @@ -81848,20 +82473,20 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20190715, - 504 + 20190816, + 303 ], - "commit": "aeaaeaffb9a6d6205f2230fdbc9a4afbc0088323", - "sha256": "00jkqzh2rnj4jb93lzfmasr75lxb25j3sfj4cgppdz24hzd2yznf" + "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05", + "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2" }, "stable": { "version": [ 0, 2, - 0 + 1 ], - "commit": "2319ee180a4a67175b9e95322cd30b3ac70a9bdf", - "sha256": "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2" + "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05", + "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2" } }, { @@ -82257,8 +82882,8 @@ "deps": [ "skewer-mode" ], - "commit": "927d6848a1ea9428d4cc995f76bd42f7b8da6bc8", - "sha256": "11zaq1p04igg0hbmazsf5c0xz7aigx120rwg5iq7niaz2277j1k1" + "commit": "8ce9d030e18133319181d5dabe3e905c8ca5fd6b", + "sha256": "1hkk9si9z9zd2x2cv2gs0z423prlwlhq847irypz2dm1bnm5dzrx" }, "stable": { "version": [ @@ -82447,15 +83072,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20190724, - 1352 + 20190818, + 1634 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "11c0d8349347ab91449306f2448f2a558e747e90", - "sha256": "1yawjp5gcj3ainrbmlwjgxddzdbsfyq37kv5fjkzj8dywggdv8qy" + "commit": "cbab3e9a1bc4f1a03ee21f392a499f01333af816", + "sha256": "0y645w8lp1f51xx0f36fv2fz1lgk2w1rk7v6brxfg44igbb4c6sv" }, "stable": { "version": [ @@ -82703,6 +83328,18 @@ ], "commit": "c387ba34a75b172e8a75747220c416462ae9de31", "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "sly" + ], + "commit": "c387ba34a75b172e8a75747220c416462ae9de31", + "sha256": "1cr6p11vsplb6afh2avwb585q606npp692gb5vqs377nni5vx7km" } }, { @@ -84261,11 +84898,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20190801, - 1302 + 20190820, + 816 ], - "commit": "db328e2092bc56e7bf861ad294b8748fd35e16f1", - "sha256": "1cz3rcm5n90nf4qailyn6m544waknxngvm20pflbmzgj3q5cklgv" + "commit": "32ddc1a9b9f4f58ebe8410abc1124b7acf0f36b1", + "sha256": "14bga23rf9zn18fbs8zdhksi2kyxq0s937fbjpl0q91x05b6m61f" } }, { @@ -84393,11 +85030,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20190616, - 1309 + 20190821, + 1129 ], - "commit": "b3d62e62f9f23b08b62c1363e415c4f8a8f20029", - "sha256": "0nyh7v7qvwsayb1xdmbjagl3yxgs76fqm80w2r1xjmjzi0346qwb" + "commit": "1d4086a64ba554bb8c7d648c8d0e6c176277f6f3", + "sha256": "06sz5yl12mn0mq43bbv3ln14pk176ij8rxs95wi25yxdblznhsg0" } }, { @@ -84893,8 +85530,8 @@ 20170610, 1537 ], - "commit": "04970977b4abb4d44301651618bbf1cdb0b263dd", - "sha256": "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz" + "commit": "3f9df9c88d6a7f9b1ae907e401cad8d3d7d63bbf", + "sha256": "1crah9h86m5sdc7panj98ws9cv2as6kh9syal8m1p7rhimgvdx1v" }, "stable": { "version": [ @@ -85089,11 +85726,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20190610, - 1256 + 20190816, + 2237 ], - "commit": "e1507feccf581160daece98b436dfac63020bb68", - "sha256": "1bbs2k65fggab61pgl8p5jgg8jxsggqkfcs55k6kg4s78gj2rqma" + "commit": "d0f7294d23380766dcabdb4ed21bc6a68e496110", + "sha256": "1w4zd38whpqidhfscbcns7y14ixw6lq2x6wirfjxybq3yilgz9j2" }, "stable": { "version": [ @@ -85159,11 +85796,11 @@ "stable": { "version": [ 9, - 2, + 3, 0 ], - "commit": "45b8242611fe0437fcff48f5f4f7d8f0552531ac", - "sha256": "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" } }, { @@ -85187,15 +85824,15 @@ "stable": { "version": [ 9, - 2, + 3, 0 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "45b8242611fe0437fcff48f5f4f7d8f0552531ac", - "sha256": "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw" + "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", + "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" } }, { @@ -85353,8 +85990,8 @@ 20171130, 1559 ], - "commit": "114bc99e7f65b6959d91b3a0452deca55c38dc32", - "sha256": "0w3fdbzscb7dc54q7qdp2k2kqvrqya1919qnj7nq4zsc6bw9v0x6" + "commit": "143146feada95b8be228d339114f2c469a78bbb9", + "sha256": "0dknxxp320zy3zrrbqsgl4d8jj4i2xcmsa6n91zpvdnb035658pp" }, "stable": { "version": [ @@ -86264,14 +86901,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20190801, - 1110 + 20190822, + 1708 ], "deps": [ "ivy" ], - "commit": "20d604c139b82d98010aabbbc00ad487438bdf8e", - "sha256": "0clg04az8v5ia3z5fxcimprqp4kbf2g1z6na3js60gmi689ks8ll" + "commit": "79333e9edfee38ec3b367c33711a68bdf7783259", + "sha256": "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z" }, "stable": { "version": [ @@ -86502,8 +87139,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20190809, - 443 + 20190810, + 432 ], "deps": [ "cider", @@ -86520,8 +87157,8 @@ "slime", "smartparens" ], - "commit": "163d54eb483a9986587c586cabfcaa15210a2b5d", - "sha256": "1y8va209v32f6rd7f420aqyh8fs9srxyc9hinb9q6i1bs92vkry9" + "commit": "745dc44bc1569a05ade034981277ee5955677798", + "sha256": "0c1sibigy0kvhizxg2198k9kqgb57cmcjx7l0jmar2cgnmndbrgj" }, "stable": { "version": [ @@ -87320,14 +87957,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20190812, - 2131 + 20190830, + 1446 ], "deps": [ "visual-fill-column" ], - "commit": "5444e2a02374c245769417148ccf2dad0a0c633a", - "sha256": "0byddvnkyabcxy64f2w64sqcki4zfxjwkvzvkrcan46san6hsn87" + "commit": "f8f28c739dcc8f52c3e66368b06c0cfcd48e83a9", + "sha256": "0ynhw9ai906y4405r8wdalx09hinfns9n01cg96nc4fgbqkhbpdw" }, "stable": { "version": [ @@ -87856,6 +88493,21 @@ } }, { + "ename": "terraform-doc", + "commit": "81ba99e4734f231294800cc2b0a27fba2eb396e0", + "sha256": "0n62yicjsjikgbw5fckjxzgx5vfzn4ydi7jizm27ycpwxbw59ifl", + "fetcher": "github", + "repo": "TxGVNN/terraform-doc", + "unstable": { + "version": [ + 20190813, + 1254 + ], + "commit": "2ec10ea7bef5a75edfffeb515dd268e19c1f8c9c", + "sha256": "0r70fc7vv2rjnwnsg7myc1c15f3ql6hp6zrf5msmf8r2iz32jnpp" + } + }, + { "ename": "terraform-mode", "commit": "93e06adf34bc613edf95feaca64c69a0a2a4b567", "sha256": "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn", @@ -88315,8 +88967,8 @@ 20180905, 1050 ], - "commit": "01ea3cb8cee36e31a0ab8015426b57eb4ce29cdc", - "sha256": "0mfgr1303lpfa0nzh4lbxpiiijwv41bh3r631hjj9cpz8jkwicc7" + "commit": "562e52d2ecc53b86c56c7ee4e88288b45fe2e4e3", + "sha256": "10hxy7iwz24qcagpmi6vvkw7zv04ly4r5ym3sw8wzhcsb1fslzgf" }, "stable": { "version": [ @@ -88382,20 +89034,20 @@ "deps": [ "haskell-mode" ], - "commit": "17db036b9895fb7b54dda5e3cf2cb0ce5980b457", - "sha256": "1gys96kr6vq7h2jz15c9340idxv6915anw98is1mfl4ak6pqq3w1" + "commit": "621d95f6563d550bf777a51a2010f23382d61a78", + "sha256": "0ps8zjfkwjan5ziil6jhz7ls3mzgk970js0gaja3ndwsd5nlsmq2" }, "stable": { "version": [ 1, - 2, - 0 + 4, + 2 ], "deps": [ "haskell-mode" ], - "commit": "ba2eb0a503b604a806e45b914d16ece6899bd9be", - "sha256": "1cimnm9d5cm5bw8fjdm2gw5dlcrxcwkfjdh4dh9s7bgrbqjgdcmj" + "commit": "eabe03946d2d537e38d8f38f8c30d38a18202279", + "sha256": "0nwmic0iimy0fgc1m9ixi4mv8ckpc8cv8wjij1882ggd0isi4k59" } }, { @@ -88406,8 +89058,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20190706, - 2322 + 20190829, + 1315 ], "deps": [ "cl-lib", @@ -88416,8 +89068,8 @@ "s", "typescript-mode" ], - "commit": "dd90f5ad6c537d38b5f56599687c3bc9b21072a6", - "sha256": "1rpha2fbhmj891hbpm24din84j2m1ccjignwr237fhv34yy55z07" + "commit": "13f64933c19590ebd02a4b141bb6be88d7aaf2b0", + "sha256": "19kl8r426hi93q1nj5mwadx6wiymx0f77db4w51jcf5kp0rr2hs0" }, "stable": { "version": [ @@ -88862,8 +89514,8 @@ "deps": [ "cl-lib" ], - "commit": "ef0c6b84d92eecd05aa5cd4a35b73652f21b311a", - "sha256": "0wh0fwl2mimb48g2sf2nhmr3xxwvgkgr3566187x3kw8zxgh1nv7" + "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", + "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" } }, { @@ -89390,8 +90042,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190812, - 546 + 20190826, + 1125 ], "deps": [ "ace-window", @@ -89403,8 +90055,8 @@ "pfuture", "s" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89440,8 +90092,8 @@ "evil", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89471,8 +90123,8 @@ "cl-lib", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89503,8 +90155,8 @@ "pfuture", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89535,8 +90187,8 @@ "projectile", "treemacs" ], - "commit": "d06e2d3f3b3ce77639c0a085d1f3b0e620b1a936", - "sha256": "1wlssi1ndi8mi01k2ndz9v77r6wdxjblazaz108jcnpkyiinhyyk" + "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", + "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" }, "stable": { "version": [ @@ -89705,15 +90357,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20190812, - 1655 + 20190819, + 102 ], "deps": [ "dash", "s" ], - "commit": "31bd5a86aa35f7b8143170892ffaf6425284f3fd", - "sha256": "004z24vxk7xrc9in7q8rpaif79sw219zh86hj2fyczv2jixl6i9r" + "commit": "93c074f2895a204e003e8c7f3033c37d6486fac8", + "sha256": "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735" }, "stable": { "version": [ @@ -90385,11 +91037,11 @@ "repo": "jackkamm/undo-propose-el", "unstable": { "version": [ - 20190409, - 636 + 20190824, + 1554 ], - "commit": "5f1fa99a04369a959aad01b476fe4f34229f28cd", - "sha256": "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0" + "commit": "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c", + "sha256": "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny" } }, { @@ -90577,11 +91229,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20181230, - 1223 + 20190813, + 1436 ], - "commit": "ed87837d2303fb07ec81508930bc3b2a4d857fcd", - "sha256": "1xk8snjby46fprj3vd0yf2zmcqcqx6jcljgaxijdh6wqbl2ard3b" + "commit": "ba45edbfb8fa453e29c4c6c73af60f06637951d6", + "sha256": "1sil8lnvpdwk0g30mbqymp6ib325q28a8zn3n9y6j39ngphpkffl" } }, { @@ -91087,14 +91739,14 @@ "repo": "elpa-host/use-ttf", "unstable": { "version": [ - 20190701, - 1222 + 20190823, + 939 ], "deps": [ "s" ], - "commit": "0b56d4b062bb86e6b2e5425a0e76b4b2997a80d7", - "sha256": "0k3zy8zpv4isr5nd3xyvncbjdcpyfgc9swylhc8padr3ifkxvb3p" + "commit": "8c7f50a2b6f5bd55cdd92e351371386ff4b6edce", + "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q" } }, { @@ -91240,14 +91892,14 @@ "repo": "dougm/vagrant-tramp", "unstable": { "version": [ - 20190125, - 1859 + 20190816, + 1846 ], "deps": [ "dash" ], - "commit": "77256deca35bb797cbba499837f3658d1a17d2e3", - "sha256": "0j7ff9b3ic4a6kzn7k0c52knlgangql7sjsxahwvym6w18r52d5a" + "commit": "47c6fdc07722934eacce9f91c47bb1ee7d46b86f", + "sha256": "0a423h6klk0m3vjkds27a3h60xq8n72j15p1izrhgdzf1642w1g1" } }, { @@ -91486,6 +92138,30 @@ } }, { + "ename": "vcsh", + "commit": "a5f56f914d7cc11f45be0474897998accb0fec2e", + "sha256": "0cclih5yfgal3bi3n2na4sc4xw1rqalml3nknhgypxrlx4j784pb", + "fetcher": "gitlab", + "repo": "stepnem/vcsh-el", + "unstable": { + "version": [ + 20190817, + 2011 + ], + "commit": "2051e4ee20709f82ab2396ab2ccfbe887a3c6a67", + "sha256": "168rhydrz7h7bhaf885j4lqxz5x50is7gsypj0vypi6xv71zhd03" + }, + "stable": { + "version": [ + 0, + 4, + 1 + ], + "commit": "2051e4ee20709f82ab2396ab2ccfbe887a3c6a67", + "sha256": "168rhydrz7h7bhaf885j4lqxz5x50is7gsypj0vypi6xv71zhd03" + } + }, + { "ename": "vdiff", "commit": "e90f19c8fa4b0d267d269b76f117995e812e899c", "sha256": "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l", @@ -91753,14 +92429,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20190705, - 949 + 20190828, + 1121 ], "deps": [ "yasnippet" ], - "commit": "a7288bf5d55b554ea78c4b5fa1046d38d91ed2b0", - "sha256": "10jj3ipw65wazr46lwnrhj1q51b6scnn2m98yg105vcb8vssbszd" + "commit": "4869b7da62799e846b17258f6828dee016a991f4", + "sha256": "1phhrkk0yyxq4nlrcwad4dvspg6rwda5lzsmch2w64nr5v4ppvl7" } }, { @@ -92007,8 +92683,8 @@ "dash", "s" ], - "commit": "c3da41a3995c98dae2c751688655ea0cbe72493b", - "sha256": "0s5qnzb8ar3qp5fq69sa29x8xy917jbdi8xciqjl6dzk2a7nvqsv" + "commit": "107e7e0bf923f44d217712772cd58b414d0065cb", + "sha256": "1qqfcif4by8psc4kp9wnna7pm321a7d0xjkwznq2fwc5cqgbp0vz" }, "stable": { "version": [ @@ -92272,11 +92948,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20190812, - 1520 + 20190822, + 1225 ], - "commit": "fad40c1436afcf73fe39ea2ec535628866c72b23", - "sha256": "0kbb2f7p8ivznyqxx1ji60iqks3sbp6fb6nzfw9q5phagryl5bys" + "commit": "097d9806ffab9120f078bea22e9b49502807786b", + "sha256": "0x402pq4kq8agzbq1imxg3qm2v6agq2ni1x2a6yqrvwy5vq72qxs" } }, { @@ -92287,14 +92963,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20190803, - 1103 + 20190816, + 633 ], "deps": [ "vterm" ], - "commit": "96cac28e72dc5739958fa674acd51ceed8835556", - "sha256": "1scfbjr3vksn0d93gb3n0mi8gi49579szn24f78vkqwd99ivifwr" + "commit": "ecb5a44650515ea554ead078dcf824888e8c234b", + "sha256": "0jsf7sac45zc43linajmzkqv4lsxyf5m6zvhq01skpvb5y3hl881" } }, { @@ -92400,11 +93076,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190808, - 238 + 20190830, + 742 ], - "commit": "8fd65dd9c7d2393ab66c65ee1de67a84dcc779ce", - "sha256": "1yqbw8ikfrwya59xa0a17f2wwgswkdqcxj9y64fb00syps09fv0m" + "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", + "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" } }, { @@ -92492,11 +93168,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20180818, - 1829 + 20190828, + 916 ], - "commit": "abf7e18bf85c09963537156a447f0d01ff8d6c1b", - "sha256": "0icxgmyw68m19yqp6446rilfyv25xrm8ih44vg10nkdlk8m5kh9l" + "commit": "4f3e2c10b8d3b0bd48afb4db9df93ff2ce61c2cd", + "sha256": "0dmcbv4d2h2jxxblq6kqqy4rs8aci1zxl8wccz6zi3v9si4f7sql" } }, { @@ -93398,8 +94074,8 @@ 20190106, 2022 ], - "commit": "72427144b054b0238a86e1348c45d986b8830d9d", - "sha256": "1zlk534jbwrsabcg3kqlzk4h4hwya60lh6q2n1v4yn4rpf5ghsag" + "commit": "121854747776df1b78d0ef89efb6d01c2c1e8c89", + "sha256": "1qli6vwdnm73jnv37lyf1xb5ykav322xjm1fqmgb1369k2fgkl44" }, "stable": { "version": [ @@ -93980,11 +94656,11 @@ "repo": "twlz0ne/with-emacs.el", "unstable": { "version": [ - 20190623, - 302 + 20190820, + 1326 ], - "commit": "0766fb87668bb92ef95a9ecab5180c2933ac0743", - "sha256": "0nzb4fswxfqzscsg0gbhfrfy9z0y9fn7cl78zh6wdmmnfsdbl314" + "commit": "b398e54bcce2fc023b0c0b6fa1ba6686192d8b9b", + "sha256": "0hdz7adag2m97h07j3llzdnwwg2dp6n2q46hx7klp3khdlgrh2z1" } }, { @@ -95137,25 +95813,25 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20190602, - 1201 + 20190816, + 941 ], "deps": [ "cl-lib" ], - "commit": "ff64312ad412c8b3e87a059139f288205d221e15", - "sha256": "1hl2n0mlnskz0f43dz41h11dkyw1pn3x9sq61w0qzjkkbbyz5cqk" + "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668", + "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "a452ab38a7cfae97078062ff8885b5d74fd1e5a6", - "sha256": "02kpajb993yshhjhsizpfcbrcndyzkf4dqfipifhxxng50dhp95i" + "commit": "44e6df835bd4173ee4ccc7e29842e9dae76f2668", + "sha256": "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm" } }, { @@ -95455,11 +96131,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20190617, - 1004 + 20190824, + 1946 ], - "commit": "f443ccb94579dcf28ac50ba4053fa7649e079665", - "sha256": "08khi9mp35pp5niz212vpm0yab577m9a23wl7gsymcfcif0drbza" + "commit": "c364607804e943b301ded8a30d7e19dda217568a", + "sha256": "0sqcli05kyafn2x9sd92az3hqc010pypr0dw31mv0vslg0rfkn8m" }, "stable": { "version": [ @@ -95652,25 +96328,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20190725, - 1049 + 20190821, + 901 ], "deps": [ "yasnippet" ], - "commit": "f5dbb814767ac4e6398144b6d372f2effcc9c4a1", - "sha256": "1gj5y4c8fxq578x3d0n3yhkwaab6lvsgvmqi1g65ynm5xdlxvm5w" + "commit": "71ae4a665f0db13165f14687cf5828d4510ef557", + "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "yasnippet" ], - "commit": "7e94b9e948e16b3b1778aacb05c65e75d81fc188", - "sha256": "0pdfdyxl440ngx77j2b9zymh50r9pqzway2maad64ijaz9l2g2bm" + "commit": "71ae4a665f0db13165f14687cf5828d4510ef557", + "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8" } }, { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/rudel/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/rudel/default.nix deleted file mode 100644 index 0031ffee4d4d..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl}: - -let - version = "0.2-4"; -in -stdenv.mkDerivation -{ - name = "rudel-${version}"; - src = fetchurl - { - url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz"; - sha256 = "68247bfb702d929877f6d098932e8b0ca45c573a3510187e1ccc43e5ea194f25"; - }; - - installPhase = '' - for n in . obby zeroconf jupiter; do - mkdir -p "$out/share/emacs/site-lisp/$n"; - cp $n/*.el "$out/share/emacs/site-lisp/$n/"; - done - install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf" - ''; - - meta = { - homepage = http://rudel.sourceforge.net/; - description = "A collaborative editing environment for GNU Emacs"; - license = "GPL"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/s/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/s/default.nix deleted file mode 100644 index b818348939e8..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/s/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, emacs}: - -let version = "1.9.0"; - -in stdenv.mkDerivation { - name = "emacs-s-${version}"; - - src = fetchurl { - url = "https://github.com/magnars/s.el/archive/${version}.tar.gz"; - sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix deleted file mode 100644 index 835cf8081afa..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip }: - -stdenv.mkDerivation { - - name = "sbt-mode-2014-06-05"; - - src = fetchurl { - url = "https://github.com/hvesalai/sbt-mode/archive/676f22d9658989de401d299ed0250db9b911574d.zip"; - sha256 = "0b8qrr3yp48ggl757d3a6bz633mbf4zxqpcwsh47b1ckiwa3nb2h"; - }; - - buildInputs = [ unzip emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v *.el *.elc "$out/share/emacs/site-lisp/" - ''; - - meta = { - homepage = https://github.com/hvesalai/scala-mode2; - description = "An Emacs mode for editing Scala code"; - license = "permissive"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix deleted file mode 100644 index 7867226ff806..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchsvn, stdenv, emacs }: - -let revision = "17339"; in -stdenv.mkDerivation rec { - name = "scala-mode-r${revision}"; - - src = fetchsvn { - url = "http://lampsvn.epfl.ch/svn-repos/scala/scala-tool-support/trunk/src/emacs"; - rev = revision; - sha256 = "05g3xk2mxkqwdnyvxklnrdyhppkvhfs2fd21blhzbhf474cgqlyh"; - }; - - buildInputs = [ emacs ]; - - installPhase = - '' mkdir -p "$out/share/emacs/site-lisp" - cp -v *.el *.elc "$out/share/emacs/site-lisp" - ''; - - meta = { - description = "An Emacs mode for editing Scala code"; - - homepage = https://www.scala-lang.org/node/354; - - # non-copyleft, BSD-style - license = "permissive"; - - maintainers = [ ]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix deleted file mode 100644 index 0a44deb8ced8..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, emacs, unzip }: - -stdenv.mkDerivation { - - name = "scala-mode2-2014-07-01"; - - src = fetchurl { - url = "https://github.com/hvesalai/scala-mode2/archive/c154f1623f4696d26e1c88d19170e67bf6825837.zip"; - sha256 = "0im2ajb1iagjldh52j8wz4yby68rs3h7shrdf1pqy5ds7s4fa8cc"; - }; - - buildInputs = [ unzip emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v *.el *.elc "$out/share/emacs/site-lisp/" - ''; - - meta = { - homepage = https://github.com/hvesalai/scala-mode2; - description = "An Emacs mode for editing Scala code"; - license = "permissive"; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/tramp/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/tramp/default.nix index b0cfe9979081..3b746c293d88 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/tramp/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, emacs, texinfo }: stdenv.mkDerivation rec { - name = "tramp-2.3.0"; + name = "tramp-2.4.2"; src = fetchurl { url = "mirror://gnu/tramp/${name}.tar.gz"; - sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi"; + sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61"; }; buildInputs = [ emacs texinfo ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/tuareg/default.nix deleted file mode 100644 index be03938f8a53..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchzip, emacs }: - -# this package installs the emacs-mode which -# resides in the ocaml compiler sources. - -let version = "2.0.9"; - -in stdenv.mkDerivation { - name = "tuareg-mode-${version}"; - src = fetchzip { - url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; - sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp *.el *.elc "$out/share/emacs/site-lisp" - ''; - - meta = { - homepage = https://github.com/ocaml/tuareg; - description = "OCaml mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay b/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay new file mode 100755 index 000000000000..26d2482e7ae6 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl nix +set -euxo pipefail + +# This script piggybacks on the automatic code generation done by the nix-community emacs overlay +# You can use this to avoid running lengthy code generation jobs locally + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix +nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "elpa-packages: $(date --iso)" -- elpa-generated.nix + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages +env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "melpa-packages: $(date --iso)" -- recipes-archive-melpa.json diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix index c7e858078e6b..518ee67e4512 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesNgFor pkgs.emacs26).emacsWithPackages (epkgs: let + emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/writegood/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/writegood/default.nix deleted file mode 100644 index 6d0631a4cb83..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, emacs}: - -let version = "2.0.2"; - -in stdenv.mkDerivation { - name = "writegood-mode-${version}"; - src = fetchurl { - url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz"; - sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; - - meta = { - description = "Emacs minor mode that aids in finding common writing problems"; - homepage = https://github.com/bnbeckwith/writegood-mode; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.pSub ]; - license = stdenv.lib.licenses.gpl3; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix deleted file mode 100644 index 661430516b70..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation rec { - name = "xml-rpc-1.6.8"; - - src = fetchurl { - url = https://launchpadlibrarian.net/40270196/xml-rpc.el; - sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src xml-rpc.el - emacs --batch -f batch-byte-compile xml-rpc.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install xml-rpc.el* $out/share/emacs/site-lisp - ''; - - meta = { - description = "Elisp implementation of clientside XML-RPC"; - homepage = https://launchpad.net/xml-rpc-el; - license = stdenv.lib.licenses.gpl3Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index 4c95681c43de..29a6a8773eff 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "26.2"; + version = "26.3"; versionModifier = ""; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; + sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/nixpkgs/pkgs/applications/editors/emacs/macport.nix index d51391595f47..649997171e9f 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/macport.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/macport.nix @@ -4,19 +4,19 @@ }: stdenv.mkDerivation rec { - emacsVersion = "26.2"; + emacsVersion = "26.3"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "7.6"; + macportVersion = "7.7"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; + sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61"; + sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j"; }; hiresSrc = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/featherpad/default.nix b/nixpkgs/pkgs/applications/editors/featherpad/default.nix index 6d420599152a..e48fba1551e7 100644 --- a/nixpkgs/pkgs/applications/editors/featherpad/default.nix +++ b/nixpkgs/pkgs/applications/editors/featherpad/default.nix @@ -4,7 +4,7 @@ with qt5; stdenv.mkDerivation rec { version = "0.10.0"; - name = "featherpad-${version}"; + pname = "featherpad"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; diff --git a/nixpkgs/pkgs/applications/editors/flpsed/default.nix b/nixpkgs/pkgs/applications/editors/flpsed/default.nix index 104206a14913..b8b11e5e831e 100644 --- a/nixpkgs/pkgs/applications/editors/flpsed/default.nix +++ b/nixpkgs/pkgs/applications/editors/flpsed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fltk13, ghostscript }: stdenv.mkDerivation rec { - name = "flpsed-${version}"; + pname = "flpsed"; version = "0.7.3"; src = fetchurl { - url = "http://www.flpsed.org/${name}.tar.gz"; + url = "http://www.flpsed.org/${pname}-${version}.tar.gz"; sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp"; }; diff --git a/nixpkgs/pkgs/applications/editors/geany/default.nix b/nixpkgs/pkgs/applications/editors/geany/default.nix index 0ff56e9145fb..a30a8f702242 100644 --- a/nixpkgs/pkgs/applications/editors/geany/default.nix +++ b/nixpkgs/pkgs/applications/editors/geany/default.nix @@ -7,10 +7,11 @@ let in stdenv.mkDerivation rec { - name = "geany-${version}"; + pname = "geany"; + inherit version; src = fetchurl { - url = "https://download.geany.org/${name}.tar.bz2"; + url = "https://download.geany.org/${pname}-${version}.tar.bz2"; sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim"; }; diff --git a/nixpkgs/pkgs/applications/editors/hecate/default.nix b/nixpkgs/pkgs/applications/editors/hecate/default.nix index 8aea8508aefd..de57fb092157 100644 --- a/nixpkgs/pkgs/applications/editors/hecate/default.nix +++ b/nixpkgs/pkgs/applications/editors/hecate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "0.0.1"; - name = "hecate-${version}"; + pname = "hecate"; src = fetchFromGitHub { owner = "evanmiller"; diff --git a/nixpkgs/pkgs/applications/editors/heme/default.nix b/nixpkgs/pkgs/applications/editors/heme/default.nix index dce02b568906..4e67fc304b18 100644 --- a/nixpkgs/pkgs/applications/editors/heme/default.nix +++ b/nixpkgs/pkgs/applications/editors/heme/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "heme-${version}"; + pname = "heme"; version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/editors/hexcurse/default.nix b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix index 22cc4d47e680..a6437f070b98 100644 --- a/nixpkgs/pkgs/applications/editors/hexcurse/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexcurse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }: stdenv.mkDerivation rec { - name = "hexcurse-${version}"; + pname = "hexcurse"; version = "1.60.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/hexedit/default.nix b/nixpkgs/pkgs/applications/editors/hexedit/default.nix index 4671df77554f..09191b38e1bc 100644 --- a/nixpkgs/pkgs/applications/editors/hexedit/default.nix +++ b/nixpkgs/pkgs/applications/editors/hexedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "hexedit-${version}"; + pname = "hexedit"; version = "1.2.13"; src = fetchurl { - url = "http://rigaux.org/${name}.src.tgz"; + url = "http://rigaux.org/${pname}-${version}.src.tgz"; sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka"; }; diff --git a/nixpkgs/pkgs/applications/editors/howl/default.nix b/nixpkgs/pkgs/applications/editors/howl/default.nix index e7f200a4c077..5e5f2f8563cb 100644 --- a/nixpkgs/pkgs/applications/editors/howl/default.nix +++ b/nixpkgs/pkgs/applications/editors/howl/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "howl-${version}"; + pname = "howl"; version = "0.6"; # Use the release tarball containing pre-downloaded dependencies sources diff --git a/nixpkgs/pkgs/applications/editors/ht/default.nix b/nixpkgs/pkgs/applications/editors/ht/default.nix index 63864bc581df..fc1fe969bdc0 100644 --- a/nixpkgs/pkgs/applications/editors/ht/default.nix +++ b/nixpkgs/pkgs/applications/editors/ht/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ht-${version}"; + pname = "ht"; version = "2.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/jedit/default.nix b/nixpkgs/pkgs/applications/editors/jedit/default.nix index 11322e8240c2..21a6a8475182 100644 --- a/nixpkgs/pkgs/applications/editors/jedit/default.nix +++ b/nixpkgs/pkgs/applications/editors/jedit/default.nix @@ -13,7 +13,8 @@ let in stdenv.mkDerivation { - name = "jedit-${version}"; + pname = "jedit"; + inherit version; src = fetchurl { url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x"; diff --git a/nixpkgs/pkgs/applications/editors/joe/default.nix b/nixpkgs/pkgs/applications/editors/joe/default.nix index b2ace8accd8a..6f5839b3d06f 100644 --- a/nixpkgs/pkgs/applications/editors/joe/default.nix +++ b/nixpkgs/pkgs/applications/editors/joe/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.6"; - name = "joe-${version}"; + pname = "joe"; src = fetchurl { - url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; + url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz"; sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9"; }; diff --git a/nixpkgs/pkgs/applications/editors/jucipp/default.nix b/nixpkgs/pkgs/applications/editors/jucipp/default.nix index 9547b82efa1f..cb9f10281c70 100644 --- a/nixpkgs/pkgs/applications/editors/jucipp/default.nix +++ b/nixpkgs/pkgs/applications/editors/jucipp/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "juicipp-${version}"; + pname = "juicipp"; version = "1.2.3"; meta = { diff --git a/nixpkgs/pkgs/applications/editors/jupp/default.nix b/nixpkgs/pkgs/applications/editors/jupp/default.nix index 5e6406e33f28..4a44b35a0fa7 100644 --- a/nixpkgs/pkgs/applications/editors/jupp/default.nix +++ b/nixpkgs/pkgs/applications/editors/jupp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "jupp-${version}"; + pname = "jupp"; version = "3.1"; srcName = "joe-3.1jupp31"; diff --git a/nixpkgs/pkgs/applications/editors/kodestudio/default.nix b/nixpkgs/pkgs/applications/editors/kodestudio/default.nix index b212773712c2..df46cb123386 100644 --- a/nixpkgs/pkgs/applications/editors/kodestudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/kodestudio/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation rec { - name = "kodestudio-${version}"; + pname = "kodestudio"; + inherit version; src = fetchurl { url = urlStr; diff --git a/nixpkgs/pkgs/applications/editors/leafpad/default.nix b/nixpkgs/pkgs/applications/editors/leafpad/default.nix index c3b46cf61df8..795342fba5d8 100644 --- a/nixpkgs/pkgs/applications/editors/leafpad/default.nix +++ b/nixpkgs/pkgs/applications/editors/leafpad/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "0.8.18.1"; - name = "leafpad-${version}"; + pname = "leafpad"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz"; sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; diff --git a/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix index a2274be463ed..ff824d8b45bf 100644 --- a/nixpkgs/pkgs/applications/editors/leo-editor/default.nix +++ b/nixpkgs/pkgs/applications/editors/leo-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { - name = "leo-editor-${version}"; + pname = "leo-editor"; version = "5.7.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/lighttable/default.nix b/nixpkgs/pkgs/applications/editors/lighttable/default.nix index c3a280aed921..90e8c73e075d 100644 --- a/nixpkgs/pkgs/applications/editors/lighttable/default.nix +++ b/nixpkgs/pkgs/applications/editors/lighttable/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { - name = "lighttable-${version}"; + pname = "lighttable"; version = "0.8.1"; src = fetchurl { name = "LightTableLinux64.tar.gz"; - url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz"; + url = "https://github.com/LightTable/LightTable/releases/download/${version}/${pname}-${version}-linux.tar.gz"; sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { installPhase = '' tar xf ${src} mkdir -p $out/{bin,share/LightTable} - mv ./${name}-linux/* $out/share/LightTable + mv ./${pname}-${version}-linux/* $out/share/LightTable patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/nixpkgs/pkgs/applications/editors/mg/default.nix b/nixpkgs/pkgs/applications/editors/mg/default.nix index 4fb8d51b9692..de1a5ce7879f 100644 --- a/nixpkgs/pkgs/applications/editors/mg/default.nix +++ b/nixpkgs/pkgs/applications/editors/mg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }: stdenv.mkDerivation rec { - name = "mg-${version}"; + pname = "mg"; version = "20171014"; src = fetchurl { - url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; + url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz"; sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; }; diff --git a/nixpkgs/pkgs/applications/editors/micro/default.nix b/nixpkgs/pkgs/applications/editors/micro/default.nix index fab3646efdff..e6b93f20c488 100644 --- a/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "micro-${version}"; + pname = "micro"; version = "1.4.1"; goPackagePath = "github.com/zyedidia/micro"; diff --git a/nixpkgs/pkgs/applications/editors/mindforger/default.nix b/nixpkgs/pkgs/applications/editors/mindforger/default.nix index a027242c5eef..9cfcf95e78b1 100644 --- a/nixpkgs/pkgs/applications/editors/mindforger/default.nix +++ b/nixpkgs/pkgs/applications/editors/mindforger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qmake, qtbase, qtwebkit }: stdenv.mkDerivation rec { - name = "mindforger-${version}"; + pname = "mindforger"; version = "1.48.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/moe/default.nix b/nixpkgs/pkgs/applications/editors/moe/default.nix index 3f7eba73ca49..4e960524b94f 100644 --- a/nixpkgs/pkgs/applications/editors/moe/default.nix +++ b/nixpkgs/pkgs/applications/editors/moe/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "moe-${version}"; + pname = "moe"; version = "1.10"; src = fetchurl { - url = "mirror://gnu/moe/${name}.tar.lz"; + url = "mirror://gnu/moe/${pname}-${version}.tar.lz"; sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc"; }; diff --git a/nixpkgs/pkgs/applications/editors/monodevelop/default.nix b/nixpkgs/pkgs/applications/editors/monodevelop/default.nix index c2917aa394f9..3a21eec07f42 100644 --- a/nixpkgs/pkgs/applications/editors/monodevelop/default.nix +++ b/nixpkgs/pkgs/applications/editors/monodevelop/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { version = "5.9.4.5"; revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b"; - name = "monodevelop-${version}"; + pname = "monodevelop"; src = fetchurl { - url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2"; sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; }; diff --git a/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix b/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix index 1b1c6eaf9e54..70f99fa749b7 100644 --- a/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix @@ -7,10 +7,10 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostP { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; }; in stdenv.mkDerivation rec { version = "1.2"; - name = "tuxguitar-${version}"; + pname = "tuxguitar"; src = fetchurl { - url = "mirror://sourceforge/tuxguitar/${name}-linux-${metadata.arch}.tar.gz"; + url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz"; sha256 = metadata.sha256; }; diff --git a/nixpkgs/pkgs/applications/editors/nano/default.nix b/nixpkgs/pkgs/applications/editors/nano/default.nix index 44f8c243bd6d..aea585ce8d66 100644 --- a/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -19,11 +19,11 @@ let }; in stdenv.mkDerivation rec { - name = "nano-${version}"; + pname = "nano"; version = "4.4"; src = fetchurl { - url = "mirror://gnu/nano/${name}.tar.xz"; + url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia"; }; diff --git a/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix b/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix index fb30036e146f..7902ddc410cf 100644 --- a/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix +++ b/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nanorc-${version}"; + pname = "nanorc"; version = "2018-09-05"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/ne/default.nix b/nixpkgs/pkgs/applications/editors/ne/default.nix index 9bc6425bc411..96687ab81d67 100644 --- a/nixpkgs/pkgs/applications/editors/ne/default.nix +++ b/nixpkgs/pkgs/applications/editors/ne/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "ne-${version}"; + pname = "ne"; version = "3.1.2"; src = fetchFromGitHub { owner = "vigna"; diff --git a/nixpkgs/pkgs/applications/editors/nedit/default.nix b/nixpkgs/pkgs/applications/editors/nedit/default.nix index 6fff6df8cdda..b1b3a416178b 100644 --- a/nixpkgs/pkgs/applications/editors/nedit/default.nix +++ b/nixpkgs/pkgs/applications/editors/nedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xlibsWrapper, motif, libXpm }: stdenv.mkDerivation rec { - name = "nedit-${version}"; + pname = "nedit"; version = "5.7"; src = fetchurl { - url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; + url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz"; sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd"; }; diff --git a/nixpkgs/pkgs/applications/editors/neovim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/default.nix index 0d0877015eee..7d558dfb8937 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -20,7 +20,7 @@ let )); in stdenv.mkDerivation rec { - name = "neovim-unwrapped-${version}"; + pname = "neovim-unwrapped"; version = "0.3.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/nixpkgs/pkgs/applications/editors/netbeans/default.nix index 3d215b288564..ba01304f723a 100644 --- a/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -15,7 +15,8 @@ let }; in stdenv.mkDerivation { - name = "netbeans-${version}"; + pname = "netbeans"; + inherit version; src = fetchurl { url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx"; diff --git a/nixpkgs/pkgs/applications/editors/okteta/default.nix b/nixpkgs/pkgs/applications/editors/okteta/default.nix index 03bdd5e08822..287758e0fd83 100644 --- a/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -3,11 +3,11 @@ , qca-qt5, shared-mime-info }: stdenv.mkDerivation rec { - name = "okteta-${version}"; + pname = "okteta"; version = "0.26.2"; src = fetchurl { - url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv"; }; diff --git a/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/nixpkgs/pkgs/applications/editors/rstudio/default.nix index f90e17a6065b..74e5460f529f 100644 --- a/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -13,7 +13,8 @@ let gwtVer = "2.8.1"; in stdenv.mkDerivation rec { - name = "RStudio-${version}"; + pname = "RStudio"; + inherit version; nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; @@ -98,7 +99,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { - name = name; + name = "${pname}-${version}"; exec = "rstudio %F"; icon = "rstudio"; desktopName = "RStudio"; diff --git a/nixpkgs/pkgs/applications/editors/scite/default.nix b/nixpkgs/pkgs/applications/editors/scite/default.nix index 2f4693982a9c..2dceee0a37df 100644 --- a/nixpkgs/pkgs/applications/editors/scite/default.nix +++ b/nixpkgs/pkgs/applications/editors/scite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { - name = "scite-${version}"; + pname = "scite"; version = "4.0.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/sigil/default.nix b/nixpkgs/pkgs/applications/editors/sigil/default.nix index 90d89ce7799f..ac171f60ead7 100644 --- a/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "sigil-${version}"; + pname = "sigil"; version = "0.9.14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index 2d52aedc831c..629bd9d019d2 100644 --- a/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/nixpkgs/pkgs/applications/editors/standardnotes/default.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "standardnotes-${version}"; + pname = "standardnotes"; + inherit version; src = fetchurl { url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage"; diff --git a/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix b/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix index a6d624d4b1ec..efbca2949dd4 100644 --- a/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix +++ b/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation rec { version = "git-2014-08-20"; - name = "supertux-editor-${version}"; + pname = "supertux-editor"; src = fetchFromGitHub { owner = "SuperTux"; diff --git a/nixpkgs/pkgs/applications/editors/tecoc/default.nix b/nixpkgs/pkgs/applications/editors/tecoc/default.nix index dd986b346a37..48af4a99dada 100644 --- a/nixpkgs/pkgs/applications/editors/tecoc/default.nix +++ b/nixpkgs/pkgs/applications/editors/tecoc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "tecoc-git-${version}"; + pname = "tecoc-git"; version = "20150606"; src = fetchFromGitHub { @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ]; installPhase = '' - mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros + mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros cp src/tecoc $out/bin - cp src/aaout.txt doc/* $out/share/doc/${name} + cp src/aaout.txt doc/* $out/share/doc/${pname}-${version} cp lib/* lib2/* $out/lib/teco/macros (cd $out/bin ln -s tecoc Make diff --git a/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix b/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix index dfb2e49e0c8d..5d5843890e14 100644 --- a/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix +++ b/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix @@ -15,7 +15,8 @@ let }; in stdenv.mkDerivation { - name = "TeXmacs-${version}"; + pname = "TeXmacs"; + inherit version; src= fetchurl { url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; diff --git a/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/nixpkgs/pkgs/applications/editors/texmaker/default.nix index 79ece9d62a98..2a4459ddc3ed 100644 --- a/nixpkgs/pkgs/applications/editors/texmaker/default.nix +++ b/nixpkgs/pkgs/applications/editors/texmaker/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "texmaker"; version = "5.0.3"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; + url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30"; }; diff --git a/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 50113dd1566b..04e2cb45e283 100644 --- a/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "texstudio"; version = "2.12.16"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "${pname}-org"; diff --git a/nixpkgs/pkgs/applications/editors/textadept/default.nix b/nixpkgs/pkgs/applications/editors/textadept/default.nix index 79cad6a9782c..85006e51b663 100644 --- a/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/nixpkgs/pkgs/applications/editors/textadept/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: stdenv.mkDerivation rec { version = "10.2"; - name = "textadept-${version}"; + pname = "textadept"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/texworks/default.nix b/nixpkgs/pkgs/applications/editors/texworks/default.nix index 86904c11f748..8042363f73c9 100644 --- a/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -4,7 +4,7 @@ , withPython ? true, python3 }: stdenv.mkDerivation rec { - name = "texworks-${version}"; + pname = "texworks"; version = "0.6.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/tweak/default.nix b/nixpkgs/pkgs/applications/editors/tweak/default.nix index aa3b4b99d7a0..6bfce921d0f6 100644 --- a/nixpkgs/pkgs/applications/editors/tweak/default.nix +++ b/nixpkgs/pkgs/applications/editors/tweak/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "tweak-${version}"; + pname = "tweak"; version = "3.02"; src = fetchurl { - url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${pname}-${version}.tar.gz"; sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v"; }; diff --git a/nixpkgs/pkgs/applications/editors/uemacs/default.nix b/nixpkgs/pkgs/applications/editors/uemacs/default.nix index 551fa67d9863..fad4e82d37ff 100644 --- a/nixpkgs/pkgs/applications/editors/uemacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/uemacs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ncurses }: stdenv.mkDerivation rec { - name = "uemacs-${version}"; + pname = "uemacs"; version = "2014-12-08"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/editors/vbindiff/default.nix b/nixpkgs/pkgs/applications/editors/vbindiff/default.nix index 8d3a5353c989..d1aa59569e62 100644 --- a/nixpkgs/pkgs/applications/editors/vbindiff/default.nix +++ b/nixpkgs/pkgs/applications/editors/vbindiff/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "vbindiff-${version}"; + pname = "vbindiff"; version = "3.0_beta5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz"; + url = "https://www.cjmweb.net/vbindiff/${pname}-${version}.tar.gz"; sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh"; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/nixpkgs/pkgs/applications/editors/vim/configurable.nix index 4d37b77f61bf..1d65be3e73dd 100644 --- a/nixpkgs/pkgs/applications/editors/vim/configurable.nix +++ b/nixpkgs/pkgs/applications/editors/vim/configurable.nix @@ -68,7 +68,7 @@ let in stdenv.mkDerivation rec { - name = "vim_configurable-${version}"; + pname = "vim_configurable"; inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; diff --git a/nixpkgs/pkgs/applications/editors/vim/default.nix b/nixpkgs/pkgs/applications/editors/vim/default.nix index 26cd61d182bd..732bfbf0bfd3 100644 --- a/nixpkgs/pkgs/applications/editors/vim/default.nix +++ b/nixpkgs/pkgs/applications/editors/vim/default.nix @@ -13,7 +13,7 @@ let common = callPackage ./common.nix {}; in stdenv.mkDerivation rec { - name = "vim-${version}"; + pname = "vim"; inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; diff --git a/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/nixpkgs/pkgs/applications/editors/vim/macvim.nix index 369184a35e23..82977c2e6bc5 100644 --- a/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { - name = "macvim-${version}"; + pname = "macvim"; version = "8.1.1722"; diff --git a/nixpkgs/pkgs/applications/editors/vis/default.nix b/nixpkgs/pkgs/applications/editors/vis/default.nix index 7825188fea9b..5b9548df7f17 100644 --- a/nixpkgs/pkgs/applications/editors/vis/default.nix +++ b/nixpkgs/pkgs/applications/editors/vis/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "vis-${version}"; + pname = "vis"; version = "0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/wily/default.nix b/nixpkgs/pkgs/applications/editors/wily/default.nix index ce67cc2d6484..aab3aecd7d69 100644 --- a/nixpkgs/pkgs/applications/editors/wily/default.nix +++ b/nixpkgs/pkgs/applications/editors/wily/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.13.42"; - name = "wily-${version}"; + pname = "wily"; src = fetchurl { - url = "mirror://sourceforge/wily/${name}.tar.gz"; + url = "mirror://sourceforge/wily/${pname}-${version}.tar.gz"; sha256 = "1jy4czk39sh365b0mjpj4d5wmymj98x163vmwzyx3j183jqrhm2z"; }; diff --git a/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix index c345e8a95d55..09ccbad6cd75 100644 --- a/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix +++ b/nixpkgs/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { - name = "wxHexEditor-${version}"; + pname = "wxHexEditor"; version = "0.24"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix index d91403bc54ff..eeda097db258 100644 --- a/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/nixpkgs/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: stdenv.mkDerivation rec { - name = "xmlcopyeditor-${version}"; + pname = "xmlcopyeditor"; version = "1.2.1.3"; src = fetchurl { - name = "${name}.tar.gz"; - url = "mirror://sourceforge/xml-copy-editor/${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz"; sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v"; }; diff --git a/nixpkgs/pkgs/applications/editors/yi/wrapper.nix b/nixpkgs/pkgs/applications/editors/yi/wrapper.nix index a90275638dc8..100e64fc1975 100644 --- a/nixpkgs/pkgs/applications/editors/yi/wrapper.nix +++ b/nixpkgs/pkgs/applications/editors/yi/wrapper.nix @@ -9,7 +9,7 @@ let (self: [ self.yi ] ++ extraPackages self); in stdenv.mkDerivation rec { - name = "yi-custom-${version}"; + pname = "yi-custom"; version = "0.0.0.1"; dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix index 38aeee6d13ef..244f37b10dff 100644 --- a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "OpenOrienteering-Mapper-${version}"; + pname = "OpenOrienteering-Mapper"; version = "0.8.4"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats diff --git a/nixpkgs/pkgs/applications/gis/saga/default.nix b/nixpkgs/pkgs/applications/gis/saga/default.nix index 7440e2633a33..1ae1221a330c 100644 --- a/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "saga"; version = "7.3.0"; - name = "${pname}-${version}"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 003a17aa3d44..cbd930668f99 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -20,7 +20,7 @@ let in stdenv.mkDerivation rec { - name = "imagemagick-${version}"; + pname = "imagemagick"; inherit (cfg) version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index ecc6a5b00dec..59f471ab4e34 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { - name = "imagemagick-${version}"; + pname = "imagemagick"; inherit (cfg) version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix b/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix index 938df76e2572..e35a0190d8bc 100644 --- a/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/PythonMagick/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }: stdenv.mkDerivation rec { - name = "pythonmagick-${version}"; + pname = "pythonmagick"; version = "0.9.16"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix b/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix index 5210af4df7ad..fb06266cdc59 100644 --- a/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix @@ -7,7 +7,7 @@ assert useUnrar -> unrar != null; stdenv.mkDerivation rec { - name = "ahoviewer-${version}"; + pname = "ahoviewer"; version = "1.6.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/alchemy/default.nix b/nixpkgs/pkgs/applications/graphics/alchemy/default.nix index 09664889f35b..5132d5950aab 100644 --- a/nixpkgs/pkgs/applications/graphics/alchemy/default.nix +++ b/nixpkgs/pkgs/applications/graphics/alchemy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { - name = "alchemy-${version}"; + pname = "alchemy"; version = "008"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/graphics/animbar/default.nix b/nixpkgs/pkgs/applications/graphics/animbar/default.nix index c918e4b302bb..c4f1b4218d07 100644 --- a/nixpkgs/pkgs/applications/graphics/animbar/default.nix +++ b/nixpkgs/pkgs/applications/graphics/animbar/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "animbar"; version = "1.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9"; }; diff --git a/nixpkgs/pkgs/applications/graphics/antimony/default.nix b/nixpkgs/pkgs/applications/graphics/antimony/default.nix index 0257a109568e..7d800d57b631 100644 --- a/nixpkgs/pkgs/applications/graphics/antimony/default.nix +++ b/nixpkgs/pkgs/applications/graphics/antimony/default.nix @@ -9,7 +9,7 @@ let gitTag = "0.9.3"; in stdenv.mkDerivation rec { - name = "antimony-${version}"; + pname = "antimony"; version = "2018-10-20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/apitrace/default.nix b/nixpkgs/pkgs/applications/graphics/apitrace/default.nix index c98c323fc79c..5ce36f4f10e9 100644 --- a/nixpkgs/pkgs/applications/graphics/apitrace/default.nix +++ b/nixpkgs/pkgs/applications/graphics/apitrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: stdenv.mkDerivation rec { - name = "apitrace-${version}"; + pname = "apitrace"; version = "7.1-572-g${builtins.substring 0 8 src.rev}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/autotrace/default.nix b/nixpkgs/pkgs/applications/graphics/autotrace/default.nix index cc08dce906c3..57e95dfef106 100644 --- a/nixpkgs/pkgs/applications/graphics/autotrace/default.nix +++ b/nixpkgs/pkgs/applications/graphics/autotrace/default.nix @@ -6,11 +6,11 @@ # libpng16.so.16 rather than libpng12. stdenv.mkDerivation rec { - name = "autotrace-${version}"; + pname = "autotrace"; version = "0.31.1"; src = fetchurl { - url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${name}.tar.gz"; + url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${pname}-${version}.tar.gz"; sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js"; }; diff --git a/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 552ca714476f..5e1cba31b7ec 100644 --- a/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "avocode-${version}"; + pname = "avocode"; version = "3.9.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix index df742645e86b..43f8f561e2f1 100644 --- a/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix +++ b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix @@ -23,7 +23,8 @@ let ''; }; in stdenv.mkDerivation rec { - name = "awesomebump-${version}"; + pname = "awesomebump"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/applications/graphics/c3d/default.nix b/nixpkgs/pkgs/applications/graphics/c3d/default.nix index 7e1c6d7c8c4b..4e864d953dfd 100644 --- a/nixpkgs/pkgs/applications/graphics/c3d/default.nix +++ b/nixpkgs/pkgs/applications/graphics/c3d/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchgit, cmake, itk, Cocoa }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "c3d"; version = "2018-10-04"; diff --git a/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix index a32681c754ca..d3c7691ccff9 100644 --- a/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2.6.2"; - name = "darktable-${version}"; + pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/applications/graphics/deskew/default.nix b/nixpkgs/pkgs/applications/graphics/deskew/default.nix index 71e2d82ea7ca..c35aaa044aef 100644 --- a/nixpkgs/pkgs/applications/graphics/deskew/default.nix +++ b/nixpkgs/pkgs/applications/graphics/deskew/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "deskew-${version}"; + pname = "deskew"; version = "1.25"; src = fetchFromBitbucket { diff --git a/nixpkgs/pkgs/applications/graphics/dia/default.nix b/nixpkgs/pkgs/applications/graphics/dia/default.nix index 0ce160242e56..b0e32678a141 100644 --- a/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -4,7 +4,7 @@ libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-them gtk-mac-integration-gtk2 }: stdenv.mkDerivation rec { - name = "dia-${version}"; + pname = "dia"; version = "0.97.3.20170622"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/graphics/djview/default.nix b/nixpkgs/pkgs/applications/graphics/djview/default.nix index d90fb41c03ba..1917640fd2e5 100644 --- a/nixpkgs/pkgs/applications/graphics/djview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/djview/default.nix @@ -3,11 +3,11 @@ , darwin }: stdenv.mkDerivation rec { - name = "djview-${version}"; + pname = "djview"; version = "4.10.6"; src = fetchurl { - url = "mirror://sourceforge/djvu/${name}.tar.gz"; + url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; }; diff --git a/nixpkgs/pkgs/applications/graphics/draftsight/default.nix b/nixpkgs/pkgs/applications/graphics/draftsight/default.nix index 30101bb94770..e59d14f7dd6e 100644 --- a/nixpkgs/pkgs/applications/graphics/draftsight/default.nix +++ b/nixpkgs/pkgs/applications/graphics/draftsight/default.nix @@ -6,7 +6,8 @@ let version = "2018SP2"; in stdenv.mkDerivation { - name = "draftsight-${version}"; + pname = "draftsight"; + inherit version; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index eca3740f9758..5db104f031c4 100644 --- a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -58,7 +58,7 @@ let ]; in stdenv.mkDerivation rec { - name = "drawpile-${version}"; + pname = "drawpile"; version = "2.1.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/exrtools/default.nix b/nixpkgs/pkgs/applications/graphics/exrtools/default.nix index 7980d09fed12..c8928540bb65 100644 --- a/nixpkgs/pkgs/applications/graphics/exrtools/default.nix +++ b/nixpkgs/pkgs/applications/graphics/exrtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }: stdenv.mkDerivation rec { - name = "exrtools-${version}"; + pname = "exrtools"; version = "0.4"; src = fetchurl { - url = "http://scanline.ca/exrtools/${name}.tar.gz"; + url = "http://scanline.ca/exrtools/${pname}-${version}.tar.gz"; sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z"; }; diff --git a/nixpkgs/pkgs/applications/graphics/feh/default.nix b/nixpkgs/pkgs/applications/graphics/feh/default.nix index fbc6cd2fafef..fef068eaf0ff 100644 --- a/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "feh-${version}"; + pname = "feh"; version = "3.2.1"; src = fetchurl { - url = "https://feh.finalrewind.org/${name}.tar.bz2"; + url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg"; }; diff --git a/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix index 1e54152fff4d..ae38730226a4 100644 --- a/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix @@ -4,7 +4,8 @@ let version = "3.2.7a"; in stdenv.mkDerivation { - name = "fig2dev-${version}"; + pname = "fig2dev"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix b/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix index 8ca093b90c3e..3b8662976032 100644 --- a/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "fontmatrix-${version}"; + pname = "fontmatrix"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix index b8f4d5445036..ee7586709dcb 100644 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -1,14 +1,14 @@ -{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts -, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu -, soqt, libf2c, libGLU, makeWrapper, pkgconfig -, mpi ? null }: +{ stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode +, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile +, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU +, makeWrapper, pkgconfig, mpi ? null }: assert mpi != null; let pythonPackages = python3Packages; in mkDerivation rec { - name = "freecad-${version}"; + pname = "freecad"; version = "0.18.3"; src = fetchurl { @@ -19,13 +19,20 @@ in mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile - libGLU libXmu - ] ++ (with qt5; [ - qtbase qttools qtwebkit - ]) ++ (with pythonPackages; [ + libGLU libXmu qtbase qttools qtwebkit + ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost ]); + # Fix missing app icon on Wayland. Has been upstreamed and should be safe to + # remove in versions >= 0.19 + patches = [ + (fetchpatch { + url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; + sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; + }) + ]; + cmakeFlags = [ "-DBUILD_QT5=ON" "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" diff --git a/nixpkgs/pkgs/applications/graphics/fstl/default.nix b/nixpkgs/pkgs/applications/graphics/fstl/default.nix index bdb1e87d70ec..1d712a63fbdf 100644 --- a/nixpkgs/pkgs/applications/graphics/fstl/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fstl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }: mkDerivation rec { - name = "fstl-${version}"; + pname = "fstl"; version = "0.9.3"; buildInputs = [qtbase mesa_glu]; diff --git a/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix b/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix index 025b3ae65ece..103f40fc9c70 100644 --- a/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix @@ -2,7 +2,8 @@ let version = "0.4"; in stdenv.mkDerivation { - name = "gcolor2-${version}"; + pname = "gcolor2"; + inherit version; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix index 5ad7cb88b03a..c7555b612f7b 100644 --- a/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix @@ -3,7 +3,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "gcolor3-${version}"; + pname = "gcolor3"; + inherit version; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 08b2757dd6e8..62e2ebfa4b1e 100644 --- a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "geeqie-${version}"; + pname = "geeqie"; version = "1.4"; src = fetchurl { - url = "http://geeqie.org/${name}.tar.xz"; + url = "http://geeqie.org/${pname}-${version}.tar.xz"; sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; diff --git a/nixpkgs/pkgs/applications/graphics/giv/default.nix b/nixpkgs/pkgs/applications/graphics/giv/default.nix index ec708ad971a4..9ba7dbed37b3 100644 --- a/nixpkgs/pkgs/applications/graphics/giv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/giv/default.nix @@ -2,7 +2,7 @@ , pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }: stdenv.mkDerivation rec { - name = "giv-${version}"; + pname = "giv"; version = "0.9.26"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix b/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix index b3671ead377a..eb48333997ca 100644 --- a/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "gnuclad-${version}"; + pname = "gnuclad"; version = "0.2.4"; src = fetchurl { - url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${pname}-${version}.tar.gz"; sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; diff --git a/nixpkgs/pkgs/applications/graphics/goxel/default.nix b/nixpkgs/pkgs/applications/graphics/goxel/default.nix index b25ba8f567df..e4ab5639ba66 100644 --- a/nixpkgs/pkgs/applications/graphics/goxel/default.nix +++ b/nixpkgs/pkgs/applications/graphics/goxel/default.nix @@ -2,7 +2,7 @@ , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { - name = "goxel-${version}"; + pname = "goxel"; version = "0.10.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/grafx2/default.nix b/nixpkgs/pkgs/applications/graphics/grafx2/default.nix index b1580d73b641..039bb1917d37 100644 --- a/nixpkgs/pkgs/applications/graphics/grafx2/default.nix +++ b/nixpkgs/pkgs/applications/graphics/grafx2/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "2.4.2035"; - name = "grafx2-${version}"; + pname = "grafx2"; src = fetchurl { - url = "https://grafx2.googlecode.com/files/${name}-src.tgz"; + url = "https://grafx2.googlecode.com/files/${pname}-${version}-src.tgz"; sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; }; diff --git a/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix b/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix index fedcafc59788..be8885caff1f 100644 --- a/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -1,7 +1,7 @@ { stdenv, graphicsmagick }: stdenv.mkDerivation rec { - name = "graphicsmagick-imagemagick-compat-${version}"; + pname = "graphicsmagick-imagemagick-compat"; inherit (graphicsmagick) version; dontUnpack = true; diff --git a/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix index 84d1450da823..403a5285e150 100644 --- a/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix @@ -3,7 +3,7 @@ , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: stdenv.mkDerivation rec { - name = "graphicsmagick-${version}"; + pname = "graphicsmagick"; version = "1.3.32"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/guetzli/default.nix b/nixpkgs/pkgs/applications/graphics/guetzli/default.nix index 061dc2b69a61..d7b964259683 100644 --- a/nixpkgs/pkgs/applications/graphics/guetzli/default.nix +++ b/nixpkgs/pkgs/applications/graphics/guetzli/default.nix @@ -3,7 +3,8 @@ let version = "1.0.1"; in stdenv.mkDerivation { - name = "guetzli-${version}"; + pname = "guetzli"; + inherit version; src = fetchFromGitHub { owner = "google"; repo = "guetzli"; diff --git a/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/nixpkgs/pkgs/applications/graphics/imagej/default.nix index 0bbd543a3076..7d5a90130359 100644 --- a/nixpkgs/pkgs/applications/graphics/imagej/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imagej/default.nix @@ -8,7 +8,7 @@ let imagej150 = stdenv.mkDerivation rec { - name = "imagej-${version}"; + pname = "imagej"; version = "150"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix b/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix index a881c0fc1f93..5fdd20825cd5 100644 --- a/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imlibsetroot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXinerama, imlib2 }: stdenv.mkDerivation rec { - name = "imlibsetroot-${version}"; + pname = "imlibsetroot"; version = "1.2"; src = fetchurl { url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; diff --git a/nixpkgs/pkgs/applications/graphics/imv/default.nix b/nixpkgs/pkgs/applications/graphics/imv/default.nix index 89712d4d1f7a..38e536c70cbb 100644 --- a/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "imv-${version}"; + pname = "imv"; version = "3.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/jbrout/default.nix b/nixpkgs/pkgs/applications/graphics/jbrout/default.nix index 42ed667dee98..4eb7518cc102 100644 --- a/nixpkgs/pkgs/applications/graphics/jbrout/default.nix +++ b/nixpkgs/pkgs/applications/graphics/jbrout/default.nix @@ -3,7 +3,7 @@ let inherit (pythonPackages) python; in pythonPackages.buildPythonApplication rec { - name = "jbrout-${version}"; + pname = "jbrout"; version = "338"; src = fetchsvn { diff --git a/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix index ed583490c90d..b5664d51a144 100644 --- a/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: stdenv.mkDerivation rec { - name = "jpeg-archive-${version}"; + pname = "jpeg-archive"; version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15 # update with diff --git a/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix b/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix index f438bf6f7ed8..e15aedd77e1c 100644 --- a/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix +++ b/nixpkgs/pkgs/applications/graphics/jpeginfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - name = "jpeginfo-${version}"; + pname = "jpeginfo"; version = "1.6.1"; src = fetchurl { - url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz"; + url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2"; }; diff --git a/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix b/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix index b24b14698e6a..cc1ca3a0ff2a 100644 --- a/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix +++ b/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.4.6"; - name = "jpegoptim-${version}"; + pname = "jpegoptim"; src = fetchurl { - url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz"; + url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; }; diff --git a/nixpkgs/pkgs/applications/graphics/k3d/default.nix b/nixpkgs/pkgs/applications/graphics/k3d/default.nix index 301dc902dce9..1487fb8adbac 100644 --- a/nixpkgs/pkgs/applications/graphics/k3d/default.nix +++ b/nixpkgs/pkgs/applications/graphics/k3d/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { version = "0.8.0.6"; - name = "k3d-${version}"; + pname = "k3d"; src = fetchFromGitHub { owner = "K-3D"; repo = "k3d"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa"; }; diff --git a/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix index e70fafa24b60..9b96b30c62b1 100644 --- a/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { - name = "kgraphviewer-${version}"; + pname = "kgraphviewer"; version = "2.4.3"; src = fetchurl { - url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/kgraphviewer/${version}/${pname}-${version}.tar.xz"; sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"; }; diff --git a/nixpkgs/pkgs/applications/graphics/kipi-plugins/default.nix b/nixpkgs/pkgs/applications/graphics/kipi-plugins/default.nix deleted file mode 100644 index de51422d1da6..000000000000 --- a/nixpkgs/pkgs/applications/graphics/kipi-plugins/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenv, fetchurl, - extra-cmake-modules, - karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, - libkipi, qtbase, qtsvg, qtxmlpatterns -}: - -stdenv.mkDerivation rec { - pname = "kipi-plugins"; - version = "5.9.1"; - - src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0hjm05nkz0w926sn4lav5258rda6zkd6gfnqd8hh3fa2q0dd7cq4"; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi - qtbase qtsvg qtxmlpatterns - ]; - - meta = { - description = "Plugins for KDE-based image applications"; - license = stdenv.lib.licenses.gpl2; - homepage = https://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/leocad/default.nix b/nixpkgs/pkgs/applications/graphics/leocad/default.nix index 4f86e5736899..201a4fe113e3 100644 --- a/nixpkgs/pkgs/applications/graphics/leocad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/leocad/default.nix @@ -6,7 +6,7 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ { stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { - name = "leocad-${version}"; + pname = "leocad"; version = "19.07.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/meme/default.nix b/nixpkgs/pkgs/applications/graphics/meme/default.nix index 2fddc39e0d07..5f8a0bb6eed3 100644 --- a/nixpkgs/pkgs/applications/graphics/meme/default.nix +++ b/nixpkgs/pkgs/applications/graphics/meme/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "meme-unstable-${version}"; + pname = "meme-unstable"; version = "2017-09-10"; owner = "nomad-software"; diff --git a/nixpkgs/pkgs/applications/graphics/mirage/default.nix b/nixpkgs/pkgs/applications/graphics/mirage/default.nix index 515b834b41ea..fbe8f10c72f7 100644 --- a/nixpkgs/pkgs/applications/graphics/mirage/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mirage/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, pythonPackages, libX11, gettext }: pythonPackages.buildPythonApplication rec { - name = "mirage-${version}"; + pname = "mirage"; version = "0.9.5.2"; src = fetchurl { - url = "mirror://sourceforge/mirageiv/${name}.tar.bz2"; + url = "mirror://sourceforge/mirageiv/${pname}-${version}.tar.bz2"; sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c"; }; doCheck = false; + nativeBuildInputs = [ gettext ]; + buildInputs = [ stdenv libX11 gettext ]; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix b/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix index b48fd891a6ac..63cc4a3a8d35 100644 --- a/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.3.1"; - name = "mozjpeg-${version}"; + pname = "mozjpeg"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index 466ab3e26fb8..5ad5ab6acc61 100644 --- a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -4,7 +4,7 @@ let inherit (python2Packages) python pycairo pygobject3 numpy; in stdenv.mkDerivation rec { - name = "mypaint-${version}"; + pname = "mypaint"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index d0838070262a..62fae518b929 100644 --- a/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -1,9 +1,8 @@ { stdenv +, mkDerivation , fetchFromGitHub , cmake , pkgconfig -, wrapGAppsHook -, gsettings-desktop-schemas , qtbase , qttools @@ -16,8 +15,8 @@ , quazip }: -stdenv.mkDerivation rec { - name = "nomacs-${version}"; +mkDerivation rec { + pname = "nomacs"; version = "3.12"; src = fetchFromGitHub { @@ -38,8 +37,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [cmake - pkgconfig - wrapGAppsHook]; + pkgconfig]; buildInputs = [qtbase qttools @@ -48,13 +46,13 @@ stdenv.mkDerivation rec { opencv libraw libtiff - quazip - gsettings-desktop-schemas]; + quazip]; cmakeFlags = ["-DENABLE_OPENCV=ON" "-DENABLE_RAW=ON" "-DENABLE_TIFF=ON" "-DENABLE_QUAZIP=ON" + "-DENABLE_TRANSLATIONS=ON" "-DUSE_SYSTEM_QUAZIP=ON"]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/nixpkgs/pkgs/applications/graphics/paraview/default.nix index cf13c6fb05e9..13a00991265f 100644 --- a/nixpkgs/pkgs/applications/graphics/paraview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/paraview/default.nix @@ -5,7 +5,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper }: stdenv.mkDerivation rec { - name = "paraview-${version}"; + pname = "paraview"; version = "5.6.0"; # fetching from GitHub instead of taking an "official" source diff --git a/nixpkgs/pkgs/applications/graphics/pbrt/default.nix b/nixpkgs/pkgs/applications/graphics/pbrt/default.nix index 3cc7166b4e46..a0aaed49c9c0 100644 --- a/nixpkgs/pkgs/applications/graphics/pbrt/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pbrt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2018-08-15"; - name = "pbrt-v3-${version}"; + pname = "pbrt-v3"; src = fetchFromGitHub { rev = "86b5821308088deea70b207bc8c22219d0103d65"; diff --git a/nixpkgs/pkgs/applications/graphics/pencil/default.nix b/nixpkgs/pkgs/applications/graphics/pencil/default.nix index f622d3f388e2..37857fc459ea 100644 --- a/nixpkgs/pkgs/applications/graphics/pencil/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pencil/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.0.4"; - name = "pencil-${version}"; + pname = "pencil"; src = fetchurl { url = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb"; diff --git a/nixpkgs/pkgs/applications/graphics/phototonic/default.nix b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix index 7da1d4b612f9..5e7fb5cf7a0a 100644 --- a/nixpkgs/pkgs/applications/graphics/phototonic/default.nix +++ b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: stdenv.mkDerivation rec { - name = "phototonic-${version}"; + pname = "phototonic"; version = "2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/potrace/default.nix b/nixpkgs/pkgs/applications/graphics/potrace/default.nix index 132136da658b..f50af2925a3a 100644 --- a/nixpkgs/pkgs/applications/graphics/potrace/default.nix +++ b/nixpkgs/pkgs/applications/graphics/potrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "potrace-${version}"; + pname = "potrace"; version = "1.15"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/pqiv/default.nix b/nixpkgs/pkgs/applications/graphics/pqiv/default.nix index ec4ce69d5e87..1ad51e92d472 100644 --- a/nixpkgs/pkgs/applications/graphics/pqiv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pqiv/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation (rec { - name = "pqiv-${version}"; + pname = "pqiv"; version = "2.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix index c37e21ec898a..4d416a7c106d 100644 --- a/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: stdenv.mkDerivation rec { - name = "qcomicbook-${version}"; + pname = "qcomicbook"; version = "0.9.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/qiv/default.nix b/nixpkgs/pkgs/applications/graphics/qiv/default.nix index ce08e2b1be92..750217d99188 100644 --- a/nixpkgs/pkgs/applications/graphics/qiv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qiv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation (rec { version = "2.3.2"; - name = "qiv-${version}"; + pname = "qiv"; src = fetchurl { - url = "https://spiegl.de/qiv/download/${name}.tgz"; + url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz"; sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; }; diff --git a/nixpkgs/pkgs/applications/graphics/rapcad/default.nix b/nixpkgs/pkgs/applications/graphics/rapcad/default.nix index b300c0071fae..7e9547c1067c 100644 --- a/nixpkgs/pkgs/applications/graphics/rapcad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rapcad/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.9.8"; - name = "rapcad-${version}"; + pname = "rapcad"; src = fetchFromGitHub { owner = "gilesbathgate"; diff --git a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index 3fd4521d7cd8..594429503a35 100644 --- a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { version = "1.4"; - name = "renderdoc-${version}"; + pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 01c203b407c1..d4165be3784f 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, rpmextract }: stdenv.mkDerivation rec { - name = "libsane-dsseries-${version}"; + pname = "libsane-dsseries"; version = "1.0.5-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf100974/${name}.x86_64.rpm"; + url = "https://download.brother.com/welcome/dlf100974/${pname}-${version}.x86_64.rpm"; sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq"; }; nativeBuildInputs = [ rpmextract ]; unpackCmd = '' - mkdir ${name} && pushd ${name} + mkdir ${pname}-${version} && pushd ${pname}-${version} rpmextract $curSrc popd ''; diff --git a/nixpkgs/pkgs/applications/graphics/sane/frontends.nix b/nixpkgs/pkgs/applications/graphics/sane/frontends.nix index f6994db81e4b..66473c4a155f 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/frontends.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/frontends.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }: stdenv.mkDerivation rec { - name = "sane-frontends-${version}"; + pname = "sane-frontends"; version = "1.0.14"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz"; + url = "https://alioth.debian.org/frs/download.php/latestfile/175/${pname}-${version}.tar.gz"; sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7"; }; diff --git a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix index d55441e39fa5..63f16f688acd 100644 --- a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix +++ b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix @@ -3,7 +3,7 @@ , qtbase, qttools }: stdenv.mkDerivation rec { - name = "scantailor-advanced-${version}"; + pname = "scantailor-advanced"; version = "1.0.16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/screencloud/default.nix b/nixpkgs/pkgs/applications/graphics/screencloud/default.nix index 292ae9c8faa8..88bbbd9d8646 100644 --- a/nixpkgs/pkgs/applications/graphics/screencloud/default.nix +++ b/nixpkgs/pkgs/applications/graphics/screencloud/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "screencloud-${version}"; + pname = "screencloud"; version = "1.2.0"; # API Keys. According to the author of the AUR package, these are only used diff --git a/nixpkgs/pkgs/applications/graphics/swingsane/default.nix b/nixpkgs/pkgs/applications/graphics/swingsane/default.nix index d0f2a48c589d..f56646e5aedd 100644 --- a/nixpkgs/pkgs/applications/graphics/swingsane/default.nix +++ b/nixpkgs/pkgs/applications/graphics/swingsane/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }: stdenv.mkDerivation rec { - name = "swingsane-${version}"; + pname = "swingsane"; version = "0.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix index b399dd2d2284..34294d271292 100644 --- a/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix +++ b/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix @@ -22,7 +22,8 @@ let }; synfig = stdenv.mkDerivation rec { - name = "synfig-${version}"; + pname = "synfig"; + inherit version; src = fetchFromGitHub { repo = "synfig"; @@ -47,7 +48,8 @@ let }; in stdenv.mkDerivation rec { - name = "synfigstudio-${version}"; + pname = "synfigstudio"; + inherit version; src = fetchFromGitHub { repo = "synfig"; diff --git a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix index 23713271c409..157c0b9742bf 100644 --- a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -2,7 +2,7 @@ , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { - name = "tesseract-${version}"; + pname = "tesseract"; version = "3.05.00"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix index af0063301f1a..548f58a50fb1 100644 --- a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -2,7 +2,7 @@ , leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { - name = "tesseract-${version}"; + pname = "tesseract"; version = "4.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix b/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix index b4ddb1436856..8355545e8dd6 100644 --- a/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - name = "timelapse-deflicker-${version}"; + pname = "timelapse-deflicker"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix b/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix index 3a139f3740cc..09abfc60a528 100644 --- a/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix +++ b/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix @@ -27,7 +27,8 @@ let in stdenv.mkDerivation rec { - name = "unigine-valley-${version}"; + pname = "unigine-valley"; + inherit version; src = fetchurl { url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run"; diff --git a/nixpkgs/pkgs/applications/graphics/viewnior/default.nix b/nixpkgs/pkgs/applications/graphics/viewnior/default.nix index 48930ccbbb96..4f5fb12faa62 100644 --- a/nixpkgs/pkgs/applications/graphics/viewnior/default.nix +++ b/nixpkgs/pkgs/applications/graphics/viewnior/default.nix @@ -2,13 +2,13 @@ , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { - name = "viewnior-${version}"; + pname = "viewnior"; version = "1.6"; src = fetchFromGitHub { owner = "xsisqox"; repo = "Viewnior"; - rev = name; + rev = "${pname}-${version}"; sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p"; }; diff --git a/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix b/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix index e11bc3dd5bb9..232eeeb01153 100644 --- a/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix +++ b/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: stdenv.mkDerivation rec { - name = "write_stylus-${version}"; + pname = "write_stylus"; version = "209"; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/graphics/xaos/default.nix b/nixpkgs/pkgs/applications/graphics/xaos/default.nix index 182f68f3112c..e80362c386b9 100644 --- a/nixpkgs/pkgs/applications/graphics/xaos/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xaos/default.nix @@ -2,11 +2,11 @@ , libXt, zlib, gettext, intltool, perl }: stdenv.mkDerivation rec { - name = "xaos-${version}"; + pname = "xaos"; version = "3.6"; src = fetchurl { - url = "mirror://sourceforge/xaos/${name}.tar.gz"; + url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz"; sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; }; diff --git a/nixpkgs/pkgs/applications/graphics/xfig/default.nix b/nixpkgs/pkgs/applications/graphics/xfig/default.nix index 429af12b9bb3..fe5a13703329 100644 --- a/nixpkgs/pkgs/applications/graphics/xfig/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xfig/default.nix @@ -6,7 +6,8 @@ let version = "3.2.7a"; in stdenv.mkDerivation { - name = "xfig-${version}"; + pname = "xfig"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/applications/graphics/xfractint/default.nix b/nixpkgs/pkgs/applications/graphics/xfractint/default.nix index 2269f1c18f14..ae4765fc9e76 100644 --- a/nixpkgs/pkgs/applications/graphics/xfractint/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xfractint/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xfractint"; version = "20.04p14"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) diff --git a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index 2487b093148a..41539f32b071 100644 --- a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -23,7 +23,7 @@ }: stdenv.mkDerivation rec { - name = "xournalpp-${version}"; + pname = "xournalpp"; version = "1.0.12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/graphics/xzgv/default.nix b/nixpkgs/pkgs/applications/graphics/xzgv/default.nix index 69ab67dffb73..de3f3a78988b 100644 --- a/nixpkgs/pkgs/applications/graphics/xzgv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xzgv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }: stdenv.mkDerivation rec { - name = "xzgv-${version}"; + pname = "xzgv"; version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/graphics/yacreader/default.nix b/nixpkgs/pkgs/applications/graphics/yacreader/default.nix index 3cf42343658c..e545dd5a7230 100644 --- a/nixpkgs/pkgs/applications/graphics/yacreader/default.nix +++ b/nixpkgs/pkgs/applications/graphics/yacreader/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "yacreader-${version}"; + pname = "yacreader"; version = "9.5.0"; src = fetchurl { - url = "https://github.com/YACReader/yacreader/releases/download/${version}/${name}-src.tar.xz"; + url = "https://github.com/YACReader/yacreader/releases/download/${version}/${pname}-${version}-src.tar.xz"; sha256 = "0cv5y76kjvsqsv4fp99j8np5pm4m76868i1nn40q6hy573dmxwm6"; }; diff --git a/nixpkgs/pkgs/applications/graphics/yed/default.nix b/nixpkgs/pkgs/applications/graphics/yed/default.nix index 799ceef1beda..0038d41475fb 100644 --- a/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-${version}"; + pname = "yEd"; version = "3.19"; src = fetchzip { - url = "https://www.yworks.com/resources/yed/demo/${name}.zip"; + url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; sha256 = "0l70pc7wl2ghfkjab9w2mbx7crwha7xwkrpmspsi5c6q56dw7s33"; }; diff --git a/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix b/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix index ac3d303a7a60..db07b9e1db4e 100644 --- a/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix +++ b/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix @@ -2,9 +2,8 @@ stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; - name="${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip"; + url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip"; sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23"; }; buildInputs = [jre unzip]; diff --git a/nixpkgs/pkgs/applications/graphics/zgv/default.nix b/nixpkgs/pkgs/applications/graphics/zgv/default.nix index 7a49e5b2cb7f..8ef705f7ef4b 100644 --- a/nixpkgs/pkgs/applications/graphics/zgv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/zgv/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { - name = "zgv-${version}"; + pname = "zgv"; version = "5.9"; src = fetchurl { - url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz"; + url = "https://www.svgalib.org/rus/zgv/${pname}-${version}.tar.gz"; sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; diff --git a/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch index 24ed20fd83fb..c3964c5c05b5 100644 --- a/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch +++ b/nixpkgs/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch @@ -9,11 +9,11 @@ This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. KF5AkonadiConfig.cmake.in | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9788bea94..15bad00fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -285,9 +285,6 @@ configure_package_config_file( +Index: akonadi-19.08.0/CMakeLists.txt +=================================================================== +--- akonadi-19.08.0.orig/CMakeLists.txt ++++ akonadi-19.08.0/CMakeLists.txt +@@ -306,9 +306,6 @@ configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} @@ -23,13 +23,13 @@ index 9788bea94..15bad00fd 100644 ) install(FILES -diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in -index 75abede50..10f039376 100644 ---- a/KF5AkonadiConfig.cmake.in -+++ b/KF5AkonadiConfig.cmake.in -@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@") - find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@") - find_dependency(Qt5Network "@QT_REQUIRED_VERSION@") +Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in +=================================================================== +--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in ++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in +@@ -26,8 +26,8 @@ if(BUILD_TESTING) + find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") + endif() -set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") -set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") @@ -38,15 +38,12 @@ index 75abede50..10f039376 100644 find_dependency(Boost "@Boost_MINIMUM_VERSION@") -@@ -22,7 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) +@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") - + #################################################################################### # CMAKE_AUTOMOC --- -2.15.1 - diff --git a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch index fcbbbbb72eb3..ba6bbedeeae7 100644 --- a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -1,8 +1,8 @@ -diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp -index d85c1a79b..8df02710c 100644 ---- a/src/akonadicontrol/agentmanager.cpp -+++ b/src/akonadicontrol/agentmanager.cpp -@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent) +Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp +@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, mStorageController = new Akonadi::ProcessControl; mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); @@ -17,11 +17,11 @@ index d85c1a79b..8df02710c 100644 } } -diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp -index be1cc4afb..6d0c1d7e5 100644 ---- a/src/akonadicontrol/agentprocessinstance.cpp -+++ b/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) +Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp ++++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A } else { Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); const QStringList arguments = QStringList() << executable << identifier(); @@ -30,11 +30,11 @@ index be1cc4afb..6d0c1d7e5 100644 mController->start(agentLauncherExec, arguments); } return true; -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index dfff6fc29..419e54a5b 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings) +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -42,7 +42,7 @@ index dfff6fc29..419e54a5b 100644 QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett #endif const bool defaultInternalServer = true; @@ -59,8 +59,8 @@ index dfff6fc29..419e54a5b 100644 + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN - defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings) + defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") +@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett #endif } @@ -73,7 +73,7 @@ index dfff6fc29..419e54a5b 100644 qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -82,7 +82,7 @@ index dfff6fc29..419e54a5b 100644 mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -92,7 +92,7 @@ index dfff6fc29..419e54a5b 100644 qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -102,7 +102,7 @@ index dfff6fc29..419e54a5b 100644 settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer() +@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer( #endif // generate config file @@ -111,56 +111,35 @@ index dfff6fc29..419e54a5b 100644 const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { -diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp -index 6b50ae50e..f94a8c5eb 100644 ---- a/src/server/storage/dbconfigpostgresql.cpp -+++ b/src/server/storage/dbconfigpostgresql.cpp -@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings) +Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp +=================================================================== +--- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp +@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; - QString defaultServerPath; QString defaultInitDbPath; +- QString defaultPgUpgradePath; QString defaultPgData; -@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings) + #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows +@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { -- QStringList postgresSearchPath; +- const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql")); - --#ifdef POSTGRES_PATH -- const QString dir(QStringLiteral(POSTGRES_PATH)); -- if (QDir(dir).exists()) { -- postgresSearchPath << QStringLiteral(POSTGRES_PATH); -- } --#endif -- postgresSearchPath << QStringLiteral("/usr/bin") -- << QStringLiteral("/usr/sbin") -- << QStringLiteral("/usr/local/sbin"); -- // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed -- // sorted order, so we search from the newest one to the oldest. -- QStringList postgresVersionedSearchPaths; -- QDir versionedDir(QStringLiteral("/usr/lib/postgresql")); -- if (versionedDir.exists()) { -- const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed); -- for (const auto &path : versionedDirs) { -- // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed -- if (path.fileName().startsWith(QLatin1String("10."))) { -- postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin")); -- } else { -- postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin")); -- } -- } -- } -- postgresSearchPath.append(postgresVersionedSearchPaths); -- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath); -- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths); +- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths); + defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); +- defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings) + +@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -172,7 +151,18 @@ index 6b50ae50e..f94a8c5eb 100644 qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { -@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings) + mInitDbPath = defaultInitDbPath; + } + qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath; +- mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString(); +- if (mInternalServer && mPgUpgradePath.isEmpty()) { +- mPgUpgradePath = defaultPgUpgradePath; +- } ++ mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE); + qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; + mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); + if (mPgData.isEmpty()) { +@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings settings.setValue(QStringLiteral("Port"), mHostPort); } settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -180,6 +170,3 @@ index 6b50ae50e..f94a8c5eb 100644 settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); --- -2.18.1 - diff --git a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch index 25a835f5ba24..e299a6991f05 100644 --- a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch +++ b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-timestamps.patch @@ -1,8 +1,8 @@ -Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp +Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp =================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer( +--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp ++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer( bool confUpdate = false; QFile actualFile(actualConfig); // update conf only if either global (or local) is newer than actual diff --git a/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/nixpkgs/pkgs/applications/kde/akonadi/default.nix index cba0b1e59e3a..b9a96394a674 100644 --- a/nixpkgs/pkgs/applications/kde/akonadi/default.nix +++ b/nixpkgs/pkgs/applications/kde/akonadi/default.nix @@ -25,6 +25,7 @@ mkDerivation { ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"'' ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"'' ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' + ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"'' ]; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/kde/default.nix b/nixpkgs/pkgs/applications/kde/default.nix index 01df2bd26316..6027d8daa9d4 100644 --- a/nixpkgs/pkgs/applications/kde/default.nix +++ b/nixpkgs/pkgs/applications/kde/default.nix @@ -60,7 +60,7 @@ let inherit mkDerivation; # Team of maintainers assigned to the KDE PIM suite - kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; + kdepimTeam = with lib.maintainers; [ ttuegel vandenoever nyanloutre ]; }; in { akonadi = callPackage ./akonadi {}; @@ -116,6 +116,7 @@ let kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; + kipi-plugins = callPackage ./kipi-plugins.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; @@ -171,6 +172,7 @@ let pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; + yakuake = callPackage ./yakuake.nix {}; # Okteta was removed from kde applications and will now be released independently # Lets keep an alias for compatibility reasons inherit okteta; diff --git a/nixpkgs/pkgs/applications/kde/fetch.sh b/nixpkgs/pkgs/applications/kde/fetch.sh index bd96cb966933..5c72e78c5820 100644 --- a/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.04.1/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ ) diff --git a/nixpkgs/pkgs/applications/kde/gwenview.nix b/nixpkgs/pkgs/applications/kde/gwenview.nix index ceb928acdf2f..3d03d1dea3e7 100644 --- a/nixpkgs/pkgs/applications/kde/gwenview.nix +++ b/nixpkgs/pkgs/applications/kde/gwenview.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, exiv2, lcms2, baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch + phonon, qtimageformats, qtsvg, qtx11extras, kinit }: mkDerivation { @@ -18,12 +18,4 @@ mkDerivation { qtimageformats qtsvg qtx11extras ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; - - # Fixes build with exiv2-0.27.1. Drop in 19.04.2 - patches = [ - (fetchpatch { - url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch"; - sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq"; - }) - ]; } diff --git a/nixpkgs/pkgs/applications/kde/kate.nix b/nixpkgs/pkgs/applications/kde/kate.nix index e6b4f6b6bdd4..95ff6cf198b2 100644 --- a/nixpkgs/pkgs/applications/kde/kate.nix +++ b/nixpkgs/pkgs/applications/kde/kate.nix @@ -13,6 +13,7 @@ mkDerivation { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/kde/kcalc.nix b/nixpkgs/pkgs/applications/kde/kcalc.nix index 3cb89cb4daa6..4e2a308b17f5 100644 --- a/nixpkgs/pkgs/applications/kde/kcalc.nix +++ b/nixpkgs/pkgs/applications/kde/kcalc.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, gmp, kconfig, kconfigwidgets, kcrash, kguiaddons, ki18n, kinit, - knotifications, kxmlgui, + knotifications, kxmlgui, mpfr, }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gmp kconfig kconfigwidgets kcrash kguiaddons ki18n kinit knotifications - kxmlgui + kxmlgui mpfr ]; } diff --git a/nixpkgs/pkgs/applications/kde/kipi-plugins.nix b/nixpkgs/pkgs/applications/kde/kipi-plugins.nix new file mode 100644 index 000000000000..5fb953acbd62 --- /dev/null +++ b/nixpkgs/pkgs/applications/kde/kipi-plugins.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, + libkipi, qtbase, qtsvg, qtxmlpatterns +}: + +mkDerivation { + name = "kipi-plugins"; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi + qtbase qtsvg qtxmlpatterns + ]; + + meta = { + description = "Plugins for KDE-based image applications"; + license = lib.licenses.gpl2; + homepage = https://cgit.kde.org/kipi-plugins.git; + maintainers = with lib.maintainers; [ ttuegel ]; + }; +} diff --git a/nixpkgs/pkgs/applications/kde/ktouch.nix b/nixpkgs/pkgs/applications/kde/ktouch.nix index 64179f2e64dc..7e300ea7157e 100644 --- a/nixpkgs/pkgs/applications/kde/ktouch.nix +++ b/nixpkgs/pkgs/applications/kde/ktouch.nix @@ -3,7 +3,8 @@ , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts -, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg +, qtx11extras, qtgraphicaleffects, qtxmlpatterns, qtquickcontrols2 +, xorg }: @@ -19,7 +20,7 @@ kconfig kconfigwidgets kcoreaddons kdeclarative ki18n kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts - qtx11extras qtgraphicaleffects qtxmlpatterns + qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2 xorg.libxkbfile xorg.libxcb ]; diff --git a/nixpkgs/pkgs/applications/kde/pimcommon.nix b/nixpkgs/pkgs/applications/kde/pimcommon.nix index bbbcca13d980..cd9ff2528fac 100644 --- a/nixpkgs/pkgs/applications/kde/pimcommon.nix +++ b/nixpkgs/pkgs/applications/kde/pimcommon.nix @@ -4,7 +4,7 @@ akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, - kwallet, kwindowsystem, libkdepim, qtwebengine + kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit - kwallet kwindowsystem libkdepim qtwebengine + kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ akonadi akonadi-contacts kconfig kcontacts kimap diff --git a/nixpkgs/pkgs/applications/kde/srcs.nix b/nixpkgs/pkgs/applications/kde/srcs.nix index 43deb08c39f5..fb0581cb3411 100644 --- a/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/nixpkgs/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1739 @@ { akonadi = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-19.04.1.tar.xz"; - sha256 = "b157c4199e3b913c4f684f56ed9d76bef67b3c120c319c88ae24bded6fc927bc"; - name = "akonadi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-19.08.0.tar.xz"; + sha256 = "ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831"; + name = "akonadi-19.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-19.04.1.tar.xz"; - sha256 = "6ef352dc20998416b8d379b085edfcfba5bcf6a5f448e11a4e51aca6b3241e48"; - name = "akonadi-calendar-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-19.08.0.tar.xz"; + sha256 = "74743ff7822ce75f0e0170f154e4596644855a5fe9322a09b76e01bd1d078e3b"; + name = "akonadi-calendar-19.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-tools-19.04.1.tar.xz"; - sha256 = "6a8eb905d0e5a1602ce59d5cf28322d844dc178c4daf98db1cf9e0c95eeb3531"; - name = "akonadi-calendar-tools-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-calendar-tools-19.08.0.tar.xz"; + sha256 = "9620a4418245a74334c6f57db4ba5558825879440aee5903f5614db08f61e976"; + name = "akonadi-calendar-tools-19.08.0.tar.xz"; }; }; akonadiconsole = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadiconsole-19.04.1.tar.xz"; - sha256 = "33846348b0308eaf4ca81e8d577ce0eb6c17d49632e034607506413e86531262"; - name = "akonadiconsole-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadiconsole-19.08.0.tar.xz"; + sha256 = "a683b184109cddbc4d66c55ee3efa2c69092a72e2cd9e78903c4dcf7f442c055"; + name = "akonadiconsole-19.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-contacts-19.04.1.tar.xz"; - sha256 = "4c58a73db7924250e47fb030657dc768fe44405806ec2d94ee00a264b414febc"; - name = "akonadi-contacts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-contacts-19.08.0.tar.xz"; + sha256 = "912a657a11d1bd1e680a71b43d69a5a871136ed83f171b11c52f1974d7381ce4"; + name = "akonadi-contacts-19.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-import-wizard-19.04.1.tar.xz"; - sha256 = "2699ca57ea6a04228875dd795255fd32a1120e2e5c4834290aea3270c43403e7"; - name = "akonadi-import-wizard-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-import-wizard-19.08.0.tar.xz"; + sha256 = "e21454b8ac346c4b8d35e5979dc11346b96e3520df22f44270dc668d5abcd915"; + name = "akonadi-import-wizard-19.08.0.tar.xz"; }; }; akonadi-mime = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-mime-19.04.1.tar.xz"; - sha256 = "4572aa7c953cc641a98ae3c2685dcdf259d621dcbbab1ccb7d11e2748c67b1a8"; - name = "akonadi-mime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-mime-19.08.0.tar.xz"; + sha256 = "32dcee53d8bd79a4ad85dfa453aa762d69194493ad6622aea4fd7cd05bde3ec4"; + name = "akonadi-mime-19.08.0.tar.xz"; }; }; akonadi-notes = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-notes-19.04.1.tar.xz"; - sha256 = "e503101e8806485ecf6ef22d1bafd8c299676ca75a388499e5418b8641604277"; - name = "akonadi-notes-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-notes-19.08.0.tar.xz"; + sha256 = "26000875958b3a0ff68c5ad871fd697623c8408b88fc46679c8a13ad308c33d3"; + name = "akonadi-notes-19.08.0.tar.xz"; }; }; akonadi-search = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akonadi-search-19.04.1.tar.xz"; - sha256 = "8438876407e9fd8fa08afe6942ab8dd3677202bc2ff1eba4fd7a49dd926f26d6"; - name = "akonadi-search-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akonadi-search-19.08.0.tar.xz"; + sha256 = "fadc158343eb7c124454ca3e22ade14230772f1d1a89e04a0059c924ed3959d0"; + name = "akonadi-search-19.08.0.tar.xz"; }; }; akregator = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/akregator-19.04.1.tar.xz"; - sha256 = "b2e731a3eac0a68865a90b71f17307c3aea8db304bf6663b551bc95907a490f1"; - name = "akregator-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/akregator-19.08.0.tar.xz"; + sha256 = "d3cb8b97a3d2c9eeb805e1b7fc26cb637ad21589675d837b545580e6be764820"; + name = "akregator-19.08.0.tar.xz"; }; }; analitza = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/analitza-19.04.1.tar.xz"; - sha256 = "b96da492805a48faff72e93e1b8b211c468b041fe217489eb097d554773d3381"; - name = "analitza-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/analitza-19.08.0.tar.xz"; + sha256 = "516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003"; + name = "analitza-19.08.0.tar.xz"; }; }; ark = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ark-19.04.1.tar.xz"; - sha256 = "6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6"; - name = "ark-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ark-19.08.0.tar.xz"; + sha256 = "0685285486ca933e3467f35c3d5d4e8633ae80f1e5529f8a4d8257d0b53d9512"; + name = "ark-19.08.0.tar.xz"; }; }; artikulate = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/artikulate-19.04.1.tar.xz"; - sha256 = "11a54ef7abf001bd3debcaf46bc60764af55a2dbda6320c3c220461374f74432"; - name = "artikulate-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/artikulate-19.08.0.tar.xz"; + sha256 = "40f1ecb2e6d0d2e8bb1c86d64935c9f2411e0e72781e3211ed0014a02acd72ba"; + name = "artikulate-19.08.0.tar.xz"; }; }; audiocd-kio = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/audiocd-kio-19.04.1.tar.xz"; - sha256 = "fad61ea586db7a4ce202fbb16854f69a20e8e16518dd60c27112447a904edb98"; - name = "audiocd-kio-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/audiocd-kio-19.08.0.tar.xz"; + sha256 = "46013e95fa358004083c185d43afe48b96bd18acba1a33e5706f75b128a3e954"; + name = "audiocd-kio-19.08.0.tar.xz"; }; }; baloo-widgets = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/baloo-widgets-19.04.1.tar.xz"; - sha256 = "7f7f0b3ba1bbdb3a47cdfa85830295b4b91fa5ac6c87b41d1cf29c354d8a4cf6"; - name = "baloo-widgets-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/baloo-widgets-19.08.0.tar.xz"; + sha256 = "3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008"; + name = "baloo-widgets-19.08.0.tar.xz"; }; }; blinken = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/blinken-19.04.1.tar.xz"; - sha256 = "87fbf14568692885e7a496a8dae0c4f53a2837d1a824f9c7cf1038a7e8c861ca"; - name = "blinken-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/blinken-19.08.0.tar.xz"; + sha256 = "9b993586d8ddab3821b1b4f805cd8b6603822faca93402d42775bea2eb346971"; + name = "blinken-19.08.0.tar.xz"; }; }; bomber = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/bomber-19.04.1.tar.xz"; - sha256 = "1359ebcaab26acd2dfa738160f9dd7a86e5bfa3d3b2f8a86c656ee187ad6c3fe"; - name = "bomber-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/bomber-19.08.0.tar.xz"; + sha256 = "5274f8ef6cd94fcbd887220d6c7b08c1f71050c601d14cf53d847f41f254e043"; + name = "bomber-19.08.0.tar.xz"; }; }; bovo = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/bovo-19.04.1.tar.xz"; - sha256 = "46b5286349ba7765b81edf92f834c3e8e5c0ecd65466deb5fa593477e76f0763"; - name = "bovo-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/bovo-19.08.0.tar.xz"; + sha256 = "829ecfe3a46bc1c009fea14c5860aa17ea18f36ed33fdc9296c499992aeed466"; + name = "bovo-19.08.0.tar.xz"; }; }; calendarsupport = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/calendarsupport-19.04.1.tar.xz"; - sha256 = "9b44e868a24494c3ce595dc71e8981f97a8ce75dc4646e1417ebde973ee5f535"; - name = "calendarsupport-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/calendarsupport-19.08.0.tar.xz"; + sha256 = "af590cf5443c1205a8bd59d00c430bbdf65a185a36ed36e92e6ef78bba8551e4"; + name = "calendarsupport-19.08.0.tar.xz"; }; }; cantor = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/cantor-19.04.1.tar.xz"; - sha256 = "95ce049f38182f9c0f7fb749c0940c24a51cc88053d218148ac82e925d9dfbb1"; - name = "cantor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/cantor-19.08.0.tar.xz"; + sha256 = "b1d1a735e83ca03d51b79f1fc59612153e94b274d716d65ff3fa94ffdd2f3adc"; + name = "cantor-19.08.0.tar.xz"; }; }; cervisia = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/cervisia-19.04.1.tar.xz"; - sha256 = "fe72361330b055922e4ae66edb2e6958897b7c443ab3066ab7bbef1b8fd9d41b"; - name = "cervisia-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/cervisia-19.08.0.tar.xz"; + sha256 = "a72c3a7bad3b30a466d6793318248329d7ddb1a0e00c832744b628a9eb8b8257"; + name = "cervisia-19.08.0.tar.xz"; }; }; dolphin = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/dolphin-19.04.1.tar.xz"; - sha256 = "72cab4d9f49ac05d3e0e8e1ff67cf29c0cacbe2c3a43506eca4c849ea878370a"; - name = "dolphin-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/dolphin-19.08.0.tar.xz"; + sha256 = "fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0"; + name = "dolphin-19.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/dolphin-plugins-19.04.1.tar.xz"; - sha256 = "dc528e93d3f7809b8480da5134ead3886205a172a85b25ffdd5720ec67892105"; - name = "dolphin-plugins-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/dolphin-plugins-19.08.0.tar.xz"; + sha256 = "f074aa7151f4b4d9202d90257952638652a1bf09d02699762f346d85b61c5f54"; + name = "dolphin-plugins-19.08.0.tar.xz"; }; }; dragon = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/dragon-19.04.1.tar.xz"; - sha256 = "f8acfc09aeec180850345f8881f963c19a3956cd7e07e42463bbe95ff2227ab8"; - name = "dragon-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/dragon-19.08.0.tar.xz"; + sha256 = "3d792f6dfd4a5d8ad7726fa942840ebed2b2bb6f25ec6f68883b83859c21cacc"; + name = "dragon-19.08.0.tar.xz"; }; }; eventviews = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/eventviews-19.04.1.tar.xz"; - sha256 = "1fae8263d17a802393e5b1ece80879b66303f4d5bc8cc040cf142d6d5e8cc763"; - name = "eventviews-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/eventviews-19.08.0.tar.xz"; + sha256 = "2f7713173b3820800d7927aff64eb7bcc84c643d9da43adbe6560cb842081295"; + name = "eventviews-19.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ffmpegthumbs-19.04.1.tar.xz"; - sha256 = "76f912f09c01698ed020bce2109f7cb893a9ca3ca7c014b118c0f97b4b4982ae"; - name = "ffmpegthumbs-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ffmpegthumbs-19.08.0.tar.xz"; + sha256 = "13f5f8b40c0f6146cdd4d1d9e6a7b7dd19cda9650fe08f9731c050e58f11efee"; + name = "ffmpegthumbs-19.08.0.tar.xz"; }; }; filelight = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/filelight-19.04.1.tar.xz"; - sha256 = "7595efbff5cbbe59b3fc4f6af69b9557107bc8661f38951577947503ac7883bd"; - name = "filelight-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/filelight-19.08.0.tar.xz"; + sha256 = "bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6"; + name = "filelight-19.08.0.tar.xz"; }; }; granatier = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/granatier-19.04.1.tar.xz"; - sha256 = "372dd577805457425bb9c35b5f434089aa2bb7c1e6f54908b2be60d4dda2cb22"; - name = "granatier-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/granatier-19.08.0.tar.xz"; + sha256 = "b61bf45df63dc3fb324e1a74ec84ae4f2d58371af88ccd28593b0716673dc00a"; + name = "granatier-19.08.0.tar.xz"; }; }; grantlee-editor = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/grantlee-editor-19.04.1.tar.xz"; - sha256 = "b07f3c3179010b1d9a9170bc6e2b85517c3dfbd277336316882f4503823e076a"; - name = "grantlee-editor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/grantlee-editor-19.08.0.tar.xz"; + sha256 = "00a7d07aeffc35ac6e3dd39434194ba35c855a603cdc6eca0ece5b00ae1e0e30"; + name = "grantlee-editor-19.08.0.tar.xz"; }; }; grantleetheme = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/grantleetheme-19.04.1.tar.xz"; - sha256 = "fdcf77c996123daea0559cc2ac4251b330e2c4388104ee95f814af770fc33d8b"; - name = "grantleetheme-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/grantleetheme-19.08.0.tar.xz"; + sha256 = "c966ad7ef55a784c8cf97a69d4885b9b9d7956c84a4e323404e5cf88154cc543"; + name = "grantleetheme-19.08.0.tar.xz"; }; }; gwenview = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/gwenview-19.04.1.tar.xz"; - sha256 = "636498100284be86194d328c40ed70166cc96a5fc7665090e4a1ca9538b2f13c"; - name = "gwenview-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/gwenview-19.08.0.tar.xz"; + sha256 = "1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3"; + name = "gwenview-19.08.0.tar.xz"; }; }; incidenceeditor = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/incidenceeditor-19.04.1.tar.xz"; - sha256 = "f0f5191e4246068fb941fde10df87b76b5ca1d6f491d864e4b7e4acacebcae58"; - name = "incidenceeditor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/incidenceeditor-19.08.0.tar.xz"; + sha256 = "43915613a5db71847be425bc4434c0e04f5410b3575cea3141ffcd99b2cdb9ea"; + name = "incidenceeditor-19.08.0.tar.xz"; }; }; juk = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/juk-19.04.1.tar.xz"; - sha256 = "f141c0e33eccd931438a1b1fe37810951ab177b3fe853d6dd387f28f59382e51"; - name = "juk-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/juk-19.08.0.tar.xz"; + sha256 = "d2549c709f8934a5306a16e3a1e2b9e057ead54dc85efe17009e7aacd395edd0"; + name = "juk-19.08.0.tar.xz"; }; }; k3b = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/k3b-19.04.1.tar.xz"; - sha256 = "8de611bec14deee5b5c2b340fa4b32d22a7df93a72b657979118b510396f0942"; - name = "k3b-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/k3b-19.08.0.tar.xz"; + sha256 = "6a740724945496395cea1b5850ea9567a9aa9cc8a28c5366c9709b4226dc4b10"; + name = "k3b-19.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kaccounts-integration-19.04.1.tar.xz"; - sha256 = "0e37dc9b7b1520ea16afc7209da3cbaab1d43c3909896eba2f0422fb23f15433"; - name = "kaccounts-integration-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kaccounts-integration-19.08.0.tar.xz"; + sha256 = "b6602a1270037c8c9dc366e3bf6ddf6d7dcd14ca66623e3ecc6641fd474c0d2a"; + name = "kaccounts-integration-19.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kaccounts-providers-19.04.1.tar.xz"; - sha256 = "006ccdc20738b8f77155e849b83987b9c9eeb50acf4e88d2fb948060c5f51011"; - name = "kaccounts-providers-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kaccounts-providers-19.08.0.tar.xz"; + sha256 = "9fc235e2140e76e4b95589a8a5b1e98f7aac00f4c9ad8ba774be0d0d360df8c3"; + name = "kaccounts-providers-19.08.0.tar.xz"; }; }; kaddressbook = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kaddressbook-19.04.1.tar.xz"; - sha256 = "15e84e6785e20e4f48020c093555e6c28930fcd946aa3421c56956564eba84fd"; - name = "kaddressbook-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kaddressbook-19.08.0.tar.xz"; + sha256 = "9639047be5c5ea245844831e315fa0f0baca40d243f611a98bbab3503af127cf"; + name = "kaddressbook-19.08.0.tar.xz"; }; }; kajongg = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kajongg-19.04.1.tar.xz"; - sha256 = "5139ec428d4951b8e3dca8d30134002bc06b186c5c63c69831b3a98b49198475"; - name = "kajongg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kajongg-19.08.0.tar.xz"; + sha256 = "0f522477939de09d4d56d2947fb02b0f20ca0cbac4d21326a9477e11fc173244"; + name = "kajongg-19.08.0.tar.xz"; }; }; kalarm = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalarm-19.04.1.tar.xz"; - sha256 = "e8a58584e765c1d98beb4b6bcac0ab835dcb1f1c1bab8cf1c01fa01a2a56bbfd"; - name = "kalarm-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalarm-19.08.0.tar.xz"; + sha256 = "e0ddabb2abfc2d593ec88864179c30eda219f7db4c25b7fc9951ac3b388eee84"; + name = "kalarm-19.08.0.tar.xz"; }; }; kalarmcal = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalarmcal-19.04.1.tar.xz"; - sha256 = "69a265ad7e82034974a47c795b81ee8768873dcb76018dc794a9905365111646"; - name = "kalarmcal-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalarmcal-19.08.0.tar.xz"; + sha256 = "5f764d58716e7d271fac4cb3a4df6ab157014533782c47c38bacab59ca669419"; + name = "kalarmcal-19.08.0.tar.xz"; }; }; kalgebra = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalgebra-19.04.1.tar.xz"; - sha256 = "689d65f1a62623fc67d5de0a551aef03b241d85b105f31e91bd873d3b818c74f"; - name = "kalgebra-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalgebra-19.08.0.tar.xz"; + sha256 = "b875b2bfe985e5c595f60fbb146fb4545c34321bb86f7fc04164a23f0bb3e9eb"; + name = "kalgebra-19.08.0.tar.xz"; }; }; kalzium = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kalzium-19.04.1.tar.xz"; - sha256 = "80798b3dca98cdd5ae24bbe7f077ecbe8def6bb96ad02a66ff69cb5312a459f5"; - name = "kalzium-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kalzium-19.08.0.tar.xz"; + sha256 = "0dac199871b8d01890b8959cd5c4776eb2f938f7fb4a558b23364f9dd8e15111"; + name = "kalzium-19.08.0.tar.xz"; }; }; kamera = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kamera-19.04.1.tar.xz"; - sha256 = "3d5f97ac4b454c1512762f4039003d5745372aafa4fda4f293bda885ee70984f"; - name = "kamera-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kamera-19.08.0.tar.xz"; + sha256 = "f287f1db119946d2e62d4ccd52a66671343042563cc87da246f2692fa1b775c6"; + name = "kamera-19.08.0.tar.xz"; }; }; kamoso = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kamoso-19.04.1.tar.xz"; - sha256 = "72f31d26319aed86daf200db7cc0bbe1e6ad77d891b644001ffd4c992a68e796"; - name = "kamoso-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kamoso-19.08.0.tar.xz"; + sha256 = "2aa8765f71109e813836dced26994a953973ef6f4d517ab224691f2342d64129"; + name = "kamoso-19.08.0.tar.xz"; }; }; kanagram = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kanagram-19.04.1.tar.xz"; - sha256 = "70b0f7b20f2ebd951e3a10097990f9232cd1e3e6c11441d93513d435a7cb7f38"; - name = "kanagram-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kanagram-19.08.0.tar.xz"; + sha256 = "4f4ccf9cf48711d8fe9a5966294ba16b43092b8df3fdb03b5c236d22157d275c"; + name = "kanagram-19.08.0.tar.xz"; }; }; kapman = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kapman-19.04.1.tar.xz"; - sha256 = "7714a0cbd8e24f3ce46679d1f16d690c8bc62a988f0b3175095e0f0c23ce1400"; - name = "kapman-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kapman-19.08.0.tar.xz"; + sha256 = "e0e53e60e7af1f0002343969b2ce0ce47e0cd3d7318b44d2827478291c2a9cd4"; + name = "kapman-19.08.0.tar.xz"; }; }; kapptemplate = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kapptemplate-19.04.1.tar.xz"; - sha256 = "5985705081aa94d282d173277e5717eede6f923eef4ed2d99182c46fbd1c9fd3"; - name = "kapptemplate-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kapptemplate-19.08.0.tar.xz"; + sha256 = "a25170f3527e85bea9509fe5cb991544c0a1dab8f7025c71fd5b0d4c82d9e169"; + name = "kapptemplate-19.08.0.tar.xz"; }; }; kate = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kate-19.04.1.tar.xz"; - sha256 = "af55513f00af1712a39631352e393dbd2f63ec6bd471831b44853a16d4bfbe8f"; - name = "kate-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kate-19.08.0.tar.xz"; + sha256 = "6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878"; + name = "kate-19.08.0.tar.xz"; }; }; katomic = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/katomic-19.04.1.tar.xz"; - sha256 = "2addfb86ec0043ab81046d64862e8fbeb3b4dd3b8d18f618ac8c39d995a05ce5"; - name = "katomic-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/katomic-19.08.0.tar.xz"; + sha256 = "12b2a0e703312159a8a217ddb5e19c9a9bea1825d668dd4377fe8e52101f3c90"; + name = "katomic-19.08.0.tar.xz"; }; }; kbackup = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbackup-19.04.1.tar.xz"; - sha256 = "29bed4258ec218edf05702808d0cfbff757016b7f3a80eb99e18610ab398036f"; - name = "kbackup-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbackup-19.08.0.tar.xz"; + sha256 = "2cd447ef7d53e7ee55868086e7a894f550fd81515cf5d87d0561520f45145127"; + name = "kbackup-19.08.0.tar.xz"; }; }; kblackbox = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kblackbox-19.04.1.tar.xz"; - sha256 = "9b5d57d0058c2458b7e24bd885d164cc1523d0c45827082e55af6ce669992431"; - name = "kblackbox-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kblackbox-19.08.0.tar.xz"; + sha256 = "44907aed2a2a24f57cb5ae0046a857645788d8d7aeb9383187b516c9f519a72c"; + name = "kblackbox-19.08.0.tar.xz"; }; }; kblocks = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kblocks-19.04.1.tar.xz"; - sha256 = "0ae62f1aa9aeaa58f6e5fd62d6281159ef8a2bbee28d84b9d7a2ab207ec95390"; - name = "kblocks-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kblocks-19.08.0.tar.xz"; + sha256 = "3337c6fb57fdb8439e6e6edc0186fec76641196714daa955465e009923573b84"; + name = "kblocks-19.08.0.tar.xz"; }; }; kblog = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kblog-19.04.1.tar.xz"; - sha256 = "6c162cd25a67c4fddbdc1063942fdfad1bbb239c714f205ae4f89585c2f65e93"; - name = "kblog-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kblog-19.08.0.tar.xz"; + sha256 = "15abd5dfd0499633703273823ceddc8e64b52b0217b04bea3d86cb9ac54da189"; + name = "kblog-19.08.0.tar.xz"; }; }; kbounce = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbounce-19.04.1.tar.xz"; - sha256 = "729662f29e1b5b17b775bfa6895088cf3a7ee4ce3d4f2bc3db4f69ab0f07ca12"; - name = "kbounce-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbounce-19.08.0.tar.xz"; + sha256 = "3df779542c1d74d63e66a4db86210d75e37939f8f29947851b9c76c347856025"; + name = "kbounce-19.08.0.tar.xz"; }; }; kbreakout = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbreakout-19.04.1.tar.xz"; - sha256 = "9f40bb1c2d2e29a1098e371ffd0e97595d8e23cc7af2111fd143b67fac1393ad"; - name = "kbreakout-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbreakout-19.08.0.tar.xz"; + sha256 = "87748c5bda9b7563531e0b0701ec4a745cd95121b9bd426448e5ed476292fdd4"; + name = "kbreakout-19.08.0.tar.xz"; }; }; kbruch = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kbruch-19.04.1.tar.xz"; - sha256 = "ab9033b6b8758803a87f046d05c9f6a5d247d1929bad147628cb6c2e5ba65b00"; - name = "kbruch-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kbruch-19.08.0.tar.xz"; + sha256 = "29c83039af494703e9d665eca2acde30bb4b94666b3dfe9092833e35f83a9541"; + name = "kbruch-19.08.0.tar.xz"; }; }; kcachegrind = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcachegrind-19.04.1.tar.xz"; - sha256 = "4b862becaa415601dc33391814637d8f089f2e2732192111ec029beb89991ac2"; - name = "kcachegrind-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcachegrind-19.08.0.tar.xz"; + sha256 = "676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b"; + name = "kcachegrind-19.08.0.tar.xz"; }; }; kcalc = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcalc-19.04.1.tar.xz"; - sha256 = "46d992a9e746231b57398b9bcdbe3933f6601e3cee7e3932ccc2e312779a4c91"; - name = "kcalc-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcalc-19.08.0.tar.xz"; + sha256 = "58c26a9698bfc9e0d3a5614ab26c53878e87fc601688ad6c5848fbdbc21c4103"; + name = "kcalc-19.08.0.tar.xz"; }; }; kcalcore = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcalcore-19.04.1.tar.xz"; - sha256 = "d14bf2f8270c0072e415cf8fe87c0fb8eefad1b95a8713e184bba3e3ae6002f9"; - name = "kcalcore-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcalcore-19.08.0.tar.xz"; + sha256 = "7c7bbca70ada8c8317d6d3d91e0357b2b5886328189423e0b7fac1d326f8ed85"; + name = "kcalcore-19.08.0.tar.xz"; }; }; kcalutils = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcalutils-19.04.1.tar.xz"; - sha256 = "8856a1e812f81848f1e2adc179182349acfac9e189b55f29afeb020c148909ec"; - name = "kcalutils-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcalutils-19.08.0.tar.xz"; + sha256 = "ce0cb6633d7f85fdfa54085710c421f0465b286e9236f55c0297737abdfbaf7e"; + name = "kcalutils-19.08.0.tar.xz"; }; }; kcharselect = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcharselect-19.04.1.tar.xz"; - sha256 = "c54570a6f968b2ccbe42c0a8dbaecb1f263fbd392f67b2d735ade492553ff9ec"; - name = "kcharselect-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcharselect-19.08.0.tar.xz"; + sha256 = "31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020"; + name = "kcharselect-19.08.0.tar.xz"; }; }; kcolorchooser = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcolorchooser-19.04.1.tar.xz"; - sha256 = "bfc2cdafd709d8829e19367151f59725152af2f4a80c583df671a9df1378e57a"; - name = "kcolorchooser-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcolorchooser-19.08.0.tar.xz"; + sha256 = "bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb"; + name = "kcolorchooser-19.08.0.tar.xz"; }; }; kcontacts = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcontacts-19.04.1.tar.xz"; - sha256 = "1773a5ddcec46dbf72cef2bbcc8c3143a0ba18ce6fa462ba642011b36b9cc088"; - name = "kcontacts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcontacts-19.08.0.tar.xz"; + sha256 = "b245832fe6150a915d3bcbf1ec4c2c37b6aab541b2568f4955dcd76afa1c486e"; + name = "kcontacts-19.08.0.tar.xz"; }; }; kcron = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kcron-19.04.1.tar.xz"; - sha256 = "a58e8c99072e10a0b0a6acfecbbadef822c6f2818202bbaccdbee6b2a5b7e951"; - name = "kcron-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kcron-19.08.0.tar.xz"; + sha256 = "1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c"; + name = "kcron-19.08.0.tar.xz"; }; }; kdav = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdav-19.04.1.tar.xz"; - sha256 = "356e59f904f075521df60499b7f84d7868dbb78968b04fd15be6d359c154e737"; - name = "kdav-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdav-19.08.0.tar.xz"; + sha256 = "8bfd0657c0eaa74068c7601208baacb9d11bc6574cd353d4d346473c6c43b6f6"; + name = "kdav-19.08.0.tar.xz"; }; }; kdebugsettings = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdebugsettings-19.04.1.tar.xz"; - sha256 = "f04334f954d48fbd5a7bf41327563081966fb31950c131a943cf0a1a86281aa2"; - name = "kdebugsettings-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdebugsettings-19.08.0.tar.xz"; + sha256 = "b47987cabffe464c21c96b31991643efafc24f77d31b768ed9dff075567aa361"; + name = "kdebugsettings-19.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kde-dev-scripts-19.04.1.tar.xz"; - sha256 = "aa039d08b0e151703b6be0571d254d3656589d0b8422214110c460bd1f2aa6c2"; - name = "kde-dev-scripts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kde-dev-scripts-19.08.0.tar.xz"; + sha256 = "8028d1f5390f608974235123a7c14342fb0c247456e6088d4f16797875efdf18"; + name = "kde-dev-scripts-19.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kde-dev-utils-19.04.1.tar.xz"; - sha256 = "9bca818e44f80ece758c0430aebcaf56252bbdffed6c8f65d04ccb4d019f2d9b"; - name = "kde-dev-utils-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kde-dev-utils-19.08.0.tar.xz"; + sha256 = "fc95211b92fa76e53558111d5cd64227f194df15fb13f2d81c809facd796f2c5"; + name = "kde-dev-utils-19.08.0.tar.xz"; }; }; kdeedu-data = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdeedu-data-19.04.1.tar.xz"; - sha256 = "751ec4df18d4ec3e7498a279bb891d6eb9a835fd786c8dd77ee883c9b55a0c30"; - name = "kdeedu-data-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdeedu-data-19.08.0.tar.xz"; + sha256 = "658063227b9d4d7e4e238038ffa9c76e5c5f3015c923967477f514b063940eb0"; + name = "kdeedu-data-19.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-mobipocket-19.04.1.tar.xz"; - sha256 = "345be42b0fb4f2040ce1430c872c0d20b0abaa266159a19beac1b067b2723821"; - name = "kdegraphics-mobipocket-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-mobipocket-19.08.0.tar.xz"; + sha256 = "28c6566f32855a43d10829070cc47d0f4c879ca89eb3228ea6274d0f32fa90fe"; + name = "kdegraphics-mobipocket-19.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-thumbnailers-19.04.1.tar.xz"; - sha256 = "e82515177c1c465c1d499095ff51d71caf286505a0fd3b9bfd2f1cdc1744706e"; - name = "kdegraphics-thumbnailers-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdegraphics-thumbnailers-19.08.0.tar.xz"; + sha256 = "127a99fffdaee3772b03a6c197357311ec56047caccce967f0d74b5489722ddf"; + name = "kdegraphics-thumbnailers-19.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdenetwork-filesharing-19.04.1.tar.xz"; - sha256 = "5f3ae681f58a9877c7133778ff44c7be2a96cf26afbff10465984dae033251bd"; - name = "kdenetwork-filesharing-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdenetwork-filesharing-19.08.0.tar.xz"; + sha256 = "a7e2e7d79c7e6486e2d2efe8f85e2be2f6231ca5e4e49e2bd332befb9d6d4288"; + name = "kdenetwork-filesharing-19.08.0.tar.xz"; }; }; kdenlive = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdenlive-19.04.1.tar.xz"; - sha256 = "feb3202ee1aa0f47acc12ad7d6ca78977a4c9af0d705f8792ca2f8e3e6defbe5"; - name = "kdenlive-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdenlive-19.08.0.tar.xz"; + sha256 = "01b60bf58f6818a5ca9aa6e7a79111965700e6948da0bc0edd1184c26fd872e4"; + name = "kdenlive-19.08.0.tar.xz"; }; }; kdepim-addons = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdepim-addons-19.04.1.tar.xz"; - sha256 = "d4e36a6d0043ad0ed5e3c427559bfaa29523578f99b613c82c3aaef16b2a7882"; - name = "kdepim-addons-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdepim-addons-19.08.0.tar.xz"; + sha256 = "8eb692f9dcb86fec2ec207f719c774492df222fceab2ccc2bdf530cb57aa1c3e"; + name = "kdepim-addons-19.08.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdepim-apps-libs-19.04.1.tar.xz"; - sha256 = "c3530a810a1eddfa06a27f24b723f971e7e2e144bbb2dac7ff30e7dec948a15d"; - name = "kdepim-apps-libs-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdepim-apps-libs-19.08.0.tar.xz"; + sha256 = "2a19e9b0c3b6b2fecaeb4054bf101170056b8c9e831e45fb796b59666f103f2e"; + name = "kdepim-apps-libs-19.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdepim-runtime-19.04.1.tar.xz"; - sha256 = "1587eca5a206768917443bd5274c03d8cbb2cbc6dcbe60449110c326b1aa0744"; - name = "kdepim-runtime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdepim-runtime-19.08.0.tar.xz"; + sha256 = "634419978329902a1877810d87d4ddae8cb07adbabbfa4540b521689d8bc85ef"; + name = "kdepim-runtime-19.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdesdk-kioslaves-19.04.1.tar.xz"; - sha256 = "80bbbdc91bc6a2b0c47a47044fdb2e107b89c63dd358b694c1c3f8e7cd1bbb16"; - name = "kdesdk-kioslaves-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdesdk-kioslaves-19.08.0.tar.xz"; + sha256 = "cb49f23038d6841ea3a08f840328372aaee53dd915ab5a923753a4a899199ae0"; + name = "kdesdk-kioslaves-19.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdesdk-thumbnailers-19.04.1.tar.xz"; - sha256 = "554d291605ac8827a2a4f6513a2230d9f9b0b8fcd6a37b0acd41c4db81fa3442"; - name = "kdesdk-thumbnailers-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdesdk-thumbnailers-19.08.0.tar.xz"; + sha256 = "e640f1a484482f6dd4ba4ebda92832a027a20e64e1e12d2306bd7dd618b36356"; + name = "kdesdk-thumbnailers-19.08.0.tar.xz"; }; }; kdf = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdf-19.04.1.tar.xz"; - sha256 = "835881e8f829c3c64ca529019f599ce89b95139d502673d5e6fb560a98eedce5"; - name = "kdf-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdf-19.08.0.tar.xz"; + sha256 = "e6effd6aaf08c9bfa649b194313e7719b65a9d53f00570e14d2752ce68d13bfe"; + name = "kdf-19.08.0.tar.xz"; }; }; kdialog = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdialog-19.04.1.tar.xz"; - sha256 = "48e77dc4827af2445f8ac583bef319b7fd274f9b84a19635bf673801e96b259a"; - name = "kdialog-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdialog-19.08.0.tar.xz"; + sha256 = "dc60f9ea0c59435b0da37f4bc50716d43ebfb9b9d0b05955c96393e6d06ea687"; + name = "kdialog-19.08.0.tar.xz"; }; }; kdiamond = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kdiamond-19.04.1.tar.xz"; - sha256 = "a7588f21e7151c1053787f75a17c1062a9c0b43611b824632ed1b8689f4996f3"; - name = "kdiamond-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kdiamond-19.08.0.tar.xz"; + sha256 = "f37d526610fa0579d5be9de19325ed82e14763c997d9ea026dfcf1068bf2428a"; + name = "kdiamond-19.08.0.tar.xz"; }; }; keditbookmarks = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/keditbookmarks-19.04.1.tar.xz"; - sha256 = "05788d55020f330b52bd8641e47990c90c7585871489993888ce0f40fa1686db"; - name = "keditbookmarks-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/keditbookmarks-19.08.0.tar.xz"; + sha256 = "98c539e63a0e2bb62680003022d9ea5aececc4aa1c2d19a7b4c4aa3d8999e7ac"; + name = "keditbookmarks-19.08.0.tar.xz"; }; }; kfind = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kfind-19.04.1.tar.xz"; - sha256 = "496dd642473bfaa881387d2fb3a3507a9bf8c84b8a6874525221b561a50ef9fd"; - name = "kfind-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kfind-19.08.0.tar.xz"; + sha256 = "25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff"; + name = "kfind-19.08.0.tar.xz"; }; }; kfloppy = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kfloppy-19.04.1.tar.xz"; - sha256 = "bde5c16c679a34aa6c74844caeea5e1746629ac7d35dfac0493e9d8f7d78aa75"; - name = "kfloppy-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kfloppy-19.08.0.tar.xz"; + sha256 = "312345286fa1dba2cac782523d95c1e4ed0d7ef272c93c5d7bf2f9d8f635fa82"; + name = "kfloppy-19.08.0.tar.xz"; }; }; kfourinline = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kfourinline-19.04.1.tar.xz"; - sha256 = "9ba39703ccf64b76a0b9a2705d65b7c6c2067db795cfed298f0e3a2eac48b973"; - name = "kfourinline-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kfourinline-19.08.0.tar.xz"; + sha256 = "f84ad6a3e0b2ecbb8c8ab7f451e9534f47627d9d90ff21f188df23dfd23ce22e"; + name = "kfourinline-19.08.0.tar.xz"; }; }; kgeography = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kgeography-19.04.1.tar.xz"; - sha256 = "44e7297243a2f5ebd6c8e18e3380b7c66b3d085f64952937abf1683ddcb9d502"; - name = "kgeography-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kgeography-19.08.0.tar.xz"; + sha256 = "83eb429851360d848e3e028ef2748a9d66470b8f3dc3bf66fbbfd08b534a7a75"; + name = "kgeography-19.08.0.tar.xz"; }; }; kget = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kget-19.04.1.tar.xz"; - sha256 = "a7dff0134d0ce6643fbde1ddfb73ce7d3300b927373a0907aec510f29d0d1629"; - name = "kget-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kget-19.08.0.tar.xz"; + sha256 = "4db589499c8e5fc3cbb5e398054b1292f68fa23ad1798f2bb2065ba56723d06b"; + name = "kget-19.08.0.tar.xz"; }; }; kgoldrunner = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kgoldrunner-19.04.1.tar.xz"; - sha256 = "11db3aecf77b7097b7d3d626dba4a3b4bcd3d5ab02a1e04cf7f6932b0b73a760"; - name = "kgoldrunner-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kgoldrunner-19.08.0.tar.xz"; + sha256 = "db203add309e10902a0e2b770929bf002b22ab78668ea432ecbf4497dfdc06b6"; + name = "kgoldrunner-19.08.0.tar.xz"; }; }; kgpg = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kgpg-19.04.1.tar.xz"; - sha256 = "2c9c64491592db79397be3769413fae657ca991dd45d02690bbe533c1cba0ceb"; - name = "kgpg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kgpg-19.08.0.tar.xz"; + sha256 = "3aa31f524c7f8ab50a86d83066590b98cd4ffbeb94b5a6fb7dadec9fe3072845"; + name = "kgpg-19.08.0.tar.xz"; }; }; khangman = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/khangman-19.04.1.tar.xz"; - sha256 = "5d35620bc048ecabd21b20cadfa8df07e72f195bdc5b9ad2c7e86e17d27afe27"; - name = "khangman-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/khangman-19.08.0.tar.xz"; + sha256 = "ff14cefbd78f047b6250ec3cf4d11e13484f30cc5610616c0a9270008b36f1a1"; + name = "khangman-19.08.0.tar.xz"; }; }; khelpcenter = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/khelpcenter-19.04.1.tar.xz"; - sha256 = "3436502f6fae659b930aa63e5ace088e0982804386cf1b24b042328796549114"; - name = "khelpcenter-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/khelpcenter-19.08.0.tar.xz"; + sha256 = "36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f"; + name = "khelpcenter-19.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kidentitymanagement-19.04.1.tar.xz"; - sha256 = "5216d26aef0c483f3dff51564e8b1526821b25279d7c5e9c21c87a5d5e20822a"; - name = "kidentitymanagement-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kidentitymanagement-19.08.0.tar.xz"; + sha256 = "9fe5c473af0d042b482f1d1dac499c1d8227b60a79f1b5678043f0f49f19013d"; + name = "kidentitymanagement-19.08.0.tar.xz"; }; }; kig = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kig-19.04.1.tar.xz"; - sha256 = "37684e2d1893c2f3a412add1edd73047d3ae8ff501b035943a9793b94d468a79"; - name = "kig-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kig-19.08.0.tar.xz"; + sha256 = "ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee"; + name = "kig-19.08.0.tar.xz"; }; }; kigo = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kigo-19.04.1.tar.xz"; - sha256 = "5b5cae565a79309dc23b26acf2f596d36fd62950af58405094e4fa9a38e5e4ad"; - name = "kigo-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kigo-19.08.0.tar.xz"; + sha256 = "0100195b3289b88b9813e453fc7ec6229a648718a6525bb3e6d0e0c0ead97595"; + name = "kigo-19.08.0.tar.xz"; }; }; killbots = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/killbots-19.04.1.tar.xz"; - sha256 = "8829dba8a3af320b03e21cd356e53fef0e70c10831ffeb6a70b722dde9877938"; - name = "killbots-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/killbots-19.08.0.tar.xz"; + sha256 = "909ce7808251a5d0537e2d35fae944b932973c36035f1c08f3143227e2d5cf4f"; + name = "killbots-19.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kimagemapeditor-19.04.1.tar.xz"; - sha256 = "d85d2f3d043a29e56f4234ce24dd75545e06c2812d5fe45cafde4c3dbe280533"; - name = "kimagemapeditor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kimagemapeditor-19.08.0.tar.xz"; + sha256 = "e2c0b75b65176a9ccbdccbae57be90ee8084593a64bee10b133787077affbde9"; + name = "kimagemapeditor-19.08.0.tar.xz"; }; }; kimap = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kimap-19.04.1.tar.xz"; - sha256 = "ff933fba7ce8412fd64439e5f4c5a7be3a06fd39c79f520acfc648923819aa1f"; - name = "kimap-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kimap-19.08.0.tar.xz"; + sha256 = "d9e3af3e1bb03d929a08287b1a29540915d25dbb6a38d152560302c93e4c5060"; + name = "kimap-19.08.0.tar.xz"; }; }; kio-extras = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kio-extras-19.04.1.tar.xz"; - sha256 = "ddf389a50142211566124ba902bb9f6b2988b1b94fefed7620a6ec421e3ff0bd"; - name = "kio-extras-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kio-extras-19.08.0.tar.xz"; + sha256 = "792a6a6d1ea2457dda10aedc6cefd3518064c8f47c62f9c3c4a508442b83d3cd"; + name = "kio-extras-19.08.0.tar.xz"; + }; + }; + kipi-plugins = { + version = "19.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/19.08.0/src/kipi-plugins-19.08.0.tar.xz"; + sha256 = "21fb6b997aeeeb462fd83ff90a36597b5c74b5711a837959f1e6cdc9a300c4e9"; + name = "kipi-plugins-19.08.0.tar.xz"; }; }; kirigami-gallery = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kirigami-gallery-19.04.1.tar.xz"; - sha256 = "ed7390a015a77f8285b4db4185533fa327a142a191c27afa7c2ce963ae6ad7e2"; - name = "kirigami-gallery-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kirigami-gallery-19.08.0.tar.xz"; + sha256 = "e32f596c188911336060838c071f7856aba02438b335f107bf057644948cf9d6"; + name = "kirigami-gallery-19.08.0.tar.xz"; }; }; kiriki = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kiriki-19.04.1.tar.xz"; - sha256 = "131c6b5bd8f2b014a28bd5cb9985111f63991974b672dcfbc0266d32f069954b"; - name = "kiriki-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kiriki-19.08.0.tar.xz"; + sha256 = "42f69734c0268f4c3c4ed0b915318d9570d599c6a0fd8a2a02597f1e31cd50d7"; + name = "kiriki-19.08.0.tar.xz"; }; }; kiten = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kiten-19.04.1.tar.xz"; - sha256 = "be904abd0386a9ac6d622178f37e55d5a05f5eaa31c6a5cd661959ee4b03d2d4"; - name = "kiten-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kiten-19.08.0.tar.xz"; + sha256 = "891ccf6c610099c63045aedccee4d1ac87c5189066fd2763e0743a40b2538b53"; + name = "kiten-19.08.0.tar.xz"; }; }; kitinerary = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kitinerary-19.04.1.tar.xz"; - sha256 = "4053e16e847f0e234ffba2bb0533e947eae7b315304677a784279d03f13c0318"; - name = "kitinerary-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kitinerary-19.08.0.tar.xz"; + sha256 = "76db853705b87015a934334985c216d11b48e853a3dd31429abb3bc6bd7f52e6"; + name = "kitinerary-19.08.0.tar.xz"; }; }; kjumpingcube = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kjumpingcube-19.04.1.tar.xz"; - sha256 = "13d6a138e09c9088ce38fe9a124bd600386dc097b929f6f85416bc1da0012ab1"; - name = "kjumpingcube-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kjumpingcube-19.08.0.tar.xz"; + sha256 = "d72c1164777f27b7711a0b74575ba38a9e34fca45c22915e10e7e792f7c00b33"; + name = "kjumpingcube-19.08.0.tar.xz"; }; }; kldap = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kldap-19.04.1.tar.xz"; - sha256 = "638e62d39fbe935b1df3c03f9617acbe5ade4ad617245bc590ca07b7fd0b723b"; - name = "kldap-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kldap-19.08.0.tar.xz"; + sha256 = "4bee7b041aff8e1a76330bde12ab9368176181136be1136c4b0c0b733eb9bc16"; + name = "kldap-19.08.0.tar.xz"; }; }; kleopatra = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kleopatra-19.04.1.tar.xz"; - sha256 = "bc8895a506164df0fa0f7fc317fe8b961cb75d8c67f04474e1c12e25be358c67"; - name = "kleopatra-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kleopatra-19.08.0.tar.xz"; + sha256 = "161e6f7cf39aadfc856446642bf4c95c97b21647ba90698b17ab557e9c9e70ef"; + name = "kleopatra-19.08.0.tar.xz"; }; }; klettres = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/klettres-19.04.1.tar.xz"; - sha256 = "d0db0773513fa35d1224e90cf5b09ac75b7b8f559d1080ee6026ba74df0f0847"; - name = "klettres-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/klettres-19.08.0.tar.xz"; + sha256 = "0a680ff0c2c3868a2478da0e2a5eb8db8579e5ba9165743c8a2c20704c062be4"; + name = "klettres-19.08.0.tar.xz"; }; }; klickety = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/klickety-19.04.1.tar.xz"; - sha256 = "d4ae4d002f008200a6ce920f2aff6841d9ad58b22c392d7eefac7867b32340af"; - name = "klickety-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/klickety-19.08.0.tar.xz"; + sha256 = "aad8c7b9e4c07ca8bd64beae71330e51d45dcaa9929a9ce56b7c675fc9e583f0"; + name = "klickety-19.08.0.tar.xz"; }; }; klines = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/klines-19.04.1.tar.xz"; - sha256 = "2ca4ad74fefa87bbf3a38ea90b55025ab8554bfdc47d7e4323e0906e9e1c8962"; - name = "klines-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/klines-19.08.0.tar.xz"; + sha256 = "c49ff3c4bb1612d5699c4a3b0613c6599cf23c0baa79806b8616dbea757d48f8"; + name = "klines-19.08.0.tar.xz"; }; }; kmag = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmag-19.04.1.tar.xz"; - sha256 = "aa5ec91dcffc1a2f1037332aeacb096ab55388624c844c7fa311ca38a5e40874"; - name = "kmag-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmag-19.08.0.tar.xz"; + sha256 = "7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4"; + name = "kmag-19.08.0.tar.xz"; }; }; kmahjongg = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmahjongg-19.04.1.tar.xz"; - sha256 = "75dbcfb5747530a3b69574fdc87b532067516415f962e7943feef97549237c99"; - name = "kmahjongg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmahjongg-19.08.0.tar.xz"; + sha256 = "f601963d0670639a11c4100ed1f53a0e308f79ddf98e1b4fc6a0a4674e117f22"; + name = "kmahjongg-19.08.0.tar.xz"; }; }; kmail = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmail-19.04.1.tar.xz"; - sha256 = "62fcd78318d35848e5ae461f7ebd3b6f202c57c51008c71d7e2a1d1c3d58f2c5"; - name = "kmail-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmail-19.08.0.tar.xz"; + sha256 = "052d5b0da402024646673f5e57785b509c328bd5f5ac064f742f9c63e75f3b28"; + name = "kmail-19.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmail-account-wizard-19.04.1.tar.xz"; - sha256 = "c6714c425daa3d79dfb47b5d18cff26b10b1b087e4472f627738494f06d04ab8"; - name = "kmail-account-wizard-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmail-account-wizard-19.08.0.tar.xz"; + sha256 = "5eddd4029047b3c37146c49e043d17c1f9086bc738726d5da2756cbe9ad28622"; + name = "kmail-account-wizard-19.08.0.tar.xz"; }; }; kmailtransport = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmailtransport-19.04.1.tar.xz"; - sha256 = "b8c0cf5cb8f7ad93bb3d1b2adab68fbc2470bc14160650fb45d1c4d40e8549fa"; - name = "kmailtransport-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmailtransport-19.08.0.tar.xz"; + sha256 = "cc5f865f2059e8fd8d45d1597d8483bbfe0b743e472d91dd4e7cc3837c3fa2dd"; + name = "kmailtransport-19.08.0.tar.xz"; }; }; kmbox = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmbox-19.04.1.tar.xz"; - sha256 = "701eda3a4831ed0daf9bd14a93ff845f42e4f93c6ca16d83ebda958c27021fc0"; - name = "kmbox-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmbox-19.08.0.tar.xz"; + sha256 = "6600033298b0d5ff84705dc66fa529156cb08aeda7503ba7890581b618f83228"; + name = "kmbox-19.08.0.tar.xz"; }; }; kmime = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmime-19.04.1.tar.xz"; - sha256 = "25ee2e49ea62d32fcd09a710f971c6fcdc5434c6fdf711e93c19fc4baa325775"; - name = "kmime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmime-19.08.0.tar.xz"; + sha256 = "1422e6235659b66b3ee5e91cdd732d8c3738d42f81435e69f3cbb18f04a0be75"; + name = "kmime-19.08.0.tar.xz"; }; }; kmines = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmines-19.04.1.tar.xz"; - sha256 = "98a3860113a51e215a42791e3eb845978cda51fb5001b8e8bb41fe9182765d12"; - name = "kmines-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmines-19.08.0.tar.xz"; + sha256 = "290efbc208d2fa6ad5552fe8c0679fd0669f4abf6dc31fafd267bd9444add981"; + name = "kmines-19.08.0.tar.xz"; }; }; kmix = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmix-19.04.1.tar.xz"; - sha256 = "ca02ed8db5e4a3a58622b10668efb4c4a828de584b9f57116fee802e136352ea"; - name = "kmix-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmix-19.08.0.tar.xz"; + sha256 = "3d9cf6dcb35ded0091d16f5e9f4cb384ae21ea4065547b52d5f13f199d3d7b08"; + name = "kmix-19.08.0.tar.xz"; }; }; kmousetool = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmousetool-19.04.1.tar.xz"; - sha256 = "fd0fcebda4d7303a9c6f1117c08e091d96bfddf92a64e1cde2dc6b555daa0624"; - name = "kmousetool-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmousetool-19.08.0.tar.xz"; + sha256 = "3b2f5a4fcc3231c249923431059285e3f8371f7c8d53fcaea76dec3945a13b09"; + name = "kmousetool-19.08.0.tar.xz"; }; }; kmouth = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmouth-19.04.1.tar.xz"; - sha256 = "9a8d0f9b1f09f1363d38b2a942ffe515521ffc410f869ed1a875ff1059ef8068"; - name = "kmouth-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmouth-19.08.0.tar.xz"; + sha256 = "608479db4b2a98ecd17bdc1b1ef20203f492647b43311e903fb10338a59e0098"; + name = "kmouth-19.08.0.tar.xz"; }; }; kmplot = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kmplot-19.04.1.tar.xz"; - sha256 = "c2e0855182d1ab0977b96669999976fb84c2f4b2645fcee0cb35b839bc1da206"; - name = "kmplot-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kmplot-19.08.0.tar.xz"; + sha256 = "66384c96ba1e82b32427a873f944d5efa915bb2bf7d9ee886c94f368bd1f5e94"; + name = "kmplot-19.08.0.tar.xz"; }; }; knavalbattle = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knavalbattle-19.04.1.tar.xz"; - sha256 = "f7b5ad956e4b1c06b04fec2d6f39331e81f2c44c716c2e666ef75b9d786982bc"; - name = "knavalbattle-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knavalbattle-19.08.0.tar.xz"; + sha256 = "7fbf132662e12f785390dbef7086dad5372ebaea8f8c3f55c24fe37bf17df35e"; + name = "knavalbattle-19.08.0.tar.xz"; }; }; knetwalk = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knetwalk-19.04.1.tar.xz"; - sha256 = "e762415b6891c4098febc090bc80e5698cd3fb9ac2b8f4988aaf096816e3b62b"; - name = "knetwalk-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knetwalk-19.08.0.tar.xz"; + sha256 = "135e8c3b0d46eda0eda2429c6fa89226cba184fb7357b86a3d3101797a7a8c96"; + name = "knetwalk-19.08.0.tar.xz"; }; }; knights = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knights-19.04.1.tar.xz"; - sha256 = "d722fad8e835ea402337ffe1e6b8d1a5bda5a0e1c36ee3a89a6782b666a8534e"; - name = "knights-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knights-19.08.0.tar.xz"; + sha256 = "1e22413a23b8afeab8b5d46a4d6d81a5e00a891636676b99c5bd08806f97795c"; + name = "knights-19.08.0.tar.xz"; }; }; knotes = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/knotes-19.04.1.tar.xz"; - sha256 = "b5cc805c657622e8cc4ab0ea07f30ea0258e767a87e525bc02fbc7d6ee9d7ec9"; - name = "knotes-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/knotes-19.08.0.tar.xz"; + sha256 = "578afb9d879023db9fef4e58e326927d0e2e24edd1e1ac0d46eee968a0ab7030"; + name = "knotes-19.08.0.tar.xz"; }; }; kolf = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kolf-19.04.1.tar.xz"; - sha256 = "92a56f5e5602a898537f87e12968e47cfe6f76d10daac6240e9f60e6751d06d7"; - name = "kolf-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kolf-19.08.0.tar.xz"; + sha256 = "1a2a7e9809fd6551518d1393dcfd365976b06ddf17aaa1056a36e8f167e7db5a"; + name = "kolf-19.08.0.tar.xz"; }; }; kollision = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kollision-19.04.1.tar.xz"; - sha256 = "2c243790feb8d7a7760fcadff6b06b21aea930218d0915664b420dccdc1c7de9"; - name = "kollision-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kollision-19.08.0.tar.xz"; + sha256 = "24a8ae084443359d59c16cbbafc450bbc467bd8b2a2516572e70ef24823750fd"; + name = "kollision-19.08.0.tar.xz"; }; }; kolourpaint = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kolourpaint-19.04.1.tar.xz"; - sha256 = "a2f78f1a2f99fa8176980ecd224ccfd8848ff8357e3434b463d4f83bcc7b5e46"; - name = "kolourpaint-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kolourpaint-19.08.0.tar.xz"; + sha256 = "00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d"; + name = "kolourpaint-19.08.0.tar.xz"; }; }; kompare = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kompare-19.04.1.tar.xz"; - sha256 = "ca270cde7c77fb44b40779ee22d556f14b9e0720e865ad6e3cf5cebbba4d7261"; - name = "kompare-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kompare-19.08.0.tar.xz"; + sha256 = "695c4096c3ac15ab38e5cfb4114f9425c8ccb2f618a65b5f36f3ddee5edec212"; + name = "kompare-19.08.0.tar.xz"; }; }; konqueror = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/konqueror-19.04.1.tar.xz"; - sha256 = "b5f3c5a005b71886bfa2318bf13f14e6bab8fb84e1db54192409769bc3bf0e92"; - name = "konqueror-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/konqueror-19.08.0.tar.xz"; + sha256 = "cc37709dcf183c68effb5332c29527b13fe7aae78216b84680ef6cc73192f971"; + name = "konqueror-19.08.0.tar.xz"; }; }; konquest = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/konquest-19.04.1.tar.xz"; - sha256 = "cac10983efbc026d5c8cd3330c94865b43b1a229ff9bb76077ab25d734133aab"; - name = "konquest-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/konquest-19.08.0.tar.xz"; + sha256 = "94919dce58182859f7e720ece73be81b5bafc359afdc1c29f4f45a3b24155e60"; + name = "konquest-19.08.0.tar.xz"; }; }; konsole = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/konsole-19.04.1.tar.xz"; - sha256 = "711c67c5d43eb2c02be177e9d1157c142ab99ac5b808f951ab9a70e2397119d8"; - name = "konsole-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/konsole-19.08.0.tar.xz"; + sha256 = "4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e"; + name = "konsole-19.08.0.tar.xz"; }; }; kontact = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kontact-19.04.1.tar.xz"; - sha256 = "d60cc3165460a3e395778e4709ff55cbfbb80cc3536edb43d5d2335c70bd4714"; - name = "kontact-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kontact-19.08.0.tar.xz"; + sha256 = "e47d3b4133e24b1c90a3a15f99a77cef442eefa0f2570dd34d5a9e302e845d9b"; + name = "kontact-19.08.0.tar.xz"; }; }; kontactinterface = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kontactinterface-19.04.1.tar.xz"; - sha256 = "034dcf0b2740273037a40ce2c1dd0d4eb17aac1eba608eca81f7e905a336cbc2"; - name = "kontactinterface-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kontactinterface-19.08.0.tar.xz"; + sha256 = "e490fb4dc0e762d4f12a837ecbddc2f14276672d8f46d10029987222b372f3bc"; + name = "kontactinterface-19.08.0.tar.xz"; }; }; kopete = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kopete-19.04.1.tar.xz"; - sha256 = "27586d90bd47abe6d8d6eddd7e41dbb6e3b3736984186cd24f84eee216e98b85"; - name = "kopete-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kopete-19.08.0.tar.xz"; + sha256 = "ef777cc2840db7fc462c3b00a8a289be3db3786ff16ae51ac9a988621848d7b7"; + name = "kopete-19.08.0.tar.xz"; }; }; korganizer = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/korganizer-19.04.1.tar.xz"; - sha256 = "cb5c06d13f9f6eb4191ef6b86dab72ecde92fe6d9c8b6d9a4396645c94f83b67"; - name = "korganizer-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/korganizer-19.08.0.tar.xz"; + sha256 = "fbb6db9e517f7065ed978c6356989a38cea0c9520693d5e67fa04d8cfa625722"; + name = "korganizer-19.08.0.tar.xz"; }; }; kpat = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kpat-19.04.1.tar.xz"; - sha256 = "2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896"; - name = "kpat-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kpat-19.08.0.tar.xz"; + sha256 = "1d68ac9094ad8f9bf0487daced786508f96ce2a63fd8d9884c2d03960fda9328"; + name = "kpat-19.08.0.tar.xz"; }; }; kpimtextedit = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kpimtextedit-19.04.1.tar.xz"; - sha256 = "2fb2dc59a016dd70424c0fbad45ca1d750c2578f539e79d89bcace85bafd24d1"; - name = "kpimtextedit-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kpimtextedit-19.08.0.tar.xz"; + sha256 = "45fcc5898e921c41eb28bb64ddd6d8240f4261360b9149a149ae4c281844dfcb"; + name = "kpimtextedit-19.08.0.tar.xz"; }; }; kpkpass = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kpkpass-19.04.1.tar.xz"; - sha256 = "fb3554b04d00b326d5f5e14af9c0272c020092d3329808a6177fb0714f6a1cb7"; - name = "kpkpass-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kpkpass-19.08.0.tar.xz"; + sha256 = "1555856e987d3667eea8a210e3dd592742ca953dfa2d381e50bc9670183e7137"; + name = "kpkpass-19.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kqtquickcharts-19.04.1.tar.xz"; - sha256 = "7e05638f534257e901e02b6fa377747efa7881760dd66484b5a882c65e778e72"; - name = "kqtquickcharts-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kqtquickcharts-19.08.0.tar.xz"; + sha256 = "6b25edca7643287acaf436ba58124077b89d067e2881a5dbfbd8833b68f3cb05"; + name = "kqtquickcharts-19.08.0.tar.xz"; }; }; krdc = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/krdc-19.04.1.tar.xz"; - sha256 = "8238b6969352d896751d28baeef770705feb5a0866e7b950e9eb0b377c098b19"; - name = "krdc-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/krdc-19.08.0.tar.xz"; + sha256 = "62c995dc1b6eabf2486d475ad089cb3e286d37c6927e4c5bd2455489f52a3e75"; + name = "krdc-19.08.0.tar.xz"; }; }; kreversi = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kreversi-19.04.1.tar.xz"; - sha256 = "c8bce72bff0bd8b452335c158900d41a419ce3e62afd996f67a4b77abf38cdc9"; - name = "kreversi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kreversi-19.08.0.tar.xz"; + sha256 = "1dbfcce80813c238d5a9084ffcde828b0abeb7b370cfb1e82b55de75a5f02ba9"; + name = "kreversi-19.08.0.tar.xz"; }; }; krfb = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/krfb-19.04.1.tar.xz"; - sha256 = "73dee235940cb0512cd218d88f90e6d2d62f232a6553f327b07e54c114c8480b"; - name = "krfb-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/krfb-19.08.0.tar.xz"; + sha256 = "1142e493a37ce867b069ac278215377b56061b2412ee2dd46b0db456fb1419d4"; + name = "krfb-19.08.0.tar.xz"; }; }; kross-interpreters = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kross-interpreters-19.04.1.tar.xz"; - sha256 = "d745f844ebe6ecefbf0d234e1e972cc7d7933a9ef75999839a709ba008ec55fe"; - name = "kross-interpreters-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kross-interpreters-19.08.0.tar.xz"; + sha256 = "d0cda357a32d755d6eba373871c0903a5e6ee5f63289aa6f40c623e985453ecd"; + name = "kross-interpreters-19.08.0.tar.xz"; }; }; kruler = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kruler-19.04.1.tar.xz"; - sha256 = "fdbff79128c8f4cb51f39dbb6f173726404d25c743aa68313651bb7a51addb53"; - name = "kruler-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kruler-19.08.0.tar.xz"; + sha256 = "a78d054359b559b612dd1dac8f0974f554fb7a52bd8de7152de88866719f9226"; + name = "kruler-19.08.0.tar.xz"; }; }; kshisen = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kshisen-19.04.1.tar.xz"; - sha256 = "a9e0e7324bb1bcad6c9427c0563236e557de85ad9724a52cfc917b43726b1aa6"; - name = "kshisen-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kshisen-19.08.0.tar.xz"; + sha256 = "f591834b26ff622c995be81acdb07b6d25cf2e25745688a7c162d0b92532066d"; + name = "kshisen-19.08.0.tar.xz"; }; }; ksirk = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksirk-19.04.1.tar.xz"; - sha256 = "170cc0f9dea3f35e15de5d1090e8e3fa2b2ed16fa1722dfeaef47339667f322e"; - name = "ksirk-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksirk-19.08.0.tar.xz"; + sha256 = "a929c6b10a01d765c8702afc1fa8e77ada7357cf8064c45cff34623d23a2c94c"; + name = "ksirk-19.08.0.tar.xz"; }; }; ksmtp = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksmtp-19.04.1.tar.xz"; - sha256 = "965f5f1c44cd64f9899ff5919372fe449e0f8b63e492f566017c9b8d5eb324bb"; - name = "ksmtp-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksmtp-19.08.0.tar.xz"; + sha256 = "2947d49f183fe25dc340dd3fa6145c85b1896c8adb08bab9966e1f99a927a003"; + name = "ksmtp-19.08.0.tar.xz"; }; }; ksnakeduel = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksnakeduel-19.04.1.tar.xz"; - sha256 = "89de9e20e71ac8225e94d406cd3d25f057df35c96d4a3b7d418ffe5e6b0ef046"; - name = "ksnakeduel-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksnakeduel-19.08.0.tar.xz"; + sha256 = "51799e15ce35237cf410bfd69cca40eeea6ec75ac3b3b98686b44028e8fd2b0b"; + name = "ksnakeduel-19.08.0.tar.xz"; }; }; kspaceduel = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kspaceduel-19.04.1.tar.xz"; - sha256 = "388eaf152c996bd7326f0a4cd18fafb2600659513750d0aadd98b780eb6ec8b7"; - name = "kspaceduel-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kspaceduel-19.08.0.tar.xz"; + sha256 = "fcd3b90e5a61cb27753cbacf4699c156317cfe30d50732f1f89ac4973dfb39f2"; + name = "kspaceduel-19.08.0.tar.xz"; }; }; ksquares = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksquares-19.04.1.tar.xz"; - sha256 = "3c9b0cb0921d1c29c6c451a22b318151010a3321350292d0d5fc26cc16618773"; - name = "ksquares-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksquares-19.08.0.tar.xz"; + sha256 = "649a89da0a928c8977218a76023044205b20f07af9b3abda042e46bc450bd00f"; + name = "ksquares-19.08.0.tar.xz"; }; }; ksudoku = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksudoku-19.04.1.tar.xz"; - sha256 = "4f95ccd1b162c7fb7cad2b04e08e3a29cfc98ad27b87e6e76e389418d09c0f7b"; - name = "ksudoku-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksudoku-19.08.0.tar.xz"; + sha256 = "0f773ce70fbc05f30285b7123c5e28fe241ff56677c5b80c1201238bdbc375f8"; + name = "ksudoku-19.08.0.tar.xz"; }; }; ksystemlog = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ksystemlog-19.04.1.tar.xz"; - sha256 = "c8e6cb81803b8754d394d9365d3a6533706c742c822a5ef9d46bdc2def356db4"; - name = "ksystemlog-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ksystemlog-19.08.0.tar.xz"; + sha256 = "1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259"; + name = "ksystemlog-19.08.0.tar.xz"; }; }; kteatime = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kteatime-19.04.1.tar.xz"; - sha256 = "68a23aa6a8bc575586966388315f403e464b43e1b2f4b669689f3161db1669f0"; - name = "kteatime-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kteatime-19.08.0.tar.xz"; + sha256 = "3be9667867ef41a638c8f97fefb213b078b0ba3171add881438588bc8afba342"; + name = "kteatime-19.08.0.tar.xz"; }; }; ktimer = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktimer-19.04.1.tar.xz"; - sha256 = "7ec4ebbdb8fc388763d832f8601bc7a32848836edc235f4c877bfb6d1726d809"; - name = "ktimer-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktimer-19.08.0.tar.xz"; + sha256 = "c7f684b9c7f0c92638153fabdfdb1082c900a8da2f660eeebe4b8b3b669f8c8d"; + name = "ktimer-19.08.0.tar.xz"; }; }; ktnef = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktnef-19.04.1.tar.xz"; - sha256 = "6f9449307d83a7bf0dc30022c36e3d854a06b370af18e44ca6e2eab684b97c93"; - name = "ktnef-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktnef-19.08.0.tar.xz"; + sha256 = "54b2e09a872e8f8e4e8a1ef77975b1d063ef0d07999b1bf2a696675659e6d52f"; + name = "ktnef-19.08.0.tar.xz"; }; }; ktouch = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktouch-19.04.1.tar.xz"; - sha256 = "09aa2ef862fffcdfc580b4aefff96a0591d99f470055365a90a41b25a3c6dcf2"; - name = "ktouch-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktouch-19.08.0.tar.xz"; + sha256 = "23ae45be76371fa40aac875551b5de8956a2d2b0980024bd788b8b7835b902ba"; + name = "ktouch-19.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-accounts-kcm-19.04.1.tar.xz"; - sha256 = "c4ecda8ca35438e45b48b9b86415bea1a44eeb2b2cd9af11ab1739f7ceeff045"; - name = "ktp-accounts-kcm-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-accounts-kcm-19.08.0.tar.xz"; + sha256 = "f849b7a9b2cee5b328e726dd254b1e606b740e5b75cdc59a1ea18601e131c0b5"; + name = "ktp-accounts-kcm-19.08.0.tar.xz"; }; }; ktp-approver = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-approver-19.04.1.tar.xz"; - sha256 = "e12421c0e79692532497dbd6db6b09faba010d99c57db1893eae3e59f7df47cd"; - name = "ktp-approver-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-approver-19.08.0.tar.xz"; + sha256 = "8662a7b3e4f67a5ed2faa12187faef9dd7e056ee9f2d4b69d68f7a381e258e85"; + name = "ktp-approver-19.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-auth-handler-19.04.1.tar.xz"; - sha256 = "8d06e90a7e73b034c6087079b510e0ac1c27728c885e9aa2e8baef463a892d65"; - name = "ktp-auth-handler-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-auth-handler-19.08.0.tar.xz"; + sha256 = "5674ebf51565854262b5ae0a5fbf8d0837c87b016ea5b32f56f96aa8583a7e39"; + name = "ktp-auth-handler-19.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-call-ui-19.04.1.tar.xz"; - sha256 = "ad2efd84dc45cf55366dbc182d9301816129335ec4dc021dbbcc097c52656a0f"; - name = "ktp-call-ui-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-call-ui-19.08.0.tar.xz"; + sha256 = "1f7922a1920770decfd3e17aaf42e46db60b5c3660efc544a9be743d9a85d08f"; + name = "ktp-call-ui-19.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-common-internals-19.04.1.tar.xz"; - sha256 = "041e5971071a060cef24abe68f699b5fcc657ba15a1e77feb227312fb1c13fd1"; - name = "ktp-common-internals-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-common-internals-19.08.0.tar.xz"; + sha256 = "bdbf20e4e0ad7ba7bdc76a0087ff7307cf813c711da6fba3acb0104756ef1559"; + name = "ktp-common-internals-19.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-list-19.04.1.tar.xz"; - sha256 = "7d8f7d841142d75036dc9dc4e31aefe8ff8906de6205b0e348b48e57da1400d9"; - name = "ktp-contact-list-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-list-19.08.0.tar.xz"; + sha256 = "e6ba69a5a8a6b841e5babd8cb7ddb0a799d34b881ab4bdd0495062a23e59d3e1"; + name = "ktp-contact-list-19.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-runner-19.04.1.tar.xz"; - sha256 = "68580e429fe0c9472a924af4f71df2da74684c5c11374464c110b9faca28c66f"; - name = "ktp-contact-runner-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-contact-runner-19.08.0.tar.xz"; + sha256 = "2a90784f7f266399c41a2b64cdb4ae748fca6739c026beed6bfef91b037c2b28"; + name = "ktp-contact-runner-19.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-desktop-applets-19.04.1.tar.xz"; - sha256 = "1114d5bcbc5a20c2d4822b1e2ad07d5d493ceace0a75b77575e978c30dc5fa75"; - name = "ktp-desktop-applets-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-desktop-applets-19.08.0.tar.xz"; + sha256 = "56562f335767e1071b36e7e31474a371b862785babeb4f5181b48065f6513221"; + name = "ktp-desktop-applets-19.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-filetransfer-handler-19.04.1.tar.xz"; - sha256 = "3e53fc28f4a1a8dd0dd2cb63b0a287061176a5c6e1db6480d50ebc70e2d8f189"; - name = "ktp-filetransfer-handler-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-filetransfer-handler-19.08.0.tar.xz"; + sha256 = "a3a298058e5f6d135abac474a4cd788cea16ccfb4763948f007b6f769fd47de4"; + name = "ktp-filetransfer-handler-19.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-kded-module-19.04.1.tar.xz"; - sha256 = "fe5fc292618b28d11dddec435e86a89899c52b074b7c729aefe951b0b7697a66"; - name = "ktp-kded-module-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-kded-module-19.08.0.tar.xz"; + sha256 = "a225a4e16cb18b19c5750d27c7a3834bbbe362c40c7cad8a9e500488682d67cc"; + name = "ktp-kded-module-19.08.0.tar.xz"; }; }; ktp-send-file = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-send-file-19.04.1.tar.xz"; - sha256 = "8d3100de23666e3cb449663db376ed20e38647758371d37d721385af2b0d8d7a"; - name = "ktp-send-file-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-send-file-19.08.0.tar.xz"; + sha256 = "d69e48d1f69e04618c97f8e83e8909e97d3f1793fff41277bb883885a8c9da8f"; + name = "ktp-send-file-19.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktp-text-ui-19.04.1.tar.xz"; - sha256 = "dfc51070d1a25edde7c0f33d4eb83185738a70e6feb40a8b385403e833cca0b5"; - name = "ktp-text-ui-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktp-text-ui-19.08.0.tar.xz"; + sha256 = "1858215d519efdcf4a0e4ef771e0d0a33f7c918ce2b70fbc95a56b61d240855a"; + name = "ktp-text-ui-19.08.0.tar.xz"; }; }; ktuberling = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/ktuberling-19.04.1.tar.xz"; - sha256 = "f8146ecbe3a1005871a589054b996d059e5ff08b9d7fdeaa06591ae0ab05b8cb"; - name = "ktuberling-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/ktuberling-19.08.0.tar.xz"; + sha256 = "ca751ad3cc06475955fa9cb037a1a60539f59b7e3d22aa7d47e9fd4f2771cd5f"; + name = "ktuberling-19.08.0.tar.xz"; }; }; kturtle = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kturtle-19.04.1.tar.xz"; - sha256 = "f932a56d8f380cc422215e580d8c4d51eabd189f2b4ca3b4205e617d52e6e10d"; - name = "kturtle-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kturtle-19.08.0.tar.xz"; + sha256 = "0e7453e785344a792747b5d51d2c4a190d41e87ddf7e0a9ea49d107a2dd03db8"; + name = "kturtle-19.08.0.tar.xz"; }; }; kubrick = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kubrick-19.04.1.tar.xz"; - sha256 = "636080a8cac2f689f5af8de9aacef9e90029eafaaf7f1867b8a53a8a558e94c7"; - name = "kubrick-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kubrick-19.08.0.tar.xz"; + sha256 = "3a69a6d9a519db9fd25793d532da561a77e7033d71cd3dc67d0ee48c332b71c3"; + name = "kubrick-19.08.0.tar.xz"; }; }; kwalletmanager = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kwalletmanager-19.04.1.tar.xz"; - sha256 = "793a3a335e53b6af36272398d7933ff0cc77918860799db2b5688ee249ce215d"; - name = "kwalletmanager-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kwalletmanager-19.08.0.tar.xz"; + sha256 = "aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471"; + name = "kwalletmanager-19.08.0.tar.xz"; }; }; kwave = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kwave-19.04.1.tar.xz"; - sha256 = "1fd7e256a5d9b77ef691642891b2423357ef4aea7f40ae64304ec922e5930fd6"; - name = "kwave-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kwave-19.08.0.tar.xz"; + sha256 = "60f5408e9a67e934c67332b9a9643513f35946796d1ccf70369e411f804b1043"; + name = "kwave-19.08.0.tar.xz"; }; }; kwordquiz = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/kwordquiz-19.04.1.tar.xz"; - sha256 = "970381004a7382f4f24dad61eda8a386e138735d78c2609c92603e14acbe0158"; - name = "kwordquiz-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/kwordquiz-19.08.0.tar.xz"; + sha256 = "ed4278c1ca0e6e7da548e563a4248fa9e0ff0707b67e06e53ae26dbc2069fc71"; + name = "kwordquiz-19.08.0.tar.xz"; }; }; libgravatar = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libgravatar-19.04.1.tar.xz"; - sha256 = "7d4af799effc13af4f4b056d21b188bd67cd503d1528a7ff37e19d228619b522"; - name = "libgravatar-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libgravatar-19.08.0.tar.xz"; + sha256 = "f8dd753abdc868623b878433c0b2ed53d4d4ab2cb62c69cb94c433e51cb713a9"; + name = "libgravatar-19.08.0.tar.xz"; }; }; libkcddb = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkcddb-19.04.1.tar.xz"; - sha256 = "6773266408c0a68c128b08aca2df594249c210ff9b8fb3553b2bb82c591a2f51"; - name = "libkcddb-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkcddb-19.08.0.tar.xz"; + sha256 = "f97b90660bfd403aa64be8e6221a89087f74ab443431a9f692fe14cc90d82151"; + name = "libkcddb-19.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkcompactdisc-19.04.1.tar.xz"; - sha256 = "146d842741c24a379a0e134b8c0cbef916f5bd94fb8c6102703e5c764bf9b0ee"; - name = "libkcompactdisc-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkcompactdisc-19.08.0.tar.xz"; + sha256 = "cc940df2a1e499965fe05b466c60014082d205f0ae606562980e6088d714eac5"; + name = "libkcompactdisc-19.08.0.tar.xz"; }; }; libkdcraw = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkdcraw-19.04.1.tar.xz"; - sha256 = "54576a803929a0adb3d25e239395b541c0820fecd633f09ea40677882c82e42c"; - name = "libkdcraw-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkdcraw-19.08.0.tar.xz"; + sha256 = "5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1"; + name = "libkdcraw-19.08.0.tar.xz"; }; }; libkdegames = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkdegames-19.04.1.tar.xz"; - sha256 = "a16baa2818ab6f553d9c2635b252530538812787c50f9fbc0d18781943150e5c"; - name = "libkdegames-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkdegames-19.08.0.tar.xz"; + sha256 = "cb1135a86b373543410f3eb0677aed033bad2b8ef60130753c699338e0c22d1b"; + name = "libkdegames-19.08.0.tar.xz"; }; }; libkdepim = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkdepim-19.04.1.tar.xz"; - sha256 = "28217ce30663955168d39eaa4e0c7efb47a437f59df77971f3e98efea99adc45"; - name = "libkdepim-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkdepim-19.08.0.tar.xz"; + sha256 = "4ff394bda799ebe700d12d60ab8171c64e054c6acb105870cd955b5ddce42eab"; + name = "libkdepim-19.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkeduvocdocument-19.04.1.tar.xz"; - sha256 = "c0b5e23a677cea13a2e15989a5b2240ddab2948b00be67e6306cf916e7ca2e59"; - name = "libkeduvocdocument-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkeduvocdocument-19.08.0.tar.xz"; + sha256 = "7b0314bc1f06a4ea4cbb4b4b203a9a0f4a0370f355f8def4398dc452075f6fcf"; + name = "libkeduvocdocument-19.08.0.tar.xz"; }; }; libkexiv2 = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkexiv2-19.04.1.tar.xz"; - sha256 = "138e1bf75cbbf16c46b6ba35f25e700ad93fa8a2134d0ad4c344174c7701cbae"; - name = "libkexiv2-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkexiv2-19.08.0.tar.xz"; + sha256 = "42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15"; + name = "libkexiv2-19.08.0.tar.xz"; }; }; libkgapi = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkgapi-19.04.1.tar.xz"; - sha256 = "a9d499fe1f5371112ceb94b3b03f8e2b1a1faa4ee69722b4c1c9ba28e8f9052e"; - name = "libkgapi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkgapi-19.08.0.tar.xz"; + sha256 = "bc8a54e0997f4e3e0e840e350c6a9dee26582028415c5e9863d53a3280faa9f6"; + name = "libkgapi-19.08.0.tar.xz"; }; }; libkgeomap = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkgeomap-19.04.1.tar.xz"; - sha256 = "519345f30e46fc95816d145177347547c9c9eb440eab017c5ee928fa0ef8cf5a"; - name = "libkgeomap-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkgeomap-19.08.0.tar.xz"; + sha256 = "267c3bb6d033dcbcfabb6822eebc69410de2d13b792ce62af47034bbcf3a5e54"; + name = "libkgeomap-19.08.0.tar.xz"; }; }; libkipi = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkipi-19.04.1.tar.xz"; - sha256 = "1f1a8b881f61c9fc151a2f0b98c6ba07baa0fe1ca8a0f77d7502e81c08a84020"; - name = "libkipi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkipi-19.08.0.tar.xz"; + sha256 = "94b184c3128fe7ded9e816e2a6124ee0dcf016b1325636dd41b157866b461989"; + name = "libkipi-19.08.0.tar.xz"; }; }; libkleo = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkleo-19.04.1.tar.xz"; - sha256 = "a75084129e44028ff3f7742cdcb1800df94845d8c6ace38389da317144fa0529"; - name = "libkleo-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkleo-19.08.0.tar.xz"; + sha256 = "a0a022f3da4d8f73c020ab55221c74d5c1590b2cbdb3b754218be17622a59cc6"; + name = "libkleo-19.08.0.tar.xz"; }; }; libkmahjongg = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkmahjongg-19.04.1.tar.xz"; - sha256 = "7a1df5a03e1da1b801ca4530be3b9008b92cb4872ce8ec0038f2686ac325efbb"; - name = "libkmahjongg-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkmahjongg-19.08.0.tar.xz"; + sha256 = "b51aea6773b609cc1c3a297e72e15b7b504c2877938030e1afac86319e855694"; + name = "libkmahjongg-19.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libkomparediff2-19.04.1.tar.xz"; - sha256 = "2ab1a9cb25996bd6fb80bf556ba4b91a07385e62688249e9415b1ead8b3ad1b3"; - name = "libkomparediff2-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libkomparediff2-19.08.0.tar.xz"; + sha256 = "d86765e6514bdcf838ed36ae5968f9b2b7cb2e74f4fe884ae87f58b9bcc963fe"; + name = "libkomparediff2-19.08.0.tar.xz"; }; }; libksane = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libksane-19.04.1.tar.xz"; - sha256 = "c89039afa641640cbc65b01ae735ee9b70bd3283095d6b034665ddb048d33417"; - name = "libksane-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libksane-19.08.0.tar.xz"; + sha256 = "62c670c316a47facbd0beedb0fcc35247fbbd285892a90ab06ebb8f74b8a6329"; + name = "libksane-19.08.0.tar.xz"; }; }; libksieve = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/libksieve-19.04.1.tar.xz"; - sha256 = "23cca1dfc1d79242f24dd95e8817a9672629276bced3a9ee56067570ef69ccff"; - name = "libksieve-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/libksieve-19.08.0.tar.xz"; + sha256 = "48d0925a8dd0adfa6ccd4945b14e2e562b8855faa6bed43de0442a273fd41966"; + name = "libksieve-19.08.0.tar.xz"; }; }; lokalize = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/lokalize-19.04.1.tar.xz"; - sha256 = "1e68faa5af9079e691e5d207b0397c0250fb6e1209b370e9762bfa949c35dce1"; - name = "lokalize-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/lokalize-19.08.0.tar.xz"; + sha256 = "bb51159c803890af82a38e5a4bd4df0895cc34ed68fa8ed3a4c66adafc9ea6b6"; + name = "lokalize-19.08.0.tar.xz"; }; }; lskat = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/lskat-19.04.1.tar.xz"; - sha256 = "f83f9df9e4786a8d6d8d197defb8ac7f40b8bed8e88578673b2660c14c7a4edf"; - name = "lskat-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/lskat-19.08.0.tar.xz"; + sha256 = "b321f58772eab7f569c76ff4afb56b1e3324dc5febf45bf5ed90993cf38696b5"; + name = "lskat-19.08.0.tar.xz"; }; }; mailcommon = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/mailcommon-19.04.1.tar.xz"; - sha256 = "37b06e85e74d6ef1801485b8d99529fde5ca11bb446c231a6f5406e99f9c4d0f"; - name = "mailcommon-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/mailcommon-19.08.0.tar.xz"; + sha256 = "6c69b70356d9d96578c3fd472aaa36e33feb0677d7e65c36981c0596daf3aea3"; + name = "mailcommon-19.08.0.tar.xz"; }; }; mailimporter = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/mailimporter-19.04.1.tar.xz"; - sha256 = "e77c5c43f20f821664a3a559b929eb2f97ba5105e000875b1642516a6f298696"; - name = "mailimporter-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/mailimporter-19.08.0.tar.xz"; + sha256 = "242f1a93b3521abc68ca8e1abfc75acd0b59e1e2d553df80a057645102246dd7"; + name = "mailimporter-19.08.0.tar.xz"; }; }; marble = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/marble-19.04.1.tar.xz"; - sha256 = "acd9c15c4758684f6eff6c2318fc4dd88fd68dd41336de9458cad4d5f6832c61"; - name = "marble-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/marble-19.08.0.tar.xz"; + sha256 = "c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1"; + name = "marble-19.08.0.tar.xz"; }; }; mbox-importer = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/mbox-importer-19.04.1.tar.xz"; - sha256 = "3fcd5c6b3824dea9ff4145dde6bf7b472675e3927ce91258d89cbfe4d0ebb77a"; - name = "mbox-importer-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/mbox-importer-19.08.0.tar.xz"; + sha256 = "e03fd814c70b15fca3b5dd2cde1dcece436b831ceb04323d7ffcca66daf3ce1c"; + name = "mbox-importer-19.08.0.tar.xz"; }; }; messagelib = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/messagelib-19.04.1.tar.xz"; - sha256 = "7e4d0e2f2d6dfcb235408af0e4af235ab10dc8a8c4f1e169a672f03b37b180ad"; - name = "messagelib-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/messagelib-19.08.0.tar.xz"; + sha256 = "0797b11452874a1d8264f92e8cc6d6977f3b0416dc66ff558b124bf2a52b118d"; + name = "messagelib-19.08.0.tar.xz"; }; }; minuet = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/minuet-19.04.1.tar.xz"; - sha256 = "5f2e3692c0b7ae9496fa7952bfd02045aa87ba5ee10c6ef84fb4557abe83d0f0"; - name = "minuet-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/minuet-19.08.0.tar.xz"; + sha256 = "3827a7e8dd3c48e12521fd0aa76eccbeaf9f2627935f19647f2147e87db63554"; + name = "minuet-19.08.0.tar.xz"; }; }; okular = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/okular-19.04.1.tar.xz"; - sha256 = "7145b1eea61c56a5b413e960e5b24038c7af5d3cb583a524deca344dae3a0e0e"; - name = "okular-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/okular-19.08.0.tar.xz"; + sha256 = "721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec"; + name = "okular-19.08.0.tar.xz"; }; }; palapeli = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/palapeli-19.04.1.tar.xz"; - sha256 = "dc661c88dcf6e3a17b9a2a403cac1ba9bd8f7144ff2c01ff3c286564159f796b"; - name = "palapeli-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/palapeli-19.08.0.tar.xz"; + sha256 = "fcdefb41685728cd9e01cc3249d2676a589f61a611e32c2e1a2e3d4d30721dde"; + name = "palapeli-19.08.0.tar.xz"; }; }; parley = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/parley-19.04.1.tar.xz"; - sha256 = "c52746417d32e31f66c1165fd08ab87696d5ef4b5a020a175fe00e60474bc73f"; - name = "parley-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/parley-19.08.0.tar.xz"; + sha256 = "d3c8f8e7ceee62ffa9b95dbf539a509260b5f759fadd136a966d90a67e8a94a4"; + name = "parley-19.08.0.tar.xz"; }; }; picmi = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/picmi-19.04.1.tar.xz"; - sha256 = "10abab6e48f48e1e1308fbd2a687bb4c5051c6ae2a670b737d6974432fdef30c"; - name = "picmi-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/picmi-19.08.0.tar.xz"; + sha256 = "1d7a6152b05ad22f98762a5a6cd96edbc03ae63bdbc0154f387dc5cce31243eb"; + name = "picmi-19.08.0.tar.xz"; }; }; pimcommon = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/pimcommon-19.04.1.tar.xz"; - sha256 = "bc4612711775ea4665c0827c7935397503b5cf82f906bcf22a64b3ab1eaaaa72"; - name = "pimcommon-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/pimcommon-19.08.0.tar.xz"; + sha256 = "23be57010127831c3ad9b9475e467e8078ff92410c80609660498c5dc6fbaf9a"; + name = "pimcommon-19.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/pim-data-exporter-19.04.1.tar.xz"; - sha256 = "0fa9e20ef67f64d5a9c967f4ea32a476438b23ab8405774035cd4584e6100ebd"; - name = "pim-data-exporter-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/pim-data-exporter-19.08.0.tar.xz"; + sha256 = "f5ff68dcbad1df7ea132b409b70b9b4269badb26e28b4b7cd50239172507f7d8"; + name = "pim-data-exporter-19.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/pim-sieve-editor-19.04.1.tar.xz"; - sha256 = "3a8ce54140233fa7ae618fc05ae9d882cab6e56835e9fdb29e2242885ce50e10"; - name = "pim-sieve-editor-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/pim-sieve-editor-19.08.0.tar.xz"; + sha256 = "1ea0cc219d6776968d81ff1a606a9a11e1714f864fda9f00a13a5d7c84b45b46"; + name = "pim-sieve-editor-19.08.0.tar.xz"; }; }; poxml = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/poxml-19.04.1.tar.xz"; - sha256 = "d8439996821ded53dea321f84619f3754cc677b5fa08b5fd37aabb09b8dac2f9"; - name = "poxml-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/poxml-19.08.0.tar.xz"; + sha256 = "82393645a5f97890bba866554c0e05d7b216f0ed7eafea00fe1c2708ac12e0b2"; + name = "poxml-19.08.0.tar.xz"; }; }; print-manager = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/print-manager-19.04.1.tar.xz"; - sha256 = "33d553bb048959ecfc5e404f3a1e118b0ed78305d96b3a6042ffd576a164e9fa"; - name = "print-manager-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/print-manager-19.08.0.tar.xz"; + sha256 = "56fe89f6bc3be64848adee20a22c712ba8f72602e28fb3288cd5328797e32c7b"; + name = "print-manager-19.08.0.tar.xz"; }; }; rocs = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/rocs-19.04.1.tar.xz"; - sha256 = "5c0740d68ed26f7291e114faa811a2ae104ee682181f5ebed381865dd7d8db61"; - name = "rocs-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/rocs-19.08.0.tar.xz"; + sha256 = "2e9346781bb6198a3fb3c3357ef796c0e86fdd104146de87a481619d3cbe78fe"; + name = "rocs-19.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/signon-kwallet-extension-19.04.1.tar.xz"; - sha256 = "658bbae2534896e13a7aced654f38164130ee3c748349d044000d0d7dcaa1c38"; - name = "signon-kwallet-extension-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/signon-kwallet-extension-19.08.0.tar.xz"; + sha256 = "f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f"; + name = "signon-kwallet-extension-19.08.0.tar.xz"; }; }; spectacle = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/spectacle-19.04.1.tar.xz"; - sha256 = "6f420fc6a660e25a08449cfb6d2795e07a37f8dca25f1862d857121b43f9262c"; - name = "spectacle-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/spectacle-19.08.0.tar.xz"; + sha256 = "8ada4f765f81ee496f9fd00b74764690df9c479e343a035e363f7159f93c35a4"; + name = "spectacle-19.08.0.tar.xz"; }; }; step = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/step-19.04.1.tar.xz"; - sha256 = "4fafff95339473e6449e9a45e273fe15758daf743e8697ff73f16129eb1dca05"; - name = "step-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/step-19.08.0.tar.xz"; + sha256 = "7a2dc38617822c8118c721ccaaa9907ec3e109eacf57e46b599c6731b325a993"; + name = "step-19.08.0.tar.xz"; }; }; svgpart = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/svgpart-19.04.1.tar.xz"; - sha256 = "3e30eb3b0f95073639697c73f1cc1d4689e53921cc87fe23cd0ec04ef6835624"; - name = "svgpart-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/svgpart-19.08.0.tar.xz"; + sha256 = "7e1f4b3f8807e996b2acb496971bd7ebcb1e456ac090e269e42d15fce629858d"; + name = "svgpart-19.08.0.tar.xz"; }; }; sweeper = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/sweeper-19.04.1.tar.xz"; - sha256 = "70ccd7a1d8d81ee2a54df724a1ad908157672bb20e80c81aff8db946241b6637"; - name = "sweeper-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/sweeper-19.08.0.tar.xz"; + sha256 = "3cab8817b5c52bd0064e49e6062d3295328604d96e355779a766075d5ae10764"; + name = "sweeper-19.08.0.tar.xz"; }; }; umbrello = { - version = "19.04.1"; + version = "19.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/19.08.0/src/umbrello-19.08.0.tar.xz"; + sha256 = "8df6e0394670ee3f91f449a3110312a37876d3aa047442ed8439d8b876a6b0e2"; + name = "umbrello-19.08.0.tar.xz"; + }; + }; + yakuake = { + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/umbrello-19.04.1.tar.xz"; - sha256 = "42f9ba60320558439a1d5c68cc4d730c6b17e0b2b8a57b4686031bbecb3ab3c2"; - name = "umbrello-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/yakuake-19.08.0.tar.xz"; + sha256 = "f0931fffbcd6f17687f13ab766e628961c6caf6dcf8cad79f6e311a0b5692a49"; + name = "yakuake-19.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.04.1"; + version = "19.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.1/src/zeroconf-ioslave-19.04.1.tar.xz"; - sha256 = "e59c8a4b6ff93ead29b322fb40c94a3584d5c463077d58575720fcba2c511d87"; - name = "zeroconf-ioslave-19.04.1.tar.xz"; + url = "${mirror}/stable/applications/19.08.0/src/zeroconf-ioslave-19.08.0.tar.xz"; + sha256 = "0fbe1e0d1c30cc570d96e6a5aa12692bd8e5d11bfd4b9af5077f4c5e80c8f183"; + name = "zeroconf-ioslave-19.08.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/applications/kde/yakuake.nix b/nixpkgs/pkgs/applications/kde/yakuake.nix new file mode 100644 index 000000000000..6f9c8df30012 --- /dev/null +++ b/nixpkgs/pkgs/applications/kde/yakuake.nix @@ -0,0 +1,32 @@ +{ + mkDerivation, lib, kdoctools, extra-cmake-modules, + karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications, + knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras +}: + +mkDerivation { + name = "yakuake"; + + buildInputs = [ + karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications + knotifyconfig kparts kwindowsystem qtx11extras + ]; + + propagatedBuildInputs = [ + karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications + knotifyconfig kparts kwindowsystem + ]; + + propagatedUserEnvPkgs = [ konsole ]; + + nativeBuildInputs = [ + extra-cmake-modules kdoctools + ]; + + meta = { + homepage = https://yakuake.kde.org; + description = "Quad-style terminal emulator for KDE"; + maintainers = with lib.maintainers; [ fridh ]; + license = lib.licenses.gpl2; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix index 79c3a6d7302f..edcd08f24999 100644 --- a/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.5.7"; + version = "0.6.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1193lq6cvqkv2cy07l6wzb25gb5vb3s3pxm534q3izhzrrz6lisz"; + sha256 = "1yr78yawscp9fgvdw0dimc68k3bblk3g67g3jrqpa7hnl6pr24yl"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "0hlw1jasxzg31293d2n3ydzj62q7ji7nig7aaighcvzi3c9j7v51"; + sha256 = "03m0vxhghzf4zq7k2f1afkc5ixf0qwiiypqjfjgpqpfng7g9ang7"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "05z5k63fza6v0vhydyiq4sh9xhxnd9rcfxyym7jihv6b3fv3fnx3"; + sha256 = "1hypmls1fq4rjx9icgr0pkx3s3fhhma2q5rds314sv7f9ijl458f"; stripRoot = false; } else throw "Architecture not supported"; diff --git a/nixpkgs/pkgs/applications/misc/airtame/default.nix b/nixpkgs/pkgs/applications/misc/airtame/default.nix index 50582d94ff4a..465c72d73f5c 100644 --- a/nixpkgs/pkgs/applications/misc/airtame/default.nix +++ b/nixpkgs/pkgs/applications/misc/airtame/default.nix @@ -14,7 +14,6 @@ let libPath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "airtame"; version = "3.3.0"; - name = "${pname}-${version}"; longName = "${pname}-application"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/aminal/default.nix b/nixpkgs/pkgs/applications/misc/aminal/default.nix index 8cb014bb0214..8c5aded5ed9b 100644 --- a/nixpkgs/pkgs/applications/misc/aminal/default.nix +++ b/nixpkgs/pkgs/applications/misc/aminal/default.nix @@ -10,7 +10,7 @@ }: buildGoPackage rec { - name = "aminal-${version}"; + pname = "aminal"; version = "0.8.6"; goPackagePath = "github.com/liamg/aminal"; diff --git a/nixpkgs/pkgs/applications/misc/ape/clex.nix b/nixpkgs/pkgs/applications/misc/ape/clex.nix index 37d140e19ba3..c680ffe96783 100644 --- a/nixpkgs/pkgs/applications/misc/ape/clex.nix +++ b/nixpkgs/pkgs/applications/misc/ape/clex.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "attempto-clex-${version}"; + pname = "attempto-clex"; version = "5133afe"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/apvlv/default.nix b/nixpkgs/pkgs/applications/misc/apvlv/default.nix index 2da0de9ead8c..b5af1af91f36 100644 --- a/nixpkgs/pkgs/applications/misc/apvlv/default.nix +++ b/nixpkgs/pkgs/applications/misc/apvlv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.1.5"; - name = "apvlv-${version}"; + pname = "apvlv"; src = fetchFromGitHub { owner = "naihe2010"; diff --git a/nixpkgs/pkgs/applications/misc/artha/default.nix b/nixpkgs/pkgs/applications/misc/artha/default.nix index 202c1669f858..791e2d0f52e8 100644 --- a/nixpkgs/pkgs/applications/misc/artha/default.nix +++ b/nixpkgs/pkgs/applications/misc/artha/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { - name = "artha-${version}"; + pname = "artha"; version = "1.0.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix index 3c18d70d6c26..0e524ede0912 100644 --- a/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix +++ b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix @@ -2,7 +2,8 @@ let version = "1.1"; in stdenv.mkDerivation { - name = "asciiquarium-${version}"; + pname = "asciiquarium"; + inherit version; src = fetchurl { url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz"; sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v"; diff --git a/nixpkgs/pkgs/applications/misc/autospotting/default.nix b/nixpkgs/pkgs/applications/misc/autospotting/default.nix index 2dd151c1a6c1..444a8da7036d 100644 --- a/nixpkgs/pkgs/applications/misc/autospotting/default.nix +++ b/nixpkgs/pkgs/applications/misc/autospotting/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "autospotting-${version}"; + pname = "autospotting"; version = "unstable-2018-11-17"; goPackagePath = "github.com/AutoSpotting/AutoSpotting"; diff --git a/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix b/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix index fc5fa4d03006..b0af34ec7606 100644 --- a/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix +++ b/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix @@ -12,7 +12,8 @@ let ]; in stdenv.mkDerivation { - name = "bashSnippets-${version}"; + pname = "bashSnippets"; + inherit version; src = fetchFromGitHub { owner = "alexanderepstein"; diff --git a/nixpkgs/pkgs/applications/misc/batti/default.nix b/nixpkgs/pkgs/applications/misc/batti/default.nix index abb3eb33536e..8b994c55de3f 100644 --- a/nixpkgs/pkgs/applications/misc/batti/default.nix +++ b/nixpkgs/pkgs/applications/misc/batti/default.nix @@ -7,11 +7,11 @@ let inherit (pythonPackages) dbus-python pygtk python; in stdenv.mkDerivation rec { - name = "batti-${version}"; + pname = "batti"; version = "0.3.8"; src = fetchurl { - url = "https://batti-gtk.googlecode.com/files/${name}.tar.gz"; + url = "https://batti-gtk.googlecode.com/files/${pname}-${version}.tar.gz"; sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6"; }; diff --git a/nixpkgs/pkgs/applications/misc/bb/default.nix b/nixpkgs/pkgs/applications/misc/bb/default.nix index f085e4bd7dd5..06df1df9f769 100644 --- a/nixpkgs/pkgs/applications/misc/bb/default.nix +++ b/nixpkgs/pkgs/applications/misc/bb/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }: stdenv.mkDerivation rec { - name = "bb-${version}"; + pname = "bb"; version = "1.3rc1"; src = fetchurl { - url = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz"; sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr"; }; diff --git a/nixpkgs/pkgs/applications/misc/bibletime/default.nix b/nixpkgs/pkgs/applications/misc/bibletime/default.nix index 41184d6e9492..a3f0a3b84f23 100644 --- a/nixpkgs/pkgs/applications/misc/bibletime/default.nix +++ b/nixpkgs/pkgs/applications/misc/bibletime/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "2.10.1"; - name = "bibletime-${version}"; + pname = "bibletime"; src = fetchurl { - url = "mirror://sourceforge/bibletime/${name}.tar.xz"; + url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz"; sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6"; }; diff --git a/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix b/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix index 9c99dcee2b3c..090cb2f519e1 100644 --- a/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix @@ -10,7 +10,8 @@ let in buildPythonApplication { - name = "bitcoinarmory-${version}"; + pname = "bitcoinarmory"; + inherit version; src = fetchFromGitHub { owner = "goatpig"; diff --git a/nixpkgs/pkgs/applications/misc/calcurse/default.nix b/nixpkgs/pkgs/applications/misc/calcurse/default.nix index a15814082014..402198a97322 100644 --- a/nixpkgs/pkgs/applications/misc/calcurse/default.nix +++ b/nixpkgs/pkgs/applications/misc/calcurse/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }: stdenv.mkDerivation rec { - name = "calcurse-${version}"; + pname = "calcurse"; version = "4.5.0"; src = fetchurl { - url = "https://calcurse.org/files/${name}.tar.gz"; + url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3"; }; diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index c82b00e66e80..b4c8bbb3f311 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: mkDerivation rec { - name = "calibre-${version}"; - version = "3.46.0"; + pname = "calibre"; + version = "3.47.0"; src = fetchurl { - url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9"; + url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; + sha256 = "0mjj47w9pa7ihycialijrfq2qk107dcxwcwriz3b2mg4lixlawy4"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/candle/default.nix b/nixpkgs/pkgs/applications/misc/candle/default.nix index 35aa681df4ba..77cabc409c74 100644 --- a/nixpkgs/pkgs/applications/misc/candle/default.nix +++ b/nixpkgs/pkgs/applications/misc/candle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: stdenv.mkDerivation rec { - name = "candle-${version}"; + pname = "candle"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/cardpeek/default.nix b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix index a0e5c8149968..40dbfea9801b 100644 --- a/nixpkgs/pkgs/applications/misc/cardpeek/default.nix +++ b/nixpkgs/pkgs/applications/misc/cardpeek/default.nix @@ -4,7 +4,8 @@ let version = "0.8.4"; in stdenv.mkDerivation { - name = "cardpeek-${version}"; + pname = "cardpeek"; + inherit version; src = fetchFromGitHub { owner = "L1L1"; diff --git a/nixpkgs/pkgs/applications/misc/cataract/build.nix b/nixpkgs/pkgs/applications/misc/cataract/build.nix index e48b32a783d7..dae6e404a9dd 100644 --- a/nixpkgs/pkgs/applications/misc/cataract/build.nix +++ b/nixpkgs/pkgs/applications/misc/cataract/build.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit version; - name = "cataract-${version}"; + pname = "cataract"; src = fetchgit { url = "git://git.bzatek.net/cataract"; diff --git a/nixpkgs/pkgs/applications/misc/cdrtools/default.nix b/nixpkgs/pkgs/applications/misc/cdrtools/default.nix index 1bbb7d61b01f..20bfe727f6d3 100644 --- a/nixpkgs/pkgs/applications/misc/cdrtools/default.nix +++ b/nixpkgs/pkgs/applications/misc/cdrtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, libcap, Carbon, IOKit }: stdenv.mkDerivation rec { - name = "cdrtools-${version}"; + pname = "cdrtools"; version = "3.02a06"; src = fetchurl { - url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; + url = "mirror://sourceforge/cdrtools/${pname}-${version}.tar.bz2"; sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd"; }; diff --git a/nixpkgs/pkgs/applications/misc/cgminer/default.nix b/nixpkgs/pkgs/applications/misc/cgminer/default.nix index 9d63b5aedcb7..04f32a67b84c 100644 --- a/nixpkgs/pkgs/applications/misc/cgminer/default.nix +++ b/nixpkgs/pkgs/applications/misc/cgminer/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.7.2"; - name = "cgminer-${version}"; + pname = "cgminer"; src = fetchgit { url = "https://github.com/ckolivas/cgminer.git"; diff --git a/nixpkgs/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix index 41660bc7f2b0..357dd9bcb8a7 100644 --- a/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -2,7 +2,6 @@ with python3.pkgs; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "cheat"; version = "2.5.1"; diff --git a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index 0578393dfca0..856853e3b1cb 100644 --- a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cherrytree-${version}"; + pname = "cherrytree"; version = "0.38.8"; src = fetchurl { - url = "https://www.giuspen.com/software/${name}.tar.xz"; + url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz"; sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg"; }; diff --git a/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix index 6602adb2f2ab..4986661e2f63 100644 --- a/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix +++ b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.8"; - name = "cli-visualizer-${version}"; + pname = "cli-visualizer"; src = fetchFromGitHub { owner = "dpayne"; diff --git a/nixpkgs/pkgs/applications/misc/clipit/default.nix b/nixpkgs/pkgs/applications/misc/clipit/default.nix index 4477cbbcc06a..693ce84c97ac 100644 --- a/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipit/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "clipit-${version}"; + pname = "clipit"; version = "1.4.2"; src = fetchurl { - url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz"; + url = "https://github.com/downloads/shantzu/ClipIt/${pname}-${version}.tar.gz"; sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; diff --git a/nixpkgs/pkgs/applications/misc/clipmenu/default.nix b/nixpkgs/pkgs/applications/misc/clipmenu/default.nix index e6e4ede6ac14..7577c0a3db99 100644 --- a/nixpkgs/pkgs/applications/misc/clipmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipmenu/default.nix @@ -3,7 +3,7 @@ let runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; in stdenv.mkDerivation rec { - name = "clipmenu-${version}"; + pname = "clipmenu"; version = "5.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/confclerk/default.nix b/nixpkgs/pkgs/applications/misc/confclerk/default.nix index 3851730c4596..b07e0fb8c520 100644 --- a/nixpkgs/pkgs/applications/misc/confclerk/default.nix +++ b/nixpkgs/pkgs/applications/misc/confclerk/default.nix @@ -2,7 +2,8 @@ let version = "0.6.4"; in stdenv.mkDerivation { - name = "confclerk-${version}"; + pname = "confclerk"; + inherit version; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix b/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix index bd49323b03f1..c9dcc97d5cd1 100644 --- a/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix +++ b/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix @@ -3,7 +3,7 @@ mkDerivation rec { version = "1.1.1"; - name = "cool-retro-term-${version}"; + pname = "cool-retro-term"; src = fetchFromGitHub { owner = "Swordfish90"; diff --git a/nixpkgs/pkgs/applications/misc/copyq/default.nix b/nixpkgs/pkgs/applications/misc/copyq/default.nix index 3ee357ce151b..2aad4d352c97 100644 --- a/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "CopyQ-${version}"; + pname = "CopyQ"; version = "3.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix b/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix index 4d9975192461..0e9ff40cffa4 100644 --- a/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix @@ -17,7 +17,7 @@ , extraCmakeFlags ? [] }: stdenv.mkDerivation rec { - name = "cpp-ethereum-${version}"; + pname = "cpp-ethereum"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/ctodo/default.nix b/nixpkgs/pkgs/applications/misc/ctodo/default.nix index 0123e0c38d74..72918a40733b 100644 --- a/nixpkgs/pkgs/applications/misc/ctodo/default.nix +++ b/nixpkgs/pkgs/applications/misc/ctodo/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, ncurses, readline }: stdenv.mkDerivation rec { - name = "ctodo-${version}"; + pname = "ctodo"; version = "1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/curaengine.nix index e44f43d22bfe..90f5f307d853 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/curaengine.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/curaengine.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: stdenv.mkDerivation rec { - name = "curaengine-lulzBot-${version}"; + pname = "curaengine-lulzBot"; version = "3.6.18"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/cura/stable.nix b/nixpkgs/pkgs/applications/misc/cura/stable.nix index a53b001b0e98..1972042f805e 100644 --- a/nixpkgs/pkgs/applications/misc/cura/stable.nix +++ b/nixpkgs/pkgs/applications/misc/cura/stable.nix @@ -4,7 +4,8 @@ let version = "15.04"; in stdenv.mkDerivation rec { - name = "cura-${version}"; + pname = "cura"; + inherit version; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix b/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix index 4e620425d5c3..a367efaaef38 100644 --- a/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix +++ b/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix @@ -14,7 +14,7 @@ # If, however, someone needs it, we certainly can find a solution. stdenv.mkDerivation rec { - name = "curabydagoma-${version}"; + pname = "curabydagoma"; # Version is the date, UNIX format version = "1520506579"; # Hash of the user's choice: os, arch, package type... diff --git a/nixpkgs/pkgs/applications/misc/curaengine/default.nix b/nixpkgs/pkgs/applications/misc/curaengine/default.nix index 823e6d6e2e99..3e4c77aafc6a 100644 --- a/nixpkgs/pkgs/applications/misc/curaengine/default.nix +++ b/nixpkgs/pkgs/applications/misc/curaengine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }: stdenv.mkDerivation rec { - name = "curaengine-${version}"; + pname = "curaengine"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/curaengine/stable.nix b/nixpkgs/pkgs/applications/misc/curaengine/stable.nix index ce743a008798..41f110e9ee10 100644 --- a/nixpkgs/pkgs/applications/misc/curaengine/stable.nix +++ b/nixpkgs/pkgs/applications/misc/curaengine/stable.nix @@ -3,7 +3,8 @@ let version = "15.04.6"; in stdenv.mkDerivation { - name = "curaengine-${version}"; + pname = "curaengine"; + inherit version; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 82d77b65f668..d8cf86461acf 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -6,7 +6,7 @@ # See `pkgs/applications/editors/eclipse/*.nix` stdenv.mkDerivation rec { - name = "dbeaver-ce-${version}"; + pname = "dbeaver-ce"; version = "6.1.4"; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/misc/ddgr/default.nix b/nixpkgs/pkgs/applications/misc/ddgr/default.nix index b010e5401b80..3cbb091a4e21 100644 --- a/nixpkgs/pkgs/applications/misc/ddgr/default.nix +++ b/nixpkgs/pkgs/applications/misc/ddgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "ddgr-${version}"; + pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; diff --git a/nixpkgs/pkgs/applications/misc/deco/default.nix b/nixpkgs/pkgs/applications/misc/deco/default.nix index 7f4629100d5d..a1fdabd8ccb1 100644 --- a/nixpkgs/pkgs/applications/misc/deco/default.nix +++ b/nixpkgs/pkgs/applications/misc/deco/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "deco"; version = "0.0.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; diff --git a/nixpkgs/pkgs/applications/misc/devilspie2/default.nix b/nixpkgs/pkgs/applications/misc/devilspie2/default.nix index 4fb9ca5fa713..5699396a0840 100644 --- a/nixpkgs/pkgs/applications/misc/devilspie2/default.nix +++ b/nixpkgs/pkgs/applications/misc/devilspie2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }: stdenv.mkDerivation rec { - name = "devilspie2-${version}"; + pname = "devilspie2"; version = "0.43"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix index eeb7a8ccf526..5df7c0b06727 100644 --- a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix +++ b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix @@ -4,7 +4,8 @@ let version = "git-2016-01-10"; in stdenv.mkDerivation { - name = "dfilemanager-${version}"; + pname = "dfilemanager"; + inherit version; src = fetchgit { url = "git://git.code.sf.net/p/dfilemanager/code"; rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; diff --git a/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix index 467c2b3c2d59..283b66318ea5 100644 --- a/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix @@ -8,7 +8,7 @@ let [ wxGTK ]; in stdenv.mkDerivation rec { - name = "diff-pdf-${version}"; + pname = "diff-pdf"; version = "2017-12-30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/diffpdf/default.nix b/nixpkgs/pkgs/applications/misc/diffpdf/default.nix index daea20835c8a..37ed8eb23fb6 100644 --- a/nixpkgs/pkgs/applications/misc/diffpdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/diffpdf/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.1.3"; - name = "diffpdf-${version}"; + pname = "diffpdf"; src = fetchurl { - url = "http://www.qtrac.eu/${name}.tar.gz"; + url = "http://www.qtrac.eu/${pname}-${version}.tar.gz"; sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566"; }; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { install -Dpm755 -D diffpdf $out/bin/diffpdf install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1 - install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications - install -Dpm644 CHANGES README help.html $out/share/doc/${name}/ - install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/ + install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications + install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/ + install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/ install -Dpm644 images/icon.png $out/share/icons/diffpdf.png install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png diff --git a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix index 58bc483d43f3..13539169dece 100644 --- a/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix +++ b/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix @@ -47,7 +47,7 @@ let copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; in stdenv.mkDerivation rec { - name = "digitalbitbox-${version}"; + pname = "digitalbitbox"; version = "2.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/direwolf/default.nix b/nixpkgs/pkgs/applications/misc/direwolf/default.nix index f1e33ea53571..8f7dbd2d2eda 100644 --- a/nixpkgs/pkgs/applications/misc/direwolf/default.nix +++ b/nixpkgs/pkgs/applications/misc/direwolf/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "direwolf-${version}"; + pname = "direwolf"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/doomseeker/default.nix b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix index fd08ed9c3916..8cfadd77ece9 100644 --- a/nixpkgs/pkgs/applications/misc/doomseeker/default.nix +++ b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: stdenv.mkDerivation rec { - name = "doomseeker-${version}"; + pname = "doomseeker"; version = "2018-03-05"; src = fetchFromBitbucket { diff --git a/nixpkgs/pkgs/applications/misc/dotfiles/default.nix b/nixpkgs/pkgs/applications/misc/dotfiles/default.nix index 1d3c405b7038..5150f13fb80c 100644 --- a/nixpkgs/pkgs/applications/misc/dotfiles/default.nix +++ b/nixpkgs/pkgs/applications/misc/dotfiles/default.nix @@ -2,7 +2,6 @@ pythonPackages.buildPythonApplication rec { pname = "dotfiles"; - name = "${pname}-${version}"; version = "0.6.4"; src = pythonPackages.fetchPypi { diff --git a/nixpkgs/pkgs/applications/misc/dozenal/default.nix b/nixpkgs/pkgs/applications/misc/dozenal/default.nix index b5ae9fb567ca..226bdea03013 100644 --- a/nixpkgs/pkgs/applications/misc/dozenal/default.nix +++ b/nixpkgs/pkgs/applications/misc/dozenal/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "12010904"; - name = "dozenal-${version}"; + pname = "dozenal"; src = fetchFromGitHub { owner = "dgoodmaniii"; repo = "dozenal"; diff --git a/nixpkgs/pkgs/applications/misc/eaglemode/default.nix b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix index 6c802e683ce9..ae83802a7b44 100644 --- a/nixpkgs/pkgs/applications/misc/eaglemode/default.nix +++ b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix @@ -2,11 +2,11 @@ librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { - name = "eaglemode-${version}"; + pname = "eaglemode"; version = "0.94.1"; src = fetchurl { - url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; + url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2"; sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89"; }; diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 5233aaf8fcdb..8940c8dfd221 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 +{ stdenv, fetchurl, fetchFromGitHub, wrapQtAppsHook, python3, python3Packages, zbar, secp256k1 , enableQt ? !stdenv.isDarwin @@ -54,6 +54,8 @@ python3Packages.buildPythonApplication rec { cp -ar ${tests} $sourceRoot/electrum/tests ''; + nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ aiorpcx aiohttp @@ -102,6 +104,11 @@ python3Packages.buildPythonApplication rec { "Exec=$out/bin/electrum %u" \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \ "Exec=$out/bin/electrum --testnet %u" + + ''; + + postFixup = stdenv.lib.optionalString enableQt '' + wrapQtApp $out/bin/electrum ''; checkInputs = with python3Packages; [ pytest ]; diff --git a/nixpkgs/pkgs/applications/misc/emem/default.nix b/nixpkgs/pkgs/applications/misc/emem/default.nix index d447e7f50d52..62358d41cc53 100644 --- a/nixpkgs/pkgs/applications/misc/emem/default.nix +++ b/nixpkgs/pkgs/applications/misc/emem/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "emem"; version = "0.2.50"; - name = "${pname}-${version}"; inherit jdk; diff --git a/nixpkgs/pkgs/applications/misc/epdfview/default.nix b/nixpkgs/pkgs/applications/misc/epdfview/default.nix index b6c10dbebcad..1a87b7f5c8be 100644 --- a/nixpkgs/pkgs/applications/misc/epdfview/default.nix +++ b/nixpkgs/pkgs/applications/misc/epdfview/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { - name = "epdfview-${version}"; + pname = "epdfview"; version = "0.1.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/et/default.nix b/nixpkgs/pkgs/applications/misc/et/default.nix index bf1ae3037fc4..d0d3c2b424d3 100644 --- a/nixpkgs/pkgs/applications/misc/et/default.nix +++ b/nixpkgs/pkgs/applications/misc/et/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { - name = "et-${version}"; + pname = "et"; version = "0.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/eterm/default.nix b/nixpkgs/pkgs/applications/misc/eterm/default.nix index 98b47990314d..56cac7ca9185 100644 --- a/nixpkgs/pkgs/applications/misc/eterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/eterm/default.nix @@ -3,7 +3,7 @@ , pkgconfig, imlib2, libast }: stdenv.mkDerivation rec { - name = "eterm-${version}"; + pname = "eterm"; version = "0.9.6"; srcName = "Eterm-${version}"; diff --git a/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix b/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix index b8bd0a59bea2..e9d1317390ed 100644 --- a/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix +++ b/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: stdenv.mkDerivation rec { - name = "eureka-editor-${version}"; + pname = "eureka-editor"; version = "1.21"; shortver = "121"; diff --git a/nixpkgs/pkgs/applications/misc/evilvte/default.nix b/nixpkgs/pkgs/applications/misc/evilvte/default.nix index 4746f4ead1bb..d1161aa68226 100644 --- a/nixpkgs/pkgs/applications/misc/evilvte/default.nix +++ b/nixpkgs/pkgs/applications/misc/evilvte/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "evilvte-${version}"; + pname = "evilvte"; version = "0.5.2-20140827"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/exercism/default.nix b/nixpkgs/pkgs/applications/misc/exercism/default.nix index 21fed2e28def..6d04cef76ce7 100644 --- a/nixpkgs/pkgs/applications/misc/exercism/default.nix +++ b/nixpkgs/pkgs/applications/misc/exercism/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "exercism-${version}"; + pname = "exercism"; version = "3.0.11"; goPackagePath = "github.com/exercism/cli"; diff --git a/nixpkgs/pkgs/applications/misc/extract_url/default.nix b/nixpkgs/pkgs/applications/misc/extract_url/default.nix index 2b7888c9cd04..f96d3f0f57c7 100644 --- a/nixpkgs/pkgs/applications/misc/extract_url/default.nix +++ b/nixpkgs/pkgs/applications/misc/extract_url/default.nix @@ -10,7 +10,7 @@ let ++ lib.optional uriFindSupport perlPackages.URIFind; in stdenv.mkDerivation rec { - name = "extract_url-${version}"; + pname = "extract_url"; version = "1.6.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index e9d194666094..bbbf1a0aff9b 100644 --- a/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -4,7 +4,8 @@ let version = "6.3.26"; in stdenv.mkDerivation { - name="fetchmail-${version}"; + pname = "fetchmail"; + inherit version; src = fetchurl { url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/misc/flamerobin/default.nix b/nixpkgs/pkgs/applications/misc/flamerobin/default.nix index f70042884a8a..06cf3c06ffa6 100644 --- a/nixpkgs/pkgs/applications/misc/flamerobin/default.nix +++ b/nixpkgs/pkgs/applications/misc/flamerobin/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.3.1"; - name = "flamerobin-${version}"; + pname = "flamerobin"; src = fetchFromGitHub { owner = "mariuz"; diff --git a/nixpkgs/pkgs/applications/misc/fme/default.nix b/nixpkgs/pkgs/applications/misc/fme/default.nix index 4e786bfb36f8..2ca059820ef0 100644 --- a/nixpkgs/pkgs/applications/misc/fme/default.nix +++ b/nixpkgs/pkgs/applications/misc/fme/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec{ - name = "fme-${version}"; + pname = "fme"; version = "1.1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/freemind/default.nix b/nixpkgs/pkgs/applications/misc/freemind/default.nix index 5152c8aa3f7c..aee3937689b3 100644 --- a/nixpkgs/pkgs/applications/misc/freemind/default.nix +++ b/nixpkgs/pkgs/applications/misc/freemind/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jdk, jre, ant }: stdenv.mkDerivation rec { - name = "freemind-${version}"; + pname = "freemind"; version = "1.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/gImageReader/default.nix b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix index 9a34694e2f25..67d4bd65a9f9 100644 --- a/nixpkgs/pkgs/applications/misc/gImageReader/default.nix +++ b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix @@ -15,7 +15,7 @@ let pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] ); in stdenv.mkDerivation rec { - name = "gImageReader-${version}"; + pname = "gImageReader"; version = "3.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/galculator/default.nix b/nixpkgs/pkgs/applications/misc/galculator/default.nix index 44071b328758..ecf8ae9da8d4 100644 --- a/nixpkgs/pkgs/applications/misc/galculator/default.nix +++ b/nixpkgs/pkgs/applications/misc/galculator/default.nix @@ -3,7 +3,7 @@ , gtk, pkgconfig, flex }: stdenv.mkDerivation rec { - name = "galculator-${version}"; + pname = "galculator"; version = "2.1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/gammu/default.nix b/nixpkgs/pkgs/applications/misc/gammu/default.nix index 739df59b31c5..fb6902634da8 100644 --- a/nixpkgs/pkgs/applications/misc/gammu/default.nix +++ b/nixpkgs/pkgs/applications/misc/gammu/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gammu-${version}"; + pname = "gammu"; version = "1.40.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix index dd0a5c9a4f60..96d3d34046e1 100644 --- a/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ganttproject-bin-${version}"; + pname = "ganttproject-bin"; version = "2.8.10"; src = let build = "r2364"; in fetchzip { diff --git a/nixpkgs/pkgs/applications/misc/gcal/default.nix b/nixpkgs/pkgs/applications/misc/gcal/default.nix index a3aebf227339..f5eb6e188b7a 100644 --- a/nixpkgs/pkgs/applications/misc/gcal/default.nix +++ b/nixpkgs/pkgs/applications/misc/gcal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "gcal-${version}"; + pname = "gcal"; version = "4.1"; src = fetchurl { - url = "mirror://gnu/gcal/${name}.tar.xz"; + url = "mirror://gnu/gcal/${pname}-${version}.tar.xz"; sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"; }; diff --git a/nixpkgs/pkgs/applications/misc/getxbook/default.nix b/nixpkgs/pkgs/applications/misc/getxbook/default.nix index 2fadc89c48d9..265181d7db3a 100644 --- a/nixpkgs/pkgs/applications/misc/getxbook/default.nix +++ b/nixpkgs/pkgs/applications/misc/getxbook/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "getxbook-${version}"; + pname = "getxbook"; version = "1.2"; src = fetchurl { - url = "https://njw.me.uk/getxbook/${name}.tar.xz"; + url = "https://njw.me.uk/getxbook/${pname}-${version}.tar.xz"; sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; diff --git a/nixpkgs/pkgs/applications/misc/gksu/default.nix b/nixpkgs/pkgs/applications/misc/gksu/default.nix index 4af776674e63..b5d008579ac7 100644 --- a/nixpkgs/pkgs/applications/misc/gksu/default.nix +++ b/nixpkgs/pkgs/applications/misc/gksu/default.nix @@ -5,10 +5,9 @@ stdenv.mkDerivation rec { version = "2.0.2"; pname = "gksu"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${name}.tar.gz"; + url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; }; diff --git a/nixpkgs/pkgs/applications/misc/glava/default.nix b/nixpkgs/pkgs/applications/misc/glava/default.nix index 3831780c7919..6f5146161a6d 100644 --- a/nixpkgs/pkgs/applications/misc/glava/default.nix +++ b/nixpkgs/pkgs/applications/misc/glava/default.nix @@ -21,7 +21,7 @@ let ''; in stdenv.mkDerivation rec { - name = "glava-${version}"; + pname = "glava"; version = "1.6.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/gmrun/default.nix b/nixpkgs/pkgs/applications/misc/gmrun/default.nix index 47fb50242c1d..8a54cefaab04 100644 --- a/nixpkgs/pkgs/applications/misc/gmrun/default.nix +++ b/nixpkgs/pkgs/applications/misc/gmrun/default.nix @@ -5,10 +5,11 @@ let in stdenv.mkDerivation rec { - name = "gmrun-${version}"; + pname = "gmrun"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/gmrun/${name}.tar.gz"; + url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz"; sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; diff --git a/nixpkgs/pkgs/applications/misc/gmtp/default.nix b/nixpkgs/pkgs/applications/misc/gmtp/default.nix index bb1556c7c4dc..c8bbcf2aa7f3 100644 --- a/nixpkgs/pkgs/applications/misc/gmtp/default.nix +++ b/nixpkgs/pkgs/applications/misc/gmtp/default.nix @@ -5,7 +5,8 @@ let version = "1.3.11"; in stdenv.mkDerivation { - name = "gmtp-${version}"; + pname = "gmtp"; + inherit version; src = fetchurl { url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/nixpkgs/pkgs/applications/misc/go-jira/default.nix index b80ddb8f303f..f8da250dbc79 100644 --- a/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-jira-${version}"; + pname = "go-jira"; version = "1.0.17"; goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1"; diff --git a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index 0af84365158e..7fba1d49d747 100644 --- a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -15,7 +15,7 @@ let categories = "Application;Utility;"; }; in mkDerivation rec { - name = "golden-cheetah-${version}"; + pname = "golden-cheetah"; version = "3.5-DEV1903"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/gollum/default.nix b/nixpkgs/pkgs/applications/misc/gollum/default.nix index 62f2d7a069d9..e9a177ee1937 100644 --- a/nixpkgs/pkgs/applications/misc/gollum/default.nix +++ b/nixpkgs/pkgs/applications/misc/gollum/default.nix @@ -2,7 +2,6 @@ , git }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "gollum"; # nix-shell -p bundix icu zlib version = (import ./gemset.nix).gollum.version; @@ -10,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; inherit pname ruby; gemdir = ./.; }; diff --git a/nixpkgs/pkgs/applications/misc/googleearth/default.nix b/nixpkgs/pkgs/applications/misc/googleearth/default.nix index 0fccf83acf76..961efe4b0576 100644 --- a/nixpkgs/pkgs/applications/misc/googleearth/default.nix +++ b/nixpkgs/pkgs/applications/misc/googleearth/default.nix @@ -40,7 +40,8 @@ let ]; in stdenv.mkDerivation rec { - name = "googleearth-${version}"; + pname = "googleearth"; + inherit version; src = fetchurl { url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb"; inherit sha256; diff --git a/nixpkgs/pkgs/applications/misc/googler/default.nix b/nixpkgs/pkgs/applications/misc/googler/default.nix index 3dcbcaf38b87..12eb8839b8a8 100644 --- a/nixpkgs/pkgs/applications/misc/googler/default.nix +++ b/nixpkgs/pkgs/applications/misc/googler/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.9"; - name = "googler-${version}"; + pname = "googler"; src = fetchFromGitHub { owner = "jarun"; diff --git a/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix b/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix index 4143f6fde559..9954ff660adc 100644 --- a/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpg-mdp/default.nix @@ -3,7 +3,8 @@ let version = "0.7.4"; in stdenv.mkDerivation { # mdp renamed to gpg-mdp because there is a mdp package already. - name = "gpg-mdp-${version}"; + pname = "gpg-mdp"; + inherit version; meta = { homepage = https://tamentis.com/projects/mdp/; license = [stdenv.lib.licenses.isc]; diff --git a/nixpkgs/pkgs/applications/misc/gphoto2/gphotofs.nix b/nixpkgs/pkgs/applications/misc/gphoto2/gphotofs.nix index 7b23fca2121e..c1c2a44bd7f2 100644 --- a/nixpkgs/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/nixpkgs/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }: stdenv.mkDerivation rec { - name = "gphoto2fs-${version}"; + pname = "gphoto2fs"; version = "0.5.0"; src = fetchurl { url="mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index aa0ed5f64632..9d244ca18f32 100644 --- a/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: stdenv.mkDerivation rec { - name = "gpsbabel-${version}"; + pname = "gpsbabel"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index 4f0c1864677c..9c0dc48d42ee 100644 --- a/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }: stdenv.mkDerivation rec { - name = "gpsprune-${version}"; + pname = "gpsprune"; version = "19.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix b/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix index 735818171e80..04ab062c1a1b 100644 --- a/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gpx-viewer-${version}"; + pname = "gpx-viewer"; version = "0.4.0"; src = fetchurl { - url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80"; }; diff --git a/nixpkgs/pkgs/applications/misc/gpx/default.nix b/nixpkgs/pkgs/applications/misc/gpx/default.nix index 9fef93819492..a341a212a37f 100644 --- a/nixpkgs/pkgs/applications/misc/gpx/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "gpx-${version}"; + pname = "gpx"; version = "2.5.2"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/misc/gramps/default.nix b/nixpkgs/pkgs/applications/misc/gramps/default.nix index e9026ded4702..84be50ccb5e5 100644 --- a/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -10,7 +10,7 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { version = "5.0.1"; - name = "gramps-${version}"; + pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] @@ -48,7 +48,7 @@ in buildPythonApplication rec { eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth if [ -e "$eapth" ]; then # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${name}.pth + mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth fi rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* diff --git a/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix index cb4f4748eec1..308f084bd586 100644 --- a/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: stdenv.mkDerivation rec { - name = "green-pdfviewer-${version}"; + pname = "green-pdfviewer"; version = "nightly-2014-04-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index 9274c2d05216..87e636b9c030 100644 --- a/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -1,7 +1,7 @@ { fetchzip, stdenv, makeWrapper, openjdk }: stdenv.mkDerivation rec { - name = "gremlin-console-${version}"; + pname = "gremlin-console"; version = "3.3.4"; src = fetchzip { url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; diff --git a/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix b/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix index 7f3b3a8d6dc5..ea78331e4764 100644 --- a/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix +++ b/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: stdenv.mkDerivation rec { - name = "gsimplecal-${version}"; + pname = "gsimplecal"; version = "2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix index 8f683272e120..204624f24390 100644 --- a/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.1"; - name = "gtk2fontsel-${version}"; + pname = "gtk2fontsel"; src = fetchurl { - url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz"; + url = "mirror://sourceforge/gtk2fontsel/${pname}-${version}.tar.gz"; sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; }; diff --git a/nixpkgs/pkgs/applications/misc/gummi/default.nix b/nixpkgs/pkgs/applications/misc/gummi/default.nix index 1e237923d054..f0026cac52e0 100644 --- a/nixpkgs/pkgs/applications/misc/gummi/default.nix +++ b/nixpkgs/pkgs/applications/misc/gummi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.6"; - name = "gummi-${version}"; + pname = "gummi"; src = pkgs.fetchFromGitHub { owner = "alexandervdm"; diff --git a/nixpkgs/pkgs/applications/misc/gxmessage/default.nix b/nixpkgs/pkgs/applications/misc/gxmessage/default.nix index a9e6d905c284..a7313e7c969b 100644 --- a/nixpkgs/pkgs/applications/misc/gxmessage/default.nix +++ b/nixpkgs/pkgs/applications/misc/gxmessage/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gxmessage-${version}"; + pname = "gxmessage"; version = "3.4.3"; src = fetchurl { - url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz"; + url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz"; sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; diff --git a/nixpkgs/pkgs/applications/misc/hdate/default.nix b/nixpkgs/pkgs/applications/misc/hdate/default.nix index e2f5f653d47c..989dfb886ec3 100644 --- a/nixpkgs/pkgs/applications/misc/hdate/default.nix +++ b/nixpkgs/pkgs/applications/misc/hdate/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.02"; - name = "hdate-${version}"; + pname = "hdate"; src = fetchurl { url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2"; sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762"; diff --git a/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix index 1647a09edfd6..a2d2e8ad735c 100644 --- a/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix +++ b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix @@ -1,7 +1,7 @@ { stdenv, runtimeShell }: stdenv.mkDerivation rec { - name = "example-unfree-package-${version}"; + pname = "example-unfree-package"; version = "1.0"; phases = [ "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/applications/misc/hello/default.nix b/nixpkgs/pkgs/applications/misc/hello/default.nix index 63a8af99f7cf..8bae8ce373c7 100644 --- a/nixpkgs/pkgs/applications/misc/hello/default.nix +++ b/nixpkgs/pkgs/applications/misc/hello/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-${version}"; + pname = "hello"; version = "2.10"; src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; + url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; }; diff --git a/nixpkgs/pkgs/applications/misc/hivemind/default.nix b/nixpkgs/pkgs/applications/misc/hivemind/default.nix index 0431f35057be..84f5bad24d21 100644 --- a/nixpkgs/pkgs/applications/misc/hivemind/default.nix +++ b/nixpkgs/pkgs/applications/misc/hivemind/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "hivemind-${version}"; + pname = "hivemind"; version = "1.0.4"; goPackagePath = "github.com/DarthSim/hivemind"; diff --git a/nixpkgs/pkgs/applications/misc/houdini/runtime.nix b/nixpkgs/pkgs/applications/misc/houdini/runtime.nix index 500f1df36a0c..88c87eaca871 100644 --- a/nixpkgs/pkgs/applications/misc/houdini/runtime.nix +++ b/nixpkgs/pkgs/applications/misc/houdini/runtime.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { version = "17.0.352"; - name = "houdini-runtime-${version}"; + pname = "houdini-runtime"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; sha256 = "0cl5fkgaplb0cvv7mli06ffc9j4ngpy8hl5zqabj3d645gcgafjg"; diff --git a/nixpkgs/pkgs/applications/misc/hr/default.nix b/nixpkgs/pkgs/applications/misc/hr/default.nix index 2fd56e3c5552..437c42b03317 100644 --- a/nixpkgs/pkgs/applications/misc/hr/default.nix +++ b/nixpkgs/pkgs/applications/misc/hr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hr-${version}"; + pname = "hr"; version = "1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/hstr/default.nix b/nixpkgs/pkgs/applications/misc/hstr/default.nix index 7cdf1a319f69..0d25d3d686c9 100644 --- a/nixpkgs/pkgs/applications/misc/hstr/default.nix +++ b/nixpkgs/pkgs/applications/misc/hstr/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, pkgconfig, gettext }: stdenv.mkDerivation rec { - name = "hstr-${version}"; + pname = "hstr"; version = "2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index acdeec10d300..b2997ece5d56 100644 --- a/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -17,7 +17,8 @@ let in stdenv.mkDerivation { - name = "hubstaff-${version}"; + pname = "hubstaff"; + inherit version; src = fetchurl { inherit sha256 url; }; diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/revision.json b/nixpkgs/pkgs/applications/misc/hubstaff/revision.json index 513e5bef442a..3170a63379cf 100644 --- a/nixpkgs/pkgs/applications/misc/hubstaff/revision.json +++ b/nixpkgs/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.9-86828309/Hubstaff-1.4.9-86828309.sh", - "version": "1.4.9-86828309", - "sha256": "0p9b7s2damzxmbrm8m97bj06g0faslbjw51dmxq8icz6ldbqsspx" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh", + "version": "1.4.10-848554d6", + "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z" } diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 2b49a5ae9a97..034b9c79201a 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "hugo-${version}"; + pname = "hugo"; version = "0.57.2"; goPackagePath = "github.com/gohugoio/hugo"; diff --git a/nixpkgs/pkgs/applications/misc/hyper/default.nix b/nixpkgs/pkgs/applications/misc/hyper/default.nix index f8d808a49c29..f21675e60b2d 100644 --- a/nixpkgs/pkgs/applications/misc/hyper/default.nix +++ b/nixpkgs/pkgs/applications/misc/hyper/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { version = "2.1.2"; - name = "hyper-${version}"; + pname = "hyper"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm"; diff --git a/nixpkgs/pkgs/applications/misc/icesl/default.nix b/nixpkgs/pkgs/applications/misc/icesl/default.nix index c0c1faef09d2..c197e1a8fd38 100644 --- a/nixpkgs/pkgs/applications/misc/icesl/default.nix +++ b/nixpkgs/pkgs/applications/misc/icesl/default.nix @@ -3,7 +3,7 @@ let lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; in stdenv.mkDerivation rec { - name = "iceSL-${version}"; + pname = "iceSL"; version = "2.1.10"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { diff --git a/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix b/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix index d9bccee889ab..7daa2704e22b 100644 --- a/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix +++ b/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "ipmicfg-${version}"; + pname = "ipmicfg"; version = "1.29.0"; buildVersion = "181029"; diff --git a/nixpkgs/pkgs/applications/misc/ipmiview/default.nix b/nixpkgs/pkgs/applications/misc/ipmiview/default.nix index b5fa9143ddbb..64e0f0d325b5 100644 --- a/nixpkgs/pkgs/applications/misc/ipmiview/default.nix +++ b/nixpkgs/pkgs/applications/misc/ipmiview/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - name = "IPMIView-${version}"; + pname = "IPMIView"; version = "2.14.0"; buildVersion = "180213"; diff --git a/nixpkgs/pkgs/applications/misc/iterm2/default.nix b/nixpkgs/pkgs/applications/misc/iterm2/default.nix index e493226be60a..d63576d5cbd0 100644 --- a/nixpkgs/pkgs/applications/misc/iterm2/default.nix +++ b/nixpkgs/pkgs/applications/misc/iterm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "iterm2-${version}"; + pname = "iterm2"; version = "3.0.14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/jbidwatcher/default.nix b/nixpkgs/pkgs/applications/misc/jbidwatcher/default.nix index 5939d7789b4e..c8951059d4c8 100644 --- a/nixpkgs/pkgs/applications/misc/jbidwatcher/default.nix +++ b/nixpkgs/pkgs/applications/misc/jbidwatcher/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "jbidwatcher"; version = "2.5.6"; - name = "${pname}-${version}"; - src = fetchurl { url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar"; sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr"; diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 8838de9ac961..56b28dbc8db9 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }: stdenv.mkDerivation rec { - name = "josm-${version}"; + pname = "josm"; version = "15238"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/jp2a/default.nix b/nixpkgs/pkgs/applications/misc/jp2a/default.nix index 138ee397d3fd..2a9e162e7ea9 100644 --- a/nixpkgs/pkgs/applications/misc/jp2a/default.nix +++ b/nixpkgs/pkgs/applications/misc/jp2a/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.7"; - name = "jp2a-${version}"; + pname = "jp2a"; src = fetchFromGitHub { owner = "cslarsen"; diff --git a/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix index 7c5845b35419..9391fe88c5ea 100644 --- a/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix +++ b/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "k2pdfopt-${version}"; + pname = "k2pdfopt"; version = "2.51a"; src = (fetchzip { diff --git a/nixpkgs/pkgs/applications/misc/kanboard/default.nix b/nixpkgs/pkgs/applications/misc/kanboard/default.nix index ecfcc7717281..0a42d5e4f289 100644 --- a/nixpkgs/pkgs/applications/misc/kanboard/default.nix +++ b/nixpkgs/pkgs/applications/misc/kanboard/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "kanboard-${version}"; + pname = "kanboard"; version = "1.2.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/kdbplus/default.nix b/nixpkgs/pkgs/applications/misc/kdbplus/default.nix index b518481e29ad..2af091b0df38 100644 --- a/nixpkgs/pkgs/applications/misc/kdbplus/default.nix +++ b/nixpkgs/pkgs/applications/misc/kdbplus/default.nix @@ -7,7 +7,7 @@ let [ stdenv.cc.libc stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "kdbplus-${version}"; + pname = "kdbplus"; version = "3.3"; src = requireFile { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; phases = "unpackPhase installPhase"; - unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}"; + unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}"; installPhase = '' mkdir -p $out/bin $out/libexec diff --git a/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index 80bf5deceb16..c3d260774435 100644 --- a/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -3,7 +3,8 @@ let version = "0.10.1"; drv = stdenv.mkDerivation { - name = "keeagent-${version}"; + pname = "keeagent"; + inherit version; src = fetchzip { url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; diff --git a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index e64632d529b1..76ea9df78c25 100644 --- a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -3,7 +3,8 @@ let version = "1.8.4.2"; drv = stdenv.mkDerivation { - name = "keepasshttp-${version}"; + pname = "keepasshttp"; + inherit version; src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; diff --git a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index b45cb24b1b51..562835159eb3 100644 --- a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -3,7 +3,8 @@ let version = "1.8.0"; drv = stdenv.mkDerivation { - name = "keepassrpc-${version}"; + pname = "keepassrpc"; + inherit version; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd"; diff --git a/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix b/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix index 8a3aaf202a70..36734a97516b 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: stdenv.mkDerivation rec { - name = "keepassx2-${version}"; + pname = "keepassx2"; version = "2.0.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/nixpkgs/pkgs/applications/misc/keepassx/community.nix index 594bf1eb75ae..b1c849b6bcee 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -31,7 +31,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "keepassxc-${version}"; + pname = "keepassxc"; version = "2.4.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/keepassx/default.nix b/nixpkgs/pkgs/applications/misc/keepassx/default.nix index 05ad9b05abb0..7adbcb86c501 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: stdenv.mkDerivation rec { - name = "keepassx-${version}"; + pname = "keepassx"; version = "0.4.4"; src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/${name}.tar.gz"; + url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry"; }; diff --git a/nixpkgs/pkgs/applications/misc/khard/default.nix b/nixpkgs/pkgs/applications/misc/khard/default.nix index 4fb2227ee202..99b9c38d53f8 100644 --- a/nixpkgs/pkgs/applications/misc/khard/default.nix +++ b/nixpkgs/pkgs/applications/misc/khard/default.nix @@ -18,7 +18,7 @@ let in with python.pkgs; buildPythonApplication rec { version = "0.14.0"; - name = "khard-${version}"; + pname = "khard"; namePrefix = ""; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/kiwix/default.nix b/nixpkgs/pkgs/applications/misc/kiwix/default.nix index 01aef93e5e5f..89778f670ff3 100644 --- a/nixpkgs/pkgs/applications/misc/kiwix/default.nix +++ b/nixpkgs/pkgs/applications/misc/kiwix/default.nix @@ -31,10 +31,10 @@ let pugixml = stdenv.mkDerivation rec { version = "1.2"; - name = "pugixml-${version}"; + pname = "pugixml"; src = fetchurl { - url = "http://download.kiwix.org/dev/${name}.tar.gz"; + url = "http://download.kiwix.org/dev/${pname}-${version}.tar.gz"; sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; }; @@ -42,8 +42,8 @@ let unpackPhase = '' # not a nice src archive: all the files are in the root :( - mkdir ${name} - cd ${name} + mkdir ${pname}-${version} + cd ${pname}-${version} tar -xf ${src} # and the build scripts are in there :'( @@ -54,7 +54,7 @@ let in stdenv.mkDerivation rec { - name = "kiwix-${version}"; + pname = "kiwix"; version = "0.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/krusader/default.nix b/nixpkgs/pkgs/applications/misc/krusader/default.nix index 70915ca87073..cf81d572c611 100644 --- a/nixpkgs/pkgs/applications/misc/krusader/default.nix +++ b/nixpkgs/pkgs/applications/misc/krusader/default.nix @@ -8,10 +8,11 @@ let pname = "krusader"; version = "2.7.1"; in mkDerivation rec { - name = "krusader-${version}"; + pname = "krusader"; + inherit version; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm"; }; diff --git a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index bdbdef45fe7b..0bd919944185 100644 --- a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -4,12 +4,11 @@ mkDerivation rec { pname = "latte-dock"; version = "0.8.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj"; - name = "${name}.tar.xz"; + name = "${pname}-${version}.tar.xz"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; diff --git a/nixpkgs/pkgs/applications/misc/lenmus/default.nix b/nixpkgs/pkgs/applications/misc/lenmus/default.nix index 9018a5926424..76abe7c9b4b3 100644 --- a/nixpkgs/pkgs/applications/misc/lenmus/default.nix +++ b/nixpkgs/pkgs/applications/misc/lenmus/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "lenmus-${version}"; + pname = "lenmus"; version = "5.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/libosmocore/default.nix b/nixpkgs/pkgs/applications/misc/libosmocore/default.nix index 999665bf6bb5..846ce3098425 100644 --- a/nixpkgs/pkgs/applications/misc/libosmocore/default.nix +++ b/nixpkgs/pkgs/applications/misc/libosmocore/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libosmocore-${version}"; + pname = "libosmocore"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/librecad/default.nix b/nixpkgs/pkgs/applications/misc/librecad/default.nix index c049ed2374fd..09089a072b3c 100644 --- a/nixpkgs/pkgs/applications/misc/librecad/default.nix +++ b/nixpkgs/pkgs/applications/misc/librecad/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { version = "2.1.3"; - name = "librecad-${version}"; + pname = "librecad"; src = fetchurl { url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; - name = name + ".tar.gz"; + name = "${pname}-${version}" + ".tar.gz"; sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx"; }; diff --git a/nixpkgs/pkgs/applications/misc/lilyterm/default.nix b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix index 948ae7b14a11..38078d11931b 100644 --- a/nixpkgs/pkgs/applications/misc/lilyterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { - name = "lilyterm-${version}"; + pname = "lilyterm"; inherit (stuff) src version; diff --git a/nixpkgs/pkgs/applications/misc/llpp/default.nix b/nixpkgs/pkgs/applications/misc/llpp/default.nix index 5ae652d750d1..c66ef21416be 100644 --- a/nixpkgs/pkgs/applications/misc/llpp/default.nix +++ b/nixpkgs/pkgs/applications/misc/llpp/default.nix @@ -4,7 +4,7 @@ libGLU_combined, freetype, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { - name = "llpp-${version}"; + pname = "llpp"; version = "30"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix index 4972aa28e589..42905fa3cb41 100644 --- a/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix +++ b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "ltwheelconf"; version = "0.2.7"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "thk"; diff --git a/nixpkgs/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix index 7ccd4d6e5e90..5435080e8318 100644 --- a/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -30,7 +30,7 @@ let ]; in buildPythonApplication rec { - name = "lutris-original-${version}"; + pname = "lutris-original"; version = "0.5.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/lxterminal/default.nix b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix index 4fd86a5a4f52..8ce353e85b91 100644 --- a/nixpkgs/pkgs/applications/misc/lxterminal/default.nix +++ b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix @@ -5,7 +5,8 @@ let version = "0.3.2"; in stdenv.mkDerivation rec { - name = "lxterminal-${version}"; + pname = "lxterminal"; + inherit version; src = fetchurl { url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/lyx/default.nix b/nixpkgs/pkgs/applications/misc/lyx/default.nix index ad3bd499cde9..744d124f84d5 100644 --- a/nixpkgs/pkgs/applications/misc/lyx/default.nix +++ b/nixpkgs/pkgs/applications/misc/lyx/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "2.3.0"; - name = "lyx-${version}"; + pname = "lyx"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz"; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri"; }; diff --git a/nixpkgs/pkgs/applications/misc/madonctl/default.nix b/nixpkgs/pkgs/applications/misc/madonctl/default.nix index f2dacb7890f0..9a134343d296 100644 --- a/nixpkgs/pkgs/applications/misc/madonctl/default.nix +++ b/nixpkgs/pkgs/applications/misc/madonctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "madonctl-${version}"; + pname = "madonctl"; version = "1.1.0"; goPackagePath = "github.com/McKael/madonctl"; diff --git a/nixpkgs/pkgs/applications/misc/makeself/default.nix b/nixpkgs/pkgs/applications/misc/makeself/default.nix index a6af1762e289..f2585f781465 100644 --- a/nixpkgs/pkgs/applications/misc/makeself/default.nix +++ b/nixpkgs/pkgs/applications/misc/makeself/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; - name = "makeself-${version}"; + pname = "makeself"; src = fetchFromGitHub { owner = "megastep"; @@ -15,15 +15,15 @@ stdenv.mkDerivation rec { patches = [ ./Use-rm-from-PATH.patch ]; postPatch = '' - sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh + sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh ''; installPhase = '' - mkdir -p $out/{bin,share/{${name},man/man1}} - cp makeself.lsm README.md $out/share/${name} + mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} + cp makeself.lsm README.md $out/share/${pname}-${version} cp makeself.sh $out/bin/makeself cp makeself.1 $out/share/man/man1/ - cp makeself-header.sh $out/share/${name} + cp makeself-header.sh $out/share/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix index eb0e61ba6d73..1474ea2fc4f2 100644 --- a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix @@ -4,7 +4,8 @@ let version = "5.4.10"; in stdenv.mkDerivation { - name = "masterpdfeditor-${version}"; + pname = "masterpdfeditor"; + inherit version; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/mdp/default.nix b/nixpkgs/pkgs/applications/misc/mdp/default.nix index 6c58dde00d36..03f30d64fb2d 100644 --- a/nixpkgs/pkgs/applications/misc/mdp/default.nix +++ b/nixpkgs/pkgs/applications/misc/mdp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.15"; - name = "mdp-${version}"; + pname = "mdp"; src = fetchFromGitHub { owner = "visit1985"; diff --git a/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index 8e6965bfc4fe..9eb4a0897d4f 100644 --- a/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "19.07"; - name = "mediainfo-gui-${version}"; + pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; diff --git a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index 601e8c611e4b..98d5ef72b224 100644 --- a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "19.07"; - name = "mediainfo-${version}"; + pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; diff --git a/nixpkgs/pkgs/applications/misc/megasync/default.nix b/nixpkgs/pkgs/applications/misc/megasync/default.nix index bcfd1adb4b44..bc753c5a7a9a 100644 --- a/nixpkgs/pkgs/applications/misc/megasync/default.nix +++ b/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -26,7 +26,7 @@ }: mkDerivation rec { - name = "megasync-${version}"; + pname = "megasync"; version = "4.2.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/memo/default.nix b/nixpkgs/pkgs/applications/misc/memo/default.nix index 0b802bedf8d7..ed0bbc4cb488 100644 --- a/nixpkgs/pkgs/applications/misc/memo/default.nix +++ b/nixpkgs/pkgs/applications/misc/memo/default.nix @@ -7,7 +7,7 @@ assert pandocSupport -> pandoc != null; stdenv.mkDerivation rec { - name = "memo-${version}"; + pname = "memo"; version = "0.8"; diff --git a/nixpkgs/pkgs/applications/misc/menumaker/default.nix b/nixpkgs/pkgs/applications/misc/menumaker/default.nix index 718f2e46fa00..e06f2a88ade4 100644 --- a/nixpkgs/pkgs/applications/misc/menumaker/default.nix +++ b/nixpkgs/pkgs/applications/misc/menumaker/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "menumaker-${version}"; + pname = "menumaker"; version = "0.99.11"; src = fetchurl { - url = "mirror://sourceforge/menumaker/${name}.tar.gz"; + url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz"; sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx"; }; diff --git a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix index dec55e9c1e5c..3023a5b5930c 100644 --- a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix +++ b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix @@ -2,7 +2,7 @@ , qtbase, qtsvg, qtwebkit }: stdenv.mkDerivation rec { - name = "merkaartor-${version}"; + pname = "merkaartor"; version = "0.18.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix index 602d4a032efd..318c7c252427 100644 --- a/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix +++ b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "metamorphose2-${version}"; + pname = "metamorphose2"; version = "0.9.0beta"; # exif-py vendored via submodule diff --git a/nixpkgs/pkgs/applications/misc/milu/default.nix b/nixpkgs/pkgs/applications/misc/milu/default.nix index 09c4d1db2904..6c1dcd5e1505 100644 --- a/nixpkgs/pkgs/applications/misc/milu/default.nix +++ b/nixpkgs/pkgs/applications/misc/milu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: stdenv.mkDerivation rec { - name = "milu-nightly-${version}"; + pname = "milu-nightly"; version = "2016-05-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix index 6aa7eea3d7e9..95ceaddb4f03 100644 --- a/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.2"; - name = "minergate-cli-${version}"; + pname = "minergate-cli"; src = fetchurl { url = "https://minergate.com/download/ubuntu-cli"; sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8"; diff --git a/nixpkgs/pkgs/applications/misc/minergate/default.nix b/nixpkgs/pkgs/applications/misc/minergate/default.nix index d11e889e932c..fdd1238d8700 100644 --- a/nixpkgs/pkgs/applications/misc/minergate/default.nix +++ b/nixpkgs/pkgs/applications/misc/minergate/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.1"; - name = "minergate-${version}"; + pname = "minergate"; src = fetchurl { url = "https://minergate.com/download/ubuntu"; sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; diff --git a/nixpkgs/pkgs/applications/misc/mlterm/default.nix b/nixpkgs/pkgs/applications/misc/mlterm/default.nix index 46ba9d450c8f..d3e7f9e8cd46 100644 --- a/nixpkgs/pkgs/applications/misc/mlterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/mlterm/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "mlterm-${version}"; + pname = "mlterm"; version = "3.8.8"; src = fetchurl { - url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k"; }; diff --git a/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix index 920c1c3f095b..08f510a2840e 100644 --- a/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "moonlight-embedded-${version}"; + pname = "moonlight-embedded"; version = "2.4.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/mop/default.nix b/nixpkgs/pkgs/applications/misc/mop/default.nix index b9179bbe5463..c0d41cda02dd 100644 --- a/nixpkgs/pkgs/applications/misc/mop/default.nix +++ b/nixpkgs/pkgs/applications/misc/mop/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "mop-${version}"; + pname = "mop"; version = "0.2.0"; rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; diff --git a/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix b/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix index eea166d8df75..0e8cc2ebcea9 100644 --- a/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix +++ b/nixpkgs/pkgs/applications/misc/mqtt-bench/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "mqtt-bench-${version}"; + pname = "mqtt-bench"; version = "0.3.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/nixpkgs/pkgs/applications/misc/mupdf/default.nix index 38f5075d10f2..9219c4e2e423 100644 --- a/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -15,10 +15,10 @@ let in stdenv.mkDerivation rec { version = "1.14.0"; - name = "mupdf-${version}"; + pname = "mupdf"; src = fetchurl { - url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; + url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4"; }; diff --git a/nixpkgs/pkgs/applications/misc/mwic/default.nix b/nixpkgs/pkgs/applications/misc/mwic/default.nix index c08a21e87978..249d9ff1d400 100644 --- a/nixpkgs/pkgs/applications/misc/mwic/default.nix +++ b/nixpkgs/pkgs/applications/misc/mwic/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.7.7"; - name = "mwic-${version}"; + pname = "mwic"; src = fetchurl { - url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0l4anwiiqclymx0awwn4hzaj8n26ycg8nz76wjphsyscn7z2awad"; }; diff --git a/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index cccd36d7ead8..172f999223a8 100644 --- a/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -14,7 +14,6 @@ let in stdenv.mkDerivation rec { pname = "mysql-workbench"; version = "8.0.15"; - name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/mystem/default.nix b/nixpkgs/pkgs/applications/misc/mystem/default.nix index 45b83b727485..deecc92d9934 100644 --- a/nixpkgs/pkgs/applications/misc/mystem/default.nix +++ b/nixpkgs/pkgs/applications/misc/mystem/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mystem-${version}"; + pname = "mystem"; version = "3.1"; src = fetchurl { - url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz"; + url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz"; sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10"; }; diff --git a/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix b/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix index 022829040b81..b4d97c368ea2 100644 --- a/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix +++ b/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.5-rc1"; - name = "nanoblogger-${version}"; + pname = "nanoblogger"; src = fetchurl { - url = "mirror://sourceforge/nanoblogger/${name}.tar.gz"; + url = "mirror://sourceforge/nanoblogger/${pname}-${version}.tar.gz"; sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq"; }; diff --git a/nixpkgs/pkgs/applications/misc/navit/default.nix b/nixpkgs/pkgs/applications/misc/navit/default.nix index e8497dbc7bda..4d95f0b52388 100644 --- a/nixpkgs/pkgs/applications/misc/navit/default.nix +++ b/nixpkgs/pkgs/applications/misc/navit/default.nix @@ -17,7 +17,7 @@ assert speechdSupport -> speechd != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "navit-${version}"; + pname = "navit"; version = "0.5.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/neap/default.nix b/nixpkgs/pkgs/applications/misc/neap/default.nix index 21a5ab0cd0f6..4104d35cf10c 100644 --- a/nixpkgs/pkgs/applications/misc/neap/default.nix +++ b/nixpkgs/pkgs/applications/misc/neap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { - name = "neap-${version}"; + pname = "neap"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix index 0bb86fdca955..c1ba5ba23b1e 100644 --- a/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix +++ b/nixpkgs/pkgs/applications/misc/netsurf/browser/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { - name = "netsurf-${version}"; + pname = "netsurf"; version = "3.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix index adba36329359..36d5a70735a7 100644 --- a/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/nixpkgs/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "netsurf-buildsystem-${version}"; + pname = "netsurf-buildsystem"; version = "1.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix index f343a886283b..88ac4f0c3eb9 100644 --- a/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix +++ b/nixpkgs/pkgs/applications/misc/netsurf/nsgenbind/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "netsurf-nsgenbind-${version}"; + pname = "netsurf-nsgenbind"; version = "0.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/nix-tour/default.nix b/nixpkgs/pkgs/applications/misc/nix-tour/default.nix index 1cc7f419aa2e..31afed3061a3 100644 --- a/nixpkgs/pkgs/applications/misc/nix-tour/default.nix +++ b/nixpkgs/pkgs/applications/misc/nix-tour/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, electron, runtimeShell } : stdenv.mkDerivation rec { - name = "nix-tour-${version}"; + pname = "nix-tour"; version = "0.0.1"; buildInputs = [ electron ]; diff --git a/nixpkgs/pkgs/applications/misc/nixnote2/default.nix b/nixpkgs/pkgs/applications/misc/nixnote2/default.nix index 145abfba5d5c..dec8b4ba0a7c 100644 --- a/nixpkgs/pkgs/applications/misc/nixnote2/default.nix +++ b/nixpkgs/pkgs/applications/misc/nixnote2/default.nix @@ -2,7 +2,7 @@ , qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { - name = "nixnote2-${version}"; + pname = "nixnote2"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/noice/default.nix b/nixpkgs/pkgs/applications/misc/noice/default.nix index bcf2edd8f2f6..db8139122bab 100644 --- a/nixpkgs/pkgs/applications/misc/noice/default.nix +++ b/nixpkgs/pkgs/applications/misc/noice/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "noice-${version}"; + pname = "noice"; version = "0.6"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix b/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix index d4f3db4ca6f9..4568c3e8acc1 100644 --- a/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/nixpkgs/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -13,7 +13,7 @@ let baseURI = "https://launchpad.net/~leolik/+archive/leolik"; in stdenv.mkDerivation rec { - name = "notify-osd-${version}"; + pname = "notify-osd"; version = "0.9.35+16.04.20160415"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/notify-osd/default.nix b/nixpkgs/pkgs/applications/misc/notify-osd/default.nix index 5c60c7412c4a..484ff62e9e68 100644 --- a/nixpkgs/pkgs/applications/misc/notify-osd/default.nix +++ b/nixpkgs/pkgs/applications/misc/notify-osd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "notify-osd-${version}"; + pname = "notify-osd"; version = "0.9.34"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/nrsc5/default.nix b/nixpkgs/pkgs/applications/misc/nrsc5/default.nix index 69f74d66dd01..3ad837768421 100644 --- a/nixpkgs/pkgs/applications/misc/nrsc5/default.nix +++ b/nixpkgs/pkgs/applications/misc/nrsc5/default.nix @@ -13,7 +13,8 @@ let version = "1.0"; in stdenv.mkDerivation { - name = "nrsc5-${version}"; + pname = "nrsc5"; + inherit version; src = fetchFromGitHub { owner = "theori-io"; diff --git a/nixpkgs/pkgs/applications/misc/ola/default.nix b/nixpkgs/pkgs/applications/misc/ola/default.nix index e16d9354bb43..b9529981c7ca 100644 --- a/nixpkgs/pkgs/applications/misc/ola/default.nix +++ b/nixpkgs/pkgs/applications/misc/ola/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ola-${version}"; + pname = "ola"; version = "0.10.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/onboard/default.nix b/nixpkgs/pkgs/applications/misc/onboard/default.nix index de2f86e9f9a2..79e3317e64da 100644 --- a/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -29,14 +29,22 @@ }: let - customHunspell = hunspellWithDicts [hunspellDicts.en-us]; + + customHunspell = hunspellWithDicts [ + hunspellDicts.en-us + ]; + majorVersion = "1.4"; + +in + +python3.pkgs.buildPythonApplication rec { + pname = "onboard"; version = "${majorVersion}.1"; -in python3.pkgs.buildPythonApplication rec { - name = "onboard-${version}"; + src = fetchurl { - url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz"; - sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865"; + url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "0r9q38ikmr4in4dwqd8m9gh9xjbgxnfxglnjbfcapw8ybfnf3jh1"; }; patches = [ @@ -48,62 +56,62 @@ in python3.pkgs.buildPythonApplication rec { ./hunspell-use-xdg-datadirs.patch ]; - # For tests - LC_ALL = "en_US.UTF-8"; - doCheck = false; - checkInputs = [ - # for Onboard.SpellChecker.aspell_cmd doctests - (aspellWithDicts (dicts: with dicts; [ en ])) - - # for Onboard.SpellChecker.hunspell_cmd doctests - customHunspell - - # for Onboard.SpellChecker.hunspell doctests - hunspellDicts.en-us - hunspellDicts.es-es - hunspellDicts.it-it - - python3.pkgs.nose - ]; - - propagatedBuildInputs = [ - glib - python3 - python3.pkgs.dbus-python - python3.pkgs.distutils_extra - python3.pkgs.pyatspi - python3.pkgs.pycairo - python3.pkgs.pygobject3 - python3.pkgs.systemd + nativeBuildInputs = [ + gobject-introspection + intltool + pkgconfig + wrapGAppsHook ]; buildInputs = [ bash + glib gnome3.dconf gsettings-desktop-schemas gtk3 hunspell isocodes libcanberra-gtk3 + libxkbcommon mousetweaks udev - libxkbcommon - wrapGAppsHook xorg.libXtst xorg.libxkbfile ] ++ stdenv.lib.optional atspiSupport at-spi2-core; - nativeBuildInputs = [ - glibcLocales - gobject-introspection # populate GI_TYPELIB_PATH - intltool - pkgconfig + propagatedBuildInputs = with python3.pkgs; [ + dbus-python + distutils_extra + pyatspi + pycairo + pygobject3 + systemd ]; propagatedUserEnvPkgs = [ gnome3.dconf ]; + checkInputs = [ + # for Onboard.SpellChecker.aspell_cmd doctests + (aspellWithDicts (dicts: with dicts; [ en ])) + + # for Onboard.SpellChecker.hunspell_cmd doctests + customHunspell + + # for Onboard.SpellChecker.hunspell doctests + hunspellDicts.en-us + hunspellDicts.es-es + hunspellDicts.it-it + + python3.pkgs.nose + ]; + + # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + doCheck = false; + preBuild = '' # Unnecessary file, has been removed upstream # https://github.com/NixOS/nixpkgs/pull/24986#issuecomment-296114062 @@ -118,6 +126,9 @@ in python3.pkgs.buildPythonApplication rec { patchShebangs . + substituteInPlace setup.py \ + --replace "/etc" "$out/etc" + substituteInPlace ./Onboard/LanguageSupport.py \ --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \ --replace "/usr/bin/yelp" "${yelp}/bin/yelp" @@ -149,16 +160,22 @@ in python3.pkgs.buildPythonApplication rec { --replace '"killall",' '"${procps}/bin/pkill", "-x",' ''; - postInstall = '' - cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override + installPhase = '' + ${python3.interpreter} setup.py install --prefix="$out" + cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override glib-compile-schemas $out/share/glib-2.0/schemas/ ''; - meta = { + # Remove ubuntu icons. + postFixup = '' + rm -rf $out/share/icons/ubuntu-mono-* + ''; + + meta = with stdenv.lib; { homepage = https://launchpad.net/onboard; - description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users."; - maintainers = with stdenv.lib.maintainers; [ johnramsden ]; - license = stdenv.lib.licenses.gpl3; + description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users"; + maintainers = with maintainers; [ johnramsden ]; + license = licenses.gpl3; }; } diff --git a/nixpkgs/pkgs/applications/misc/oneko/default.nix b/nixpkgs/pkgs/applications/misc/oneko/default.nix index b87f11d7b05d..3a0a548be0b9 100644 --- a/nixpkgs/pkgs/applications/misc/oneko/default.nix +++ b/nixpkgs/pkgs/applications/misc/oneko/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version_name = "1.2.sakura.5"; version = "1.2.5"; - name = "oneko-${version}"; + pname = "oneko"; src = fetchurl { url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; diff --git a/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix b/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix index 8ff9a2f44d55..8f7f74f71232 100644 --- a/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix +++ b/nixpkgs/pkgs/applications/misc/openbox-menu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { - name = "openbox-menu-${version}"; + pname = "openbox-menu"; version = "0.8.0"; src = fetchurl { - url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${pname}-${version}.tar.bz2"; sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; diff --git a/nixpkgs/pkgs/applications/misc/opencpn/default.nix b/nixpkgs/pkgs/applications/misc/opencpn/default.nix index e4f2fd7ce8b9..5c7e7355c662 100644 --- a/nixpkgs/pkgs/applications/misc/opencpn/default.nix +++ b/nixpkgs/pkgs/applications/misc/opencpn/default.nix @@ -2,7 +2,7 @@ gettext, glib, portaudio }: stdenv.mkDerivation rec { - name = "opencpn-${version}"; + pname = "opencpn"; version = "5.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/opentx/default.nix b/nixpkgs/pkgs/applications/misc/opentx/default.nix index cd9a86e7fac7..585c85cbd2c5 100644 --- a/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "opentx-${version}"; + pname = "opentx"; + inherit version; src = fetchFromGitHub { owner = "opentx"; diff --git a/nixpkgs/pkgs/applications/misc/orpie/default.nix b/nixpkgs/pkgs/applications/misc/orpie/default.nix index bc6aa242f338..e404da974c46 100644 --- a/nixpkgs/pkgs/applications/misc/orpie/default.nix +++ b/nixpkgs/pkgs/applications/misc/orpie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages, ncurses, gsl }: stdenv.mkDerivation rec { - name = "orpie-${version}"; + pname = "orpie"; version = "1.5.2"; src = fetchurl { - url = "http://pessimization.com/software/orpie/${name}.tar.gz"; + url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz"; sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy"; }; diff --git a/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix b/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix index 9d0fb3fdeb7c..8ffc8ec69fec 100644 --- a/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix +++ b/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : stdenv.mkDerivation rec { - name = "osm2xmap-${version}"; + pname = "osm2xmap"; version = "2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/osmctools/default.nix b/nixpkgs/pkgs/applications/misc/osmctools/default.nix index bb53782fb7d2..4cbd7cb71190 100644 --- a/nixpkgs/pkgs/applications/misc/osmctools/default.nix +++ b/nixpkgs/pkgs/applications/misc/osmctools/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { - name = "osmctools-${version}"; + pname = "osmctools"; version = "0.8.5plus1.4.0"; buildInputs = [ zlib ]; diff --git a/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix index 2b35cb770389..616949af8836 100644 --- a/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix +++ b/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }: stdenv.mkDerivation rec { - name = "osmium-tool-${version}"; + pname = "osmium-tool"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix index 7fdfbd84d2f6..482ac7ad0667 100644 --- a/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "pcmanx-gtk2-${version}"; + pname = "pcmanx-gtk2"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix index f604684b19a1..bc6f5965e89b 100644 --- a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: pythonPackages.buildPythonApplication rec { - name = "pdf-quench-${version}"; + pname = "pdf-quench"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/pell/default.nix b/nixpkgs/pkgs/applications/misc/pell/default.nix index d55c7a2af12b..fc4e5229c9c0 100644 --- a/nixpkgs/pkgs/applications/misc/pell/default.nix +++ b/nixpkgs/pkgs/applications/misc/pell/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "pell"; version = "0.0.4"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; diff --git a/nixpkgs/pkgs/applications/misc/pgadmin/default.nix b/nixpkgs/pkgs/applications/misc/pgadmin/default.nix index 7e7850668b84..86e10ae0943e 100644 --- a/nixpkgs/pkgs/applications/misc/pgadmin/default.nix +++ b/nixpkgs/pkgs/applications/misc/pgadmin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { - name = "pgadmin3-${version}"; + pname = "pgadmin3"; version = "1.22.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/pgmanage/default.nix b/nixpkgs/pkgs/applications/misc/pgmanage/default.nix index 113a63f7fe18..241d5786468e 100644 --- a/nixpkgs/pkgs/applications/misc/pgmanage/default.nix +++ b/nixpkgs/pkgs/applications/misc/pgmanage/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, postgresql, openssl } : stdenv.mkDerivation rec { - name = "pgmanage-${version}"; + pname = "pgmanage"; version = "11.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/phwmon/default.nix b/nixpkgs/pkgs/applications/misc/phwmon/default.nix index 0cee74522ab2..e8ddec91e62a 100644 --- a/nixpkgs/pkgs/applications/misc/phwmon/default.nix +++ b/nixpkgs/pkgs/applications/misc/phwmon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pythonPackages }: stdenv.mkDerivation rec { - name = "phwmon-${version}"; + pname = "phwmon"; version = "2017-04-10"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/applications/misc/plank/default.nix b/nixpkgs/pkgs/applications/misc/plank/default.nix index d5a071fcb54b..10c8a03fa0a2 100644 --- a/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -1,21 +1,43 @@ -{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 -, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 -, bamf, gdk-pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee -, wrapGAppsHook, autoreconfHook, pantheon }: +{ stdenv +, fetchurl +, vala +, atk +, cairo +, glib +, gnome3 +, gtk3 +, libwnck3 +, libX11 +, libXfixes +, libXi +, pango +, gettext +, pkgconfig +, libxml2 +, bamf +, gdk-pixbuf +, libdbusmenu-gtk3 +, file +, gnome-menus +, libgee +, wrapGAppsHook +, autoreconfHook +, pantheon +}: stdenv.mkDerivation rec { pname = "plank"; - version = "0.11.4"; + version = "0.11.89"; src = fetchurl { url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz"; - sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8"; + sha256 = "17cxlmy7n13jp1v8i4abxyx9hylzb39andhz3mk41ggzmrpa8qm6"; }; nativeBuildInputs = [ autoreconfHook + gettext gnome3.gnome-common - intltool libxml2 # xmllint pkgconfig vala @@ -47,7 +69,9 @@ stdenv.mkDerivation rec { ]; # Make plank's application launcher hidden in Pantheon - patches = [ ./hide-in-pantheon.patch ]; + patches = [ + ./hide-in-pantheon.patch + ]; postPatch = '' substituteInPlace ./configure \ @@ -56,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Elegant, simple, clean dock"; - homepage = https://launchpad.net/plank; + homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; diff --git a/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index b44169adea8d..3ecace18f924 100644 --- a/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "plasma-applet-volumewin7mixer-${version}"; + pname = "plasma-applet-volumewin7mixer"; version = "24"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index e5c096fd2ae5..48188574ad4b 100644 --- a/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix @@ -55,7 +55,8 @@ let libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; in stdenv.mkDerivation { - name = "playonlinux-${version}"; + pname = "playonlinux"; + inherit version; src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/plover/default.nix b/nixpkgs/pkgs/applications/misc/plover/default.nix index 0bd28811d55b..8021ffdc8f51 100644 --- a/nixpkgs/pkgs/applications/misc/plover/default.nix +++ b/nixpkgs/pkgs/applications/misc/plover/default.nix @@ -2,7 +2,7 @@ { stable = with python27Packages; buildPythonPackage rec { - name = "plover-${version}"; + pname = "plover"; version = "3.1.1"; meta = with stdenv.lib; { @@ -24,7 +24,7 @@ }; dev = with python36Packages; buildPythonPackage rec { - name = "plover-${version}"; + pname = "plover"; version = "4.0.0.dev8"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/pmenu/default.nix b/nixpkgs/pkgs/applications/misc/pmenu/default.nix index 4b39e9291a8a..16c49d5f946c 100644 --- a/nixpkgs/pkgs/applications/misc/pmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/pmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, python2Packages, gnome-menus }: stdenv.mkDerivation rec { - name = "pmenu-${version}"; + pname = "pmenu"; version = "2018-01-01"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix index 81e3d80f5167..8413f8c8f102 100644 --- a/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { - name = "polar-bookshelf-${version}"; + pname = "polar-bookshelf"; version = "1.13.10"; # fetching a .deb because there's no easy way to package this Electron app diff --git a/nixpkgs/pkgs/applications/misc/projectlibre/default.nix b/nixpkgs/pkgs/applications/misc/projectlibre/default.nix index 5ba8e1b6e313..344c3d7168ac 100644 --- a/nixpkgs/pkgs/applications/misc/projectlibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/projectlibre/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }: stdenv.mkDerivation rec { - name = "projectlibre-${version}"; + pname = "projectlibre"; version = "1.7.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index cc6f63c0960b..e5d73672eb75 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -8,7 +8,7 @@ let else "2.4"; in stdenv.mkDerivation rec { - name = "prusa-slicer-${version}"; + pname = "prusa-slicer"; version = "2.0.0"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix index 4d2040212472..48a05091ca85 100644 --- a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix +++ b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix @@ -5,7 +5,8 @@ let version = "1.6"; in mkDerivation rec { - name = "qdirstat-${version}"; + pname = "qdirstat"; + inherit version; src = fetchFromGitHub { owner = "shundhammer"; diff --git a/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix b/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix index ae0fd61c33dd..aae38f7d0f17 100644 --- a/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix +++ b/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix @@ -3,11 +3,11 @@ , garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }: mkDerivation rec { - name = "qlandkartegt-${version}"; + pname = "qlandkartegt"; version = "1.8.1"; src = fetchurl { - url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz"; sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly"; }; diff --git a/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix b/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix index f12a3021a19a..a679a4f1112f 100644 --- a/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/nixpkgs/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, libusb }: stdenv.mkDerivation rec { - name = "garmindev-${version}"; + pname = "garmindev"; version = "0.3.4"; src = fetchurl { - url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz"; sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6"; }; diff --git a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index df5f35102e01..8fc890f42439 100644 --- a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -4,7 +4,7 @@ }: mkDerivation rec { - name = "qlcplus-${version}"; + pname = "qlcplus"; version = "4.12.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/qmapshack/default.nix b/nixpkgs/pkgs/applications/misc/qmapshack/default.nix index 99a0acbcc8c6..335c583998fc 100644 --- a/nixpkgs/pkgs/applications/misc/qmapshack/default.nix +++ b/nixpkgs/pkgs/applications/misc/qmapshack/default.nix @@ -1,11 +1,11 @@ { mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }: mkDerivation rec { - name = "qmapshack-${version}"; + pname = "qmapshack"; version = "1.13.1"; src = fetchurl { - url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz"; sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9"; }; diff --git a/nixpkgs/pkgs/applications/misc/qolibri/default.nix b/nixpkgs/pkgs/applications/misc/qolibri/default.nix index e395ae9c070d..ecc372dc674c 100644 --- a/nixpkgs/pkgs/applications/misc/qolibri/default.nix +++ b/nixpkgs/pkgs/applications/misc/qolibri/default.nix @@ -2,7 +2,7 @@ , qtmultimedia, qttools, qtwebengine }: stdenv.mkDerivation rec { - name = "qolibri-${version}"; + pname = "qolibri"; version = "2018-11-14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix index 6ae8f380fe28..71a433bded79 100644 --- a/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/qsyncthingtray/default.nix @@ -7,7 +7,7 @@ mkDerivation rec { version = "0.5.8"; - name = "qsyncthingtray-${version}"; + pname = "qsyncthingtray"; src = fetchFromGitHub { owner = "sieren"; diff --git a/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix index 7586669218da..d942f999f697 100644 --- a/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix @@ -4,7 +4,8 @@ let version = "1.40.41"; in stdenv.mkDerivation { - name = "qtbitcointrader-${version}"; + pname = "qtbitcointrader"; + inherit version; src = fetchzip { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix b/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix index b2616bf7b778..948bcf33d378 100644 --- a/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix +++ b/nixpkgs/pkgs/applications/misc/quicksynergy/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, gtk2, synergy}: stdenv.mkDerivation rec { - name = "quicksynergy-${version}"; + pname = "quicksynergy"; version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix b/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix index bf4559e91178..25f9c6ed4c7a 100644 --- a/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "redis-desktop-manager-${version}"; + pname = "redis-desktop-manager"; version = "0.9.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix b/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix index 03b8d709fce2..2eebe67c46da 100644 --- a/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -3,7 +3,8 @@ let version = "1.0.18"; in stdenv.mkDerivation { - name = "redshift-plasma-applet-${version}"; + pname = "redshift-plasma-applet"; + inherit version; src = fetchFromGitHub { owner = "kotelnik"; diff --git a/nixpkgs/pkgs/applications/misc/redshift/default.nix b/nixpkgs/pkgs/applications/misc/redshift/default.nix index 3a288a81c37f..ad27c9b13a61 100644 --- a/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/nixpkgs/pkgs/applications/misc/redshift/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { - name = "redshift-${version}"; + pname = "redshift"; version = "1.12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/regextester/default.nix b/nixpkgs/pkgs/applications/misc/regextester/default.nix index 703d78621249..ca362bab2ec9 100644 --- a/nixpkgs/pkgs/applications/misc/regextester/default.nix +++ b/nixpkgs/pkgs/applications/misc/regextester/default.nix @@ -14,7 +14,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "regextester-${version}"; + pname = "regextester"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/robo3t/default.nix b/nixpkgs/pkgs/applications/misc/robo3t/default.nix index be365cb94e4e..00640be6c74a 100644 --- a/nixpkgs/pkgs/applications/misc/robo3t/default.nix +++ b/nixpkgs/pkgs/applications/misc/robo3t/default.nix @@ -2,12 +2,13 @@ freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { - name = "robo3t-${version}"; - version = "1.1.1"; + pname = "robo3t"; + version = "1.3.1"; + rev = "7419c406"; src = fetchurl { - url = "https://download.robomongo.org/1.1.1/linux/robo3t-${version}-linux-x86_64-c93c6b0.tar.gz"; - sha256 = "140cn80vg7c8vpdjasqi4b3kyqj4n033lcm3ikz5674x3jr7r5zs"; + url = "https://download-test.robomongo.org/linux/robo3t-${version}-linux-x86_64-${rev}.tar.gz"; + sha256 = "1mp5i8iahd4qkwgi5ix98hlg17ivw5da27n0drnr0wk458wn99hi"; }; icon = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/robomongo/default.nix b/nixpkgs/pkgs/applications/misc/robomongo/default.nix index 76593eba5fc4..8df4e960c180 100644 --- a/nixpkgs/pkgs/applications/misc/robomongo/default.nix +++ b/nixpkgs/pkgs/applications/misc/robomongo/default.nix @@ -2,7 +2,7 @@ freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { - name = "robomongo-${version}"; + pname = "robomongo"; version = "0.9.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/roxterm/default.nix b/nixpkgs/pkgs/applications/misc/roxterm/default.nix index aa0ebc29a557..1cff3635bf9d 100644 --- a/nixpkgs/pkgs/applications/misc/roxterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/roxterm/default.nix @@ -11,10 +11,11 @@ let version = "3.3.2"; in stdenv.mkDerivation rec { - name = "roxterm-${version}"; + pname = "roxterm"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/roxterm/${name}.tar.xz"; + url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz"; sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; }; diff --git a/nixpkgs/pkgs/applications/misc/rsclock/default.nix b/nixpkgs/pkgs/applications/misc/rsclock/default.nix index 81c001509f34..c427eda8c773 100644 --- a/nixpkgs/pkgs/applications/misc/rsclock/default.nix +++ b/nixpkgs/pkgs/applications/misc/rsclock/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rsClock"; - version = "0.1.0"; + version = "0.1.4"; src = fetchFromGitHub { owner = "valebes"; repo = pname; rev = "v${version}"; - sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh"; + sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n"; + cargoSha256 = "0zg5q2p9snpfyxl0gx87ix1f46afrfm5jq0m6c7s8qw2x9hpvxzr"; meta = with stdenv.lib; { description = "A simple terminal clock written in Rust"; diff --git a/nixpkgs/pkgs/applications/misc/rxvt/default.nix b/nixpkgs/pkgs/applications/misc/rxvt/default.nix index 8e63cdb6d16c..acdd21a1c219 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt/default.nix @@ -3,11 +3,11 @@ , libX11, libXt, libXpm }: stdenv.mkDerivation rec { - name = "rxvt-${version}"; + pname = "rxvt"; version = "2.7.10"; src = fetchurl { - url = "mirror://sourceforge/rxvt/${name}.tar.gz"; + url = "mirror://sourceforge/rxvt/${pname}-${version}.tar.gz"; sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; }; diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix index f872e8008363..a4e03fa347f0 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "urxvt-autocomplete-all-the-things-${version}"; + pname = "urxvt-autocomplete-all-the-things"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index 544789e865b5..b976388ae2c4 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "urxvt-perls-${version}"; + pname = "urxvt-perls"; version = "2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index e8e5c524a35c..2982c02cce9a 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "urxvt-tabbedex-${version}"; + pname = "urxvt-tabbedex"; version = "19.21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix index 053eaf6e54c7..17cea90ac27c 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (rec { inherit description; homepage = http://software.schmorp.de/pkg/rxvt-unicode.html; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = [ ]; + maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix index 30f54cdee7e9..125170d36c27 100644 --- a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix +++ b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix @@ -4,7 +4,6 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "safeeyes"; version = "2.0.9"; namePrefix = ""; diff --git a/nixpkgs/pkgs/applications/misc/sakura/default.nix b/nixpkgs/pkgs/applications/misc/sakura/default.nix index 33df8e8f0a27..8510d5019424 100644 --- a/nixpkgs/pkgs/applications/misc/sakura/default.nix +++ b/nixpkgs/pkgs/applications/misc/sakura/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }: stdenv.mkDerivation rec { - name = "sakura-${version}"; + pname = "sakura"; version = "3.6.0"; src = fetchurl { - url = "https://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1"; }; diff --git a/nixpkgs/pkgs/applications/misc/sc-im/default.nix b/nixpkgs/pkgs/applications/misc/sc-im/default.nix index 280a42fde14c..c95eba48bdfb 100644 --- a/nixpkgs/pkgs/applications/misc/sc-im/default.nix +++ b/nixpkgs/pkgs/applications/misc/sc-im/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; - name = "sc-im-${version}"; + pname = "sc-im"; src = fetchFromGitHub { owner = "andmarti1424"; diff --git a/nixpkgs/pkgs/applications/misc/sdcv/default.nix b/nixpkgs/pkgs/applications/misc/sdcv/default.nix index cc8c30043b29..3cebcc0101f8 100644 --- a/nixpkgs/pkgs/applications/misc/sdcv/default.nix +++ b/nixpkgs/pkgs/applications/misc/sdcv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: stdenv.mkDerivation rec { - name = "sdcv-${version}"; + pname = "sdcv"; version = "0.5.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/sequelpro/default.nix b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix index fc63745ebb84..114404c2597d 100644 --- a/nixpkgs/pkgs/applications/misc/sequelpro/default.nix +++ b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, undmg }: stdenv.mkDerivation rec { - name = "sequel-pro-${version}"; + pname = "sequel-pro"; version = "1.1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/slade/default.nix b/nixpkgs/pkgs/applications/misc/slade/default.nix index fc6be074a079..d2d5e9548a0c 100644 --- a/nixpkgs/pkgs/applications/misc/slade/default.nix +++ b/nixpkgs/pkgs/applications/misc/slade/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation rec { - name = "slade-${version}"; + pname = "slade"; version = "3.1.1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/slic3r/default.nix b/nixpkgs/pkgs/applications/misc/slic3r/default.nix index e012c3763b34..cf9e93b87b39 100644 --- a/nixpkgs/pkgs/applications/misc/slic3r/default.nix +++ b/nixpkgs/pkgs/applications/misc/slic3r/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "slic3r-${version}"; + pname = "slic3r"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; diff --git a/nixpkgs/pkgs/applications/misc/slstatus/default.nix b/nixpkgs/pkgs/applications/misc/slstatus/default.nix index f4a2e889cd43..bfb3d010a3c7 100644 --- a/nixpkgs/pkgs/applications/misc/slstatus/default.nix +++ b/nixpkgs/pkgs/applications/misc/slstatus/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "slstatus-${version}"; + pname = "slstatus"; version = "unstable-2018-04-16"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/spacefm/default.nix b/nixpkgs/pkgs/applications/misc/spacefm/default.nix index 9f20b20f7f3a..c116b5874069 100644 --- a/nixpkgs/pkgs/applications/misc/spacefm/default.nix +++ b/nixpkgs/pkgs/applications/misc/spacefm/default.nix @@ -3,7 +3,7 @@ , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { - name = "spacefm-${version}"; + pname = "spacefm"; version = "1.0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/sqliteman/default.nix b/nixpkgs/pkgs/applications/misc/sqliteman/default.nix index a1d5ef153bbd..103075024dd5 100644 --- a/nixpkgs/pkgs/applications/misc/sqliteman/default.nix +++ b/nixpkgs/pkgs/applications/misc/sqliteman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: stdenv.mkDerivation rec { - name = "sqliteman-${version}"; + pname = "sqliteman"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/ssocr/default.nix b/nixpkgs/pkgs/applications/misc/ssocr/default.nix index aee486ddf0c2..eb408eaf6ee3 100644 --- a/nixpkgs/pkgs/applications/misc/ssocr/default.nix +++ b/nixpkgs/pkgs/applications/misc/ssocr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, imlib2, libX11 }: stdenv.mkDerivation rec { - name = "ssocr-${version}"; + pname = "ssocr"; version = "unstable-2018-08-11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/stog/default.nix b/nixpkgs/pkgs/applications/misc/stog/default.nix index d3cd81f7f13a..8c47de3afac0 100644 --- a/nixpkgs/pkgs/applications/misc/stog/default.nix +++ b/nixpkgs/pkgs/applications/misc/stog/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "stog-${version}"; + pname = "stog"; version = "0.18.0"; src = fetchFromGitLab { domain = "framagit.org"; diff --git a/nixpkgs/pkgs/applications/misc/styx/default.nix b/nixpkgs/pkgs/applications/misc/styx/default.nix index d545447cb130..340b59d5ff23 100644 --- a/nixpkgs/pkgs/applications/misc/styx/default.nix +++ b/nixpkgs/pkgs/applications/misc/styx/default.nix @@ -3,7 +3,7 @@ , perlPackages, python27 }: stdenv.mkDerivation rec { - name = "styx-${version}"; + pname = "styx"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/nixpkgs/pkgs/applications/misc/subsurface/default.nix index 7bac1db813f4..a29dad2c4447 100644 --- a/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -7,7 +7,8 @@ let version = "4.8.2"; libdc = stdenv.mkDerivation rec { - name = "libdivecomputer-ssrf-${version}"; + pname = "libdivecomputer-ssrf"; + inherit version; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; @@ -30,7 +31,7 @@ let }; googlemaps = stdenv.mkDerivation rec { - name = "googlemaps-${version}"; + pname = "googlemaps"; version = "2017-12-18"; @@ -66,7 +67,8 @@ let }; in stdenv.mkDerivation rec { - name = "subsurface-${version}"; + pname = "subsurface"; + inherit version; src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; diff --git a/nixpkgs/pkgs/applications/misc/synapse/default.nix b/nixpkgs/pkgs/applications/misc/synapse/default.nix index 3e7983c667f2..c314e8ffe5ac 100644 --- a/nixpkgs/pkgs/applications/misc/synapse/default.nix +++ b/nixpkgs/pkgs/applications/misc/synapse/default.nix @@ -5,10 +5,11 @@ let version = "0.2.99.4"; in stdenv.mkDerivation rec { - name = "synapse-${version}"; + pname = "synapse"; + inherit version; src = fetchurl { - url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j"; }; diff --git a/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix b/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix index f16a0d29c40d..a07fe0c75103 100644 --- a/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: buildGoPackage rec { - name = "syncthing-tray-${version}"; + pname = "syncthing-tray"; version = "0.7"; goPackagePath = "github.com/alex2108/syncthing-tray"; diff --git a/nixpkgs/pkgs/applications/misc/synergy/default.nix b/nixpkgs/pkgs/applications/misc/synergy/default.nix index 5f12bdb4dfcd..377d83e59627 100644 --- a/nixpkgs/pkgs/applications/misc/synergy/default.nix +++ b/nixpkgs/pkgs/applications/misc/synergy/default.nix @@ -3,7 +3,7 @@ , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { - name = "synergy-${version}"; + pname = "synergy"; version = "1.8.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/tabula/default.nix b/nixpkgs/pkgs/applications/misc/tabula/default.nix index 52e39b98a3b6..fbb1832735be 100644 --- a/nixpkgs/pkgs/applications/misc/tabula/default.nix +++ b/nixpkgs/pkgs/applications/misc/tabula/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "tabula-${version}"; + pname = "tabula"; version = "1.2.1"; diff --git a/nixpkgs/pkgs/applications/misc/tasknc/default.nix b/nixpkgs/pkgs/applications/misc/tasknc/default.nix index 7ca421b49a35..0450cb40a555 100644 --- a/nixpkgs/pkgs/applications/misc/tasknc/default.nix +++ b/nixpkgs/pkgs/applications/misc/tasknc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017-05-15"; - name = "tasknc-${version}"; + pname = "tasknc"; src = fetchFromGitHub { owner = "lharding"; diff --git a/nixpkgs/pkgs/applications/misc/tasksh/default.nix b/nixpkgs/pkgs/applications/misc/tasksh/default.nix index 6a30adb23da2..feb06368de41 100644 --- a/nixpkgs/pkgs/applications/misc/tasksh/default.nix +++ b/nixpkgs/pkgs/applications/misc/tasksh/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, readline }: stdenv.mkDerivation rec { - name = "tasksh-${version}"; + pname = "tasksh"; version = "1.2.0"; enableParallelBuilding = true; src = fetchurl { - url = "https://taskwarrior.org/download/${name}.tar.gz"; + url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; }; diff --git a/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix b/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix index dc632f3ed757..ba919fbc6267 100644 --- a/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libuuid, gnutls }: stdenv.mkDerivation rec { - name = "taskwarrior-${version}"; + pname = "taskwarrior"; version = "2.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/termdown/default.nix b/nixpkgs/pkgs/applications/misc/termdown/default.nix index 7edb8dd5d1ef..94eacb1fe067 100644 --- a/nixpkgs/pkgs/applications/misc/termdown/default.nix +++ b/nixpkgs/pkgs/applications/misc/termdown/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; buildPythonApplication rec { - name = "termdown-${version}"; + pname = "termdown"; version = "1.16.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix b/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix index 3599bd0030b9..00300e65abb4 100644 --- a/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix @@ -1,7 +1,7 @@ { stdenv, runtimeShell, lib, fetchzip }: stdenv.mkDerivation rec { - name = "terminal-notifier-${version}"; + pname = "terminal-notifier"; version = "2.0.0"; diff --git a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix index bdbea571790e..6cacb6215179 100644 --- a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "terminal-parrot-${version}"; + pname = "terminal-parrot"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/terminus/default.nix b/nixpkgs/pkgs/applications/misc/terminus/default.nix index 8518b72bc95f..fce46d120de5 100644 --- a/nixpkgs/pkgs/applications/misc/terminus/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminus/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { version = "1.0.0-alpha.42"; - name = "terminus-${version}"; + pname = "terminus"; src = fetchurl { url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; diff --git a/nixpkgs/pkgs/applications/misc/termite/default.nix b/nixpkgs/pkgs/applications/misc/termite/default.nix index d4191a875bdd..6a9de3644469 100644 --- a/nixpkgs/pkgs/applications/misc/termite/default.nix +++ b/nixpkgs/pkgs/applications/misc/termite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "termite-${version}"; + pname = "termite"; version = "15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/teseq/default.nix b/nixpkgs/pkgs/applications/misc/teseq/default.nix index 9502b3a0abe7..b17645919824 100644 --- a/nixpkgs/pkgs/applications/misc/teseq/default.nix +++ b/nixpkgs/pkgs/applications/misc/teseq/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1"; in stdenv.mkDerivation { - name = "teseq-${version}"; + pname = "teseq"; + inherit version; src = fetchurl { url = "mirror://gnu/teseq/teseq-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/tilda/default.nix b/nixpkgs/pkgs/applications/misc/tilda/default.nix index 4172660182df..39f54156fef8 100644 --- a/nixpkgs/pkgs/applications/misc/tilda/default.nix +++ b/nixpkgs/pkgs/applications/misc/tilda/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { - name = "tilda-${version}"; + pname = "tilda"; version = "1.4.1"; src = fetchzip { - url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; + url = "https://github.com/lanoxx/tilda/archive/${pname}-${version}.tar.gz"; sha256 = "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj"; }; diff --git a/nixpkgs/pkgs/applications/misc/timewarrior/default.nix b/nixpkgs/pkgs/applications/misc/timewarrior/default.nix index ca049ba04c91..d0419c414d7a 100644 --- a/nixpkgs/pkgs/applications/misc/timewarrior/default.nix +++ b/nixpkgs/pkgs/applications/misc/timewarrior/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "timewarrior-${version}"; + pname = "timewarrior"; version = "1.1.1"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/misc/tint2/default.nix b/nixpkgs/pkgs/applications/misc/tint2/default.nix index 63bb7f4bb4a4..e612fb10ff8c 100644 --- a/nixpkgs/pkgs/applications/misc/tint2/default.nix +++ b/nixpkgs/pkgs/applications/misc/tint2/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "tint2-${version}"; + pname = "tint2"; version = "16.7"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/applications/misc/tnef/default.nix b/nixpkgs/pkgs/applications/misc/tnef/default.nix index 6cf1f27a104b..cb70d57869c0 100644 --- a/nixpkgs/pkgs/applications/misc/tnef/default.nix +++ b/nixpkgs/pkgs/applications/misc/tnef/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.17"; - name = "tnef-${version}"; + pname = "tnef"; src = fetchFromGitHub { owner = "verdammelt"; diff --git a/nixpkgs/pkgs/applications/misc/todoist/default.nix b/nixpkgs/pkgs/applications/misc/todoist/default.nix index d4735c0baf5f..d9dcee762cf3 100644 --- a/nixpkgs/pkgs/applications/misc/todoist/default.nix +++ b/nixpkgs/pkgs/applications/misc/todoist/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "todoist-${version}"; + pname = "todoist"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/todolist/default.nix b/nixpkgs/pkgs/applications/misc/todolist/default.nix index 122567de2e1e..240ad6e5fca4 100644 --- a/nixpkgs/pkgs/applications/misc/todolist/default.nix +++ b/nixpkgs/pkgs/applications/misc/todolist/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "todolist-${version}"; + pname = "todolist"; version = "v0.8.1"; goPackagePath = "github.com/gammons/todolist"; diff --git a/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix index b268bdd0962e..bf22cb0181da 100644 --- a/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix @@ -12,7 +12,7 @@ let }; bugsnag-qt = stdenv.mkDerivation rec { - name = "bugsnag-qt-${version}"; + pname = "bugsnag-qt"; version = "20180522.005732"; src = fetchzip { @@ -25,7 +25,7 @@ let }; qxtglobalshortcut = stdenv.mkDerivation rec { - name = "qxtglobalshortcut-${version}"; + pname = "qxtglobalshortcut"; version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; src = fetchzip { @@ -38,7 +38,7 @@ let }; qt-oauth-lib = stdenv.mkDerivation rec { - name = "qt-oauth-lib-${version}"; + pname = "qt-oauth-lib"; version = "20190125.190943"; src = fetchzip { diff --git a/nixpkgs/pkgs/applications/misc/tomboy/default.nix b/nixpkgs/pkgs/applications/misc/tomboy/default.nix index ba6e97d61fb3..d8a6f86f104b 100644 --- a/nixpkgs/pkgs/applications/misc/tomboy/default.nix +++ b/nixpkgs/pkgs/applications/misc/tomboy/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "tomboy-${version}"; + pname = "tomboy"; + inherit version; src = fetchurl { url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/applications/misc/topydo/default.nix b/nixpkgs/pkgs/applications/misc/topydo/default.nix index 34952b9c0f4d..eb3894c7b47d 100644 --- a/nixpkgs/pkgs/applications/misc/topydo/default.nix +++ b/nixpkgs/pkgs/applications/misc/topydo/default.nix @@ -5,7 +5,6 @@ with python3Packages; buildPythonApplication rec { pname = "topydo"; version = "0.13"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bram85"; diff --git a/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix b/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix index 09322b47506b..b955711d0030 100644 --- a/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix +++ b/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.1"; - name = "tpmmanager-${version}"; + pname = "tpmmanager"; src = fetchgit { url = "https://github.com/Sirrix-AG/TPMManager"; diff --git a/nixpkgs/pkgs/applications/misc/tthsum/default.nix b/nixpkgs/pkgs/applications/misc/tthsum/default.nix index dbac56abaa1d..76ac3f75b266 100644 --- a/nixpkgs/pkgs/applications/misc/tthsum/default.nix +++ b/nixpkgs/pkgs/applications/misc/tthsum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tthsum-${version}"; + pname = "tthsum"; version = "1.3.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/usync/default.nix b/nixpkgs/pkgs/applications/misc/usync/default.nix index d12120ca2f11..344c07d845be 100644 --- a/nixpkgs/pkgs/applications/misc/usync/default.nix +++ b/nixpkgs/pkgs/applications/misc/usync/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "usync"; version = "0.0.3"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; diff --git a/nixpkgs/pkgs/applications/misc/valentina/default.nix b/nixpkgs/pkgs/applications/misc/valentina/default.nix index 6752b0182fea..5a12465c4c49 100644 --- a/nixpkgs/pkgs/applications/misc/valentina/default.nix +++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "valentina-${version}"; + pname = "valentina"; version = "0.6.1"; src = fetchhg { diff --git a/nixpkgs/pkgs/applications/misc/vcal/default.nix b/nixpkgs/pkgs/applications/misc/vcal/default.nix index 5cd8de43729b..b25e7f76cefe 100644 --- a/nixpkgs/pkgs/applications/misc/vcal/default.nix +++ b/nixpkgs/pkgs/applications/misc/vcal/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, perl }: stdenv.mkDerivation rec { - name = "vcal-${version}"; + pname = "vcal"; version = "2.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/veracrypt/default.nix b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix index 8b64bcca667d..9639cee2d8c7 100644 --- a/nixpkgs/pkgs/applications/misc/veracrypt/default.nix +++ b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: +{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, unzip, wxGTK, lvm2 }: with stdenv.lib; stdenv.mkDerivation rec { pname = "veracrypt"; - name = "${pname}-${version}"; version = "1.23"; + minorVersion = "-Hotfix-2"; src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1"; + url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}${minorVersion}_Source.zip"; + sha256 = "229de81b2478cfa5fa73e74e60798a298cd616e9852b9f47b484c80bc2a2c259"; }; sourceRoot = "src"; nativeBuildInputs = [ makeself pkgconfig yasm ]; - buildInputs = [ fuse lvm2 wxGTK ]; + buildInputs = [ fuse lvm2 unzip wxGTK ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/misc/verbiste/default.nix b/nixpkgs/pkgs/applications/misc/verbiste/default.nix index 058624445561..b6a8b567a503 100644 --- a/nixpkgs/pkgs/applications/misc/verbiste/default.nix +++ b/nixpkgs/pkgs/applications/misc/verbiste/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: stdenv.mkDerivation rec { - name = "verbiste-${version}"; + pname = "verbiste"; version = "0.1.46"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0"; }; diff --git a/nixpkgs/pkgs/applications/misc/viking/default.nix b/nixpkgs/pkgs/applications/misc/viking/default.nix index 50f2012d34ab..cda3b1a6f850 100644 --- a/nixpkgs/pkgs/applications/misc/viking/default.nix +++ b/nixpkgs/pkgs/applications/misc/viking/default.nix @@ -4,7 +4,7 @@ , geoclue2, liboauth }: stdenv.mkDerivation rec { - name = "viking-${version}"; + pname = "viking"; version = "1.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix index 5ebc98b57123..64645e00bd85 100644 --- a/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,6 @@ , dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp }: buildPythonApplication rec { - name = "${pname}-${version}"; pname = "visidata"; version = "1.5.2"; diff --git a/nixpkgs/pkgs/applications/misc/volnoti/default.nix b/nixpkgs/pkgs/applications/misc/volnoti/default.nix index 47b0385be687..e482e7e7c02d 100644 --- a/nixpkgs/pkgs/applications/misc/volnoti/default.nix +++ b/nixpkgs/pkgs/applications/misc/volnoti/default.nix @@ -3,7 +3,7 @@ , dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "volnoti-unstable-${version}"; + pname = "volnoti-unstable"; version = "2013-09-23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/vp/default.nix b/nixpkgs/pkgs/applications/misc/vp/default.nix index e794b82e2f6e..a59a25a144e9 100644 --- a/nixpkgs/pkgs/applications/misc/vp/default.nix +++ b/nixpkgs/pkgs/applications/misc/vp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }: stdenv.mkDerivation rec { - name = "vp-${version}"; + pname = "vp"; version = "1.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/vue/default.nix b/nixpkgs/pkgs/applications/misc/vue/default.nix index 1feec9e45509..d6404ca65965 100644 --- a/nixpkgs/pkgs/applications/misc/vue/default.nix +++ b/nixpkgs/pkgs/applications/misc/vue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { - name = "vue-${version}"; + pname = "vue"; version = "3.3.0"; src = fetchurl { url = "http://releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1"; diff --git a/nixpkgs/pkgs/applications/misc/vym/default.nix b/nixpkgs/pkgs/applications/misc/vym/default.nix index 48818ca3b8b1..6dfe8e713c63 100644 --- a/nixpkgs/pkgs/applications/misc/vym/default.nix +++ b/nixpkgs/pkgs/applications/misc/vym/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, qmake, qtsvg }: stdenv.mkDerivation rec { - name = "vym-${version}"; + pname = "vym"; version = "2.6.11"; src = fetchurl { - url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2"; + url = "mirror://sourceforge/project/vym/2.6.0/${pname}-${version}.tar.bz2"; sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl"; }; diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix index d6cbb442b898..002bdef7333e 100644 --- a/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja -, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, spdlog +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,17 +9,17 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "15biyr422s5f2csw395fz9cikir9wffdwqq8y0i6ayzpymzsqbzs"; + sha256 = "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z"; }; nativeBuildInputs = [ - meson ninja pkgconfig + meson ninja pkgconfig scdoc ]; buildInputs = with stdenv.lib; diff --git a/nixpkgs/pkgs/applications/misc/wcalc/default.nix b/nixpkgs/pkgs/applications/misc/wcalc/default.nix index 1c6dc8f63c23..ff770f516bc5 100644 --- a/nixpkgs/pkgs/applications/misc/wcalc/default.nix +++ b/nixpkgs/pkgs/applications/misc/wcalc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, mpfr, readline }: stdenv.mkDerivation rec { - name = "wcalc-${version}"; + pname = "wcalc"; version = "2.5"; src = fetchurl { - url = "mirror://sourceforge/w-calc/${name}.tar.bz2"; + url = "mirror://sourceforge/w-calc/${pname}-${version}.tar.bz2"; sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f"; }; diff --git a/nixpkgs/pkgs/applications/misc/weather/default.nix b/nixpkgs/pkgs/applications/misc/weather/default.nix index 90fa01661543..2748d576c692 100644 --- a/nixpkgs/pkgs/applications/misc/weather/default.nix +++ b/nixpkgs/pkgs/applications/misc/weather/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.3"; - name = "weather-${version}"; + pname = "weather"; src = fetchurl { - url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz"; + url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546"; }; diff --git a/nixpkgs/pkgs/applications/misc/wego/default.nix b/nixpkgs/pkgs/applications/misc/wego/default.nix index a3d3ace009e1..03f3caa4c151 100644 --- a/nixpkgs/pkgs/applications/misc/wego/default.nix +++ b/nixpkgs/pkgs/applications/misc/wego/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "wego-${version}"; + pname = "wego"; version = "20170403-${stdenv.lib.strings.substring 0 7 rev}"; rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c"; diff --git a/nixpkgs/pkgs/applications/misc/wikicurses/default.nix b/nixpkgs/pkgs/applications/misc/wikicurses/default.nix index d8628b794d71..d38383c30ecb 100644 --- a/nixpkgs/pkgs/applications/misc/wikicurses/default.nix +++ b/nixpkgs/pkgs/applications/misc/wikicurses/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { version = "1.4"; - name = "wikicurses-${version}"; + pname = "wikicurses"; src = fetchFromGitHub { owner = "ids1024"; diff --git a/nixpkgs/pkgs/applications/misc/wordnet/default.nix b/nixpkgs/pkgs/applications/misc/wordnet/default.nix index 5d153a0e417f..5a1093b47797 100644 --- a/nixpkgs/pkgs/applications/misc/wordnet/default.nix +++ b/nixpkgs/pkgs/applications/misc/wordnet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.0"; - name = "wordnet-${version}"; + pname = "wordnet"; src = fetchurl { url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2"; sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; diff --git a/nixpkgs/pkgs/applications/misc/worker/default.nix b/nixpkgs/pkgs/applications/misc/worker/default.nix index daae279ccc79..e5b89ff43b5b 100644 --- a/nixpkgs/pkgs/applications/misc/worker/default.nix +++ b/nixpkgs/pkgs/applications/misc/worker/default.nix @@ -1,11 +1,11 @@ { stdenv, libX11, fetchurl }: stdenv.mkDerivation rec { - name = "worker-${version}"; + pname = "worker"; version = "4.0.1"; src = fetchurl { - url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; + url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh"; }; diff --git a/nixpkgs/pkgs/applications/misc/workrave/default.nix b/nixpkgs/pkgs/applications/misc/workrave/default.nix index 1547d2962116..a3c9d735ff8d 100644 --- a/nixpkgs/pkgs/applications/misc/workrave/default.nix +++ b/nixpkgs/pkgs/applications/misc/workrave/default.nix @@ -6,7 +6,7 @@ , gst-plugins-good, libsigcxx }: stdenv.mkDerivation rec { - name = "workrave-${version}"; + pname = "workrave"; version = "1.10.31"; src = let diff --git a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix index bf3d9b737a9e..9040bb4318d5 100644 --- a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix +++ b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.31"; - name = "xautoclick-${version}"; + pname = "xautoclick"; src = fetchurl { url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; diff --git a/nixpkgs/pkgs/applications/misc/xca/default.nix b/nixpkgs/pkgs/applications/misc/xca/default.nix index 280b30128727..8c5a2e3d2db9 100644 --- a/nixpkgs/pkgs/applications/misc/xca/default.nix +++ b/nixpkgs/pkgs/applications/misc/xca/default.nix @@ -2,7 +2,7 @@ , libtool, openssl, qtbase, qttools }: mkDerivation rec { - name = "xca-${version}"; + pname = "xca"; version = "2.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix b/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix index ed7f2b27c381..b7f8cfce2fb6 100644 --- a/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, txt2tags, python2Packages }: stdenv.mkDerivation rec { - name = "xdgmenumaker-${version}"; + pname = "xdgmenumaker"; version = "1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xiphos/default.nix b/nixpkgs/pkgs/applications/misc/xiphos/default.nix index 88ab52313b06..b7c6f938b19e 100644 --- a/nixpkgs/pkgs/applications/misc/xiphos/default.nix +++ b/nixpkgs/pkgs/applications/misc/xiphos/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "xiphos-${version}"; + pname = "xiphos"; version = "4.0.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xkbd/default.nix b/nixpkgs/pkgs/applications/misc/xkbd/default.nix index 3023e830dc79..d6709ecc1a62 100644 --- a/nixpkgs/pkgs/applications/misc/xkbd/default.nix +++ b/nixpkgs/pkgs/applications/misc/xkbd/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "xkbd-${version}"; + pname = "xkbd"; version = "0.8.18"; src = fetchFromGitHub { owner = "mahatma-kaganovich"; repo = "xkbd"; - rev = name; + rev = "${pname}-${version}"; sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9"; }; diff --git a/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix b/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix index 3f3865d7688a..abc808477a39 100644 --- a/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix +++ b/nixpkgs/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xkblayout-state"; version = "1b"; diff --git a/nixpkgs/pkgs/applications/misc/xkbmon/default.nix b/nixpkgs/pkgs/applications/misc/xkbmon/default.nix index 4fa1c833df53..dc618e4561e6 100644 --- a/nixpkgs/pkgs/applications/misc/xkbmon/default.nix +++ b/nixpkgs/pkgs/applications/misc/xkbmon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { - name = "xkbmon-${version}"; + pname = "xkbmon"; version = "0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xmind/default.nix b/nixpkgs/pkgs/applications/misc/xmind/default.nix index 433f6c614774..c673002fb511 100644 --- a/nixpkgs/pkgs/applications/misc/xmind/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmind/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }: stdenv.mkDerivation rec { - name = "xmind-${version}"; + pname = "xmind"; version = "8-update8"; src = fetchzip { - url = "https://xmind.net/xmind/downloads/${name}-linux.zip"; + url = "https://xmind.net/xmind/downloads/${pname}-${version}-linux.zip"; stripRoot = false; sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn"; }; diff --git a/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 6e421be93022..8a46336c9de2 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xmrig-${version}"; + pname = "xmrig"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 18eb2189f2c0..7d9ebca0086c 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xmrig-proxy-${version}"; + pname = "xmrig-proxy"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xneur/default.nix b/nixpkgs/pkgs/applications/misc/xneur/default.nix index 1cce7b155fde..0661a625e97f 100644 --- a/nixpkgs/pkgs/applications/misc/xneur/default.nix +++ b/nixpkgs/pkgs/applications/misc/xneur/default.nix @@ -2,7 +2,7 @@ , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation rec { - name = "xneur-${version}"; + pname = "xneur"; version = "0.20.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/xpad/default.nix b/nixpkgs/pkgs/applications/misc/xpad/default.nix index 5db4a2508399..bc91083892db 100644 --- a/nixpkgs/pkgs/applications/misc/xpad/default.nix +++ b/nixpkgs/pkgs/applications/misc/xpad/default.nix @@ -3,7 +3,7 @@ , glib, intltool, gtk3, gtksourceview, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "xpad-${version}"; + pname = "xpad"; version = "5.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix b/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix index bb3385ad016a..41071012ae9f 100644 --- a/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/nixpkgs/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.01"; - name = "xrandr-invert-colors-${version}"; + pname = "xrandr-invert-colors"; src = fetchurl { url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz"; sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; diff --git a/nixpkgs/pkgs/applications/misc/xscope/default.nix b/nixpkgs/pkgs/applications/misc/xscope/default.nix index 28ce4a0d500d..517105d7e1fd 100644 --- a/nixpkgs/pkgs/applications/misc/xscope/default.nix +++ b/nixpkgs/pkgs/applications/misc/xscope/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, libXt }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xscope"; version = "1.4.1"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/${pname}-${version}.tar.bz2"; sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; }; diff --git a/nixpkgs/pkgs/applications/misc/xsuspender/default.nix b/nixpkgs/pkgs/applications/misc/xsuspender/default.nix index ef9ce3393619..55ecd358c6cd 100644 --- a/nixpkgs/pkgs/applications/misc/xsuspender/default.nix +++ b/nixpkgs/pkgs/applications/misc/xsuspender/default.nix @@ -4,7 +4,7 @@ with lib; stdenv.mkDerivation rec { - name = "xsuspender-${version}"; + pname = "xsuspender"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xsw/default.nix b/nixpkgs/pkgs/applications/misc/xsw/default.nix index 3e8acff00f89..aa851e14ab5f 100644 --- a/nixpkgs/pkgs/applications/misc/xsw/default.nix +++ b/nixpkgs/pkgs/applications/misc/xsw/default.nix @@ -4,7 +4,7 @@ let makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); in stdenv.mkDerivation rec { - name = "xsw-${version}"; + pname = "xsw"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/xteddy/default.nix b/nixpkgs/pkgs/applications/misc/xteddy/default.nix index 6bc492833cc1..856ddb8ff50c 100644 --- a/nixpkgs/pkgs/applications/misc/xteddy/default.nix +++ b/nixpkgs/pkgs/applications/misc/xteddy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }: stdenv.mkDerivation rec { - name = "xteddy-${version}"; + pname = "xteddy"; version = "2.2-5"; src = fetchFromGitLab { domain = "salsa.debian.org"; diff --git a/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix b/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix index 21f95c65fa56..51575d62ed50 100644 --- a/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix +++ b/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.7"; - name = "xtermcontrol-${version}"; + pname = "xtermcontrol"; src = fetchurl { url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/yaft/default.nix b/nixpkgs/pkgs/applications/misc/yaft/default.nix index d273d27944a8..2135c7fd6174 100644 --- a/nixpkgs/pkgs/applications/misc/yaft/default.nix +++ b/nixpkgs/pkgs/applications/misc/yaft/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.9"; - name = "yaft-${version}"; + pname = "yaft"; src = fetchFromGitHub { owner = "uobikiemukot"; diff --git a/nixpkgs/pkgs/applications/misc/yakuake/default.nix b/nixpkgs/pkgs/applications/misc/yakuake/default.nix deleted file mode 100644 index 8f8494ac45b5..000000000000 --- a/nixpkgs/pkgs/applications/misc/yakuake/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ mkDerivation -, lib -, fetchurl -, kdoctools -, wrapGAppsHook -, extra-cmake-modules -, karchive -, kcrash -, kdbusaddons -, ki18n -, kiconthemes -, knewstuff -, knotifications -, knotifyconfig -, konsole -, kparts -, kwindowsystem -, qtx11extras -}: - -mkDerivation rec { - pname = "yakuake"; - version = "3.0.5"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8"; - }; - - buildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - qtx11extras - ]; - - propagatedBuildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - ]; - - propagatedUserEnvPkgs = [ konsole ]; - - nativeBuildInputs = [ - extra-cmake-modules kdoctools wrapGAppsHook - ]; - - meta = { - homepage = https://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - maintainers = with lib.maintainers; [ fridh ]; - license = lib.licenses.gpl2; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/yarssr/default.nix b/nixpkgs/pkgs/applications/misc/yarssr/default.nix index a47fb93512db..06e12416baa0 100644 --- a/nixpkgs/pkgs/applications/misc/yarssr/default.nix +++ b/nixpkgs/pkgs/applications/misc/yarssr/default.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { version = "git-2017-12-01"; - name = "yarssr-${version}"; + pname = "yarssr"; src = fetchFromGitHub { owner = "JGRennison"; diff --git a/nixpkgs/pkgs/applications/misc/yate/default.nix b/nixpkgs/pkgs/applications/misc/yate/default.nix index 294229d08a93..09a6cc4a3c0a 100644 --- a/nixpkgs/pkgs/applications/misc/yate/default.nix +++ b/nixpkgs/pkgs/applications/misc/yate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, qt4, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "yate-${version}"; + pname = "yate"; version = "6.1.0-1"; src = fetchurl { - url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz"; + url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz"; sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d"; }; diff --git a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix index 843bc0c1c234..d7a019c1c416 100644 --- a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix @@ -44,6 +44,7 @@ mkDerivation rec { cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons substituteInPlace $out/share/applications/yubioath-desktop.desktop \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ + --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/yubioath.png" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix index eb2a0f1c1e14..7c2c8fb31cab 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix @@ -2,11 +2,11 @@ , girara, gettext, libarchive }: stdenv.mkDerivation rec { - name = "zathura-cb-${version}"; + pname = "zathura-cb"; version = "0.1.8"; src = fetchurl { - url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz"; sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; }; diff --git a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index fe4ecf225aae..8afba9353ce1 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "zathura-core-${version}"; + pname = "zathura-core"; version = "0.4.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index f3cacd21236e..2ebc640d683d 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; - name = "zathura-pdf-mupdf-${version}"; + pname = "zathura-pdf-mupdf"; # pwmt.org server was down at the time of last update # src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 30ab053f923d..5b38555eda1a 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.2.9"; - name = "zathura-pdf-poppler-${version}"; + pname = "zathura-pdf-poppler"; src = fetchurl { - url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${name}.tar.gz"; + url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz"; sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l"; }; diff --git a/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix b/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix index 05dee5b6154c..ce5c7fb41f1f 100644 --- a/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { - name = "apache-directory-studio-${version}"; + pname = "apache-directory-studio"; version = "2.0.0.v20170904-M13"; src = diff --git a/nixpkgs/pkgs/applications/networking/brig/default.nix b/nixpkgs/pkgs/applications/networking/brig/default.nix index 8b7bc0bb899a..31eb4dd7378a 100644 --- a/nixpkgs/pkgs/applications/networking/brig/default.nix +++ b/nixpkgs/pkgs/applications/networking/brig/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "brig-${version}"; + pname = "brig"; version = "0.4.1"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix b/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix index 32de4871186f..57db827169ec 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "arora-${version}"; + pname = "arora"; version = "0.11.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix index 0797eea6f3b5..c3f5cb131645 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix @@ -14,7 +14,7 @@ let in buildGoPackage rec { inherit version; - name = "browsh-${version}"; + pname = "browsh"; goPackagePath = "browsh"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix index 664f9343eabd..a0ea67133c6f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -99,7 +99,7 @@ let }; flash = stdenv.mkDerivation rec { - name = "flashplayer-ppapi-${version}"; + pname = "flashplayer-ppapi"; version = "32.0.0.238"; src = fetchzip { diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index f8e56937021a..14799e9f96cc 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11"; - sha256bin64 = "0rbc0ld655szg42mqjdby8749d2jg34nlpp4cpq66qb4zi6vvb04"; - version = "76.0.3809.87"; + sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w"; + sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp"; + version = "77.0.3865.42"; }; dev = { - sha256 = "15v25nwcdxqgw6n0ym7fz5qaq0a74p0wiwcq155xy6zvr3q8q1nw"; - sha256bin64 = "1qawl0hsl6qpc10avli8raw4nzwcpmp6dyada5pga7i4k5jpsr95"; - version = "77.0.3860.5"; + sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k"; + sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6"; + version = "78.0.3887.7"; }; stable = { - sha256 = "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc"; - sha256bin64 = "1c5rlqgshv5295wg5cji12z2b38l6a81l94spmzr46h5z9nn1gqx"; - version = "76.0.3809.100"; + sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm"; + sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk"; + version = "76.0.3809.132"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix b/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix index 671ab03a2e29..8d6c99d2468c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { version = "3.0.5"; - name = "dillo-${version}"; + pname = "dillo"; src = fetchurl { - url = "https://www.dillo.org/download/${name}.tar.bz2"; + url = "https://www.dillo.org/download/${pname}-${version}.tar.bz2"; sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix b/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix index 6226cb338d95..369689520d8a 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "01mj5gksz2qcwhp28zyk8qswmrw93db1g7mw3mg4klz99vzcry74"; + sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix index c721a61591a1..6e21456a9a92 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,12 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +{ stdenv, mkDerivation, lib, fetchFromGitHub +, cmake, extra-cmake-modules, pkgconfig, qmake , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland , kwallet }: -stdenv.mkDerivation rec { - name = "falkon-${version}"; +mkDerivation rec { + pname = "falkon"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 02087ae01ac9..50b7153533dc 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0b14"; + version = "69.0b16"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ach/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ach/firefox-69.0b16.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "69f7a54d9e458d67fc554e282bd3d25a97e78e9e1aef70db3ca1ab63eec572da1746ffd405cd722243e12bede511b98fe5dd6d8fe70d39660c9e08cdde5d5704"; + sha512 = "5fe26093cdffc6c3afde7438bbcde7fb24867e70b74c18ef287d5897e4470f2671fe30053bf7d9077d9494e9cc97a2dabb9938d4c99fcaf7981d8df7cea281fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/af/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/af/firefox-69.0b16.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "367200eb6731ecc4934f98abccdce40ddf4a73324162e8c76ac3903593f7eb8a73c9abc34d36ce7502be4f55e865a1cc39d629b9f026e25ce56af8d76edab915"; + sha512 = "2a1ea5564ac0bb16dc716f29f4f3a63f8029ba314e353ad74bb437a70ade138b29f58df2fb8320efbf5c001232253aa4a16f48673bc4c6e5906ce3c4c912026a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/an/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/an/firefox-69.0b16.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "4d146e92193945daada5e3db6e3de0beb5b453bd237b07c036a8bf3dfa92894b74e0cf956e5eb5217cc1872794f7f40dc58f9b1fd21b2ff89c6122a580ef5422"; + sha512 = "5fae2f3b33d7776f70a4244c6be02a47e81000a9de91fde1a3d73be2675e1ca67a2219f8aeacb70759cc779b985e4f0698c625c20f895e75e28ed9c764c8c3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ar/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ar/firefox-69.0b16.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ead64f65522c0775fe58dba27df1cdbc589dee666e2ffcd1ffa84b2285205afbe86f6d6b1b59b74eb6add2dd8332e2488165d6af21819269f2bdf394d0a32c89"; + sha512 = "dd8eb0155a3d9489645c03c3240f5ca2c6ee0b0de7cd82e62aad1575e8868f3ec763985c4142078ef8ace86da81887bf7d1f95c2ec22d5bc73086e230898e7a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ast/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ast/firefox-69.0b16.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c5e1faa329fe3c37eb4b2856280011d8750f0c5e1cd638b409277826d612421b35b14682e553bab41a856d8dbb9104edc32a08ee612830b2292c991860c0404d"; + sha512 = "960fea994048e4c08389c7701541266e3631c4d70f604146189805f1ad606aab16ef9c2b28eedee82acbe0f42f69c96a90a041ba4cf95fec060b1d6c29a94bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/az/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/az/firefox-69.0b16.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "dd48ea7a7334798dcd26a9d15ee101936d603fc0f3374f6e36653ffadd8bb623081e232d1aef682caa31ce2409cc508a51bdeb6388f43d47b946e74bd2022238"; + sha512 = "8e7b6bb3fc5c6726115a0a20f61d1cad5e9a4e9e86e462e1ab6a454f5257af22ebf8dcdea3298fc1e9648fe630c36245f4c45ba4093d45e59741ceb882fc501b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/be/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/be/firefox-69.0b16.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "de23e64ae742d96ffefcbe3abe1a39f62dd1df291c023d71b361ceaa596e9972ffe07b24a10203497024b575b2223ea4bf695b6561717e879dcc03d7b6b8915a"; + sha512 = "919a1f9007599ed0b325e0b218b18fc803c535f7eab76068cf4e94fe1ceb4543d090d7f341ba5f4d4de9aaaedc1b19d88ddbcb5c329ed5650d2ebc721f6aa49b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bg/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bg/firefox-69.0b16.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4e4dcc3e755b6b721ea005043310220f67e525e4c2339f7fcf12b078c2e611dac8b4fad6b734cf7207641b3823fa2d0d1f271e71103f8cff184d6669b1b1c883"; + sha512 = "6746f4d0c2a73f99bc04c3b12bcf54e5eca7262ac6d54835a567a23a07fc91775db9e64d0c5accf045aabd5d4645a753413f934e6eac9dbcefaea30c944aadd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bn/firefox-69.0b16.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "766f354fe5a168b902fa7c418e0f328f0e95ef0754db29740c6093bad202caad443cfe02e5c3841fe818b1f6b9b53e1b2ae84e29d72346260b5a07cf5ca24ea4"; + sha512 = "ba88ff34405c92b907cc16e44dbd5d1db0b4bcf0fb75ca650739bf307a6e2270cfd69bba9ead6c260721857738165fbbcd4af44fbe8cb9d7402d97c32eb09532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/br/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/br/firefox-69.0b16.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c5457927947a378e3778cc01e706deaf02a01e6ca4406270d6e4f5973e0f00ea3bbd27aca09b65c0dcfa5b430c600ec1e0d71cce48a796575d9c469e44679d9e"; + sha512 = "e7c78c11b3fd36d7c6ab55ac9571a53615a595dd5c5d66cd3dc6fb6d3fb42a1b29dcc86180f2028502f25869c951ad3caedf4590a61fe525616f18d560d6e775"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/bs/firefox-69.0b16.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "50605bd4bb4583fe7835f31e3f21186e6ce8738bdb55fc4a2832442cb4b21d5bdfcf3bae7905636e37c132db6c4561dcd93ce208a12b1a9c52d8d8248df2c4af"; + sha512 = "36a677f1c449ad58e8750323cffdea3200c3953b9fc6bf920a0439229eb00164d4c1199286d1f0cc47eb31b3fe7acf9e78ebc3f4a3f49a443d1425afe717ab2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ca/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ca/firefox-69.0b16.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "baf2c5fc6e752a5d3f8b2e5a39a89f709e3203c53caef5bf3d649027bed2dfc5191b31998074f5ba7a437c8d8f2c911b5c6bb653ac1e6cf1d2594772431b0c68"; + sha512 = "b78937e7ca4c7df19ed1c40a8b459d65176ca908333d7d19f30a377fddf836438cd750f2efeebb235c75c25f4a42a70e919c2c0061b865f7b90d71fe2ea119f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cak/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cak/firefox-69.0b16.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8117c621252a9a6ce9eabdaf7dae8ab9499a20c407b9d48bdc49b17fb72659889b038296f6af11e66a3dd5a9f6fcca9581396812753b7ea80a9299c1f558693a"; + sha512 = "ac21c01a6528790fd31d56f0c637a0cee8b4cd0938ecd18200c48f8c982ee6a06a36ad779f9cb708d0b8191b7df4480d62dd75cd2a4bd0502cdd862aa8e95a08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cs/firefox-69.0b16.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "7c9103c4938e57bfc7b47a9cd0c07e38775edc50a001fb24f91def01a8c3c7a3de1330173fd3842e8b0ec42d001d2cd5c9b4a4caf60613edaf331059d6cde524"; + sha512 = "09cafbad6acc6db507d5589f4f89f3914cb80c826de9e55d8f02b42c29f6e46d24f49729efd8c67b5b575fc4dd240d8b32f0ed69992ac992b02c8f2639c2b613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cy/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/cy/firefox-69.0b16.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "10ad0c39925c53381a5e8ccc6fdacb3939e2f32c17a6382f6279fea32bebb8a2a43f326e2467fcb48f4df1ea96c445cfcf0f413b436814da1074f6f5b353cf89"; + sha512 = "18de3618d1b1fd350a8c826e57898f019e9c792e5f97521ab52ee940956e8e49a9191e361e0426412ca27e63c1e502f350c11a68574f2be37b29e43a9a63b25b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/da/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/da/firefox-69.0b16.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8bc4c854a68db46280e0e9d561cf507ee5c334f3ba70d2834906face0540a47b77fc45d526024bd106c233f8e5245f3258279810a9fc2949e5e24d21fc17ef0d"; + sha512 = "7fd40f49390d1ca844f31eaad74a419a28aab6f74cbad1f040e01ecc5b6691ff516a4d2c41c906e241aab54573580eee3b6b01531468cc3e35c4fa61f7b60931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/de/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/de/firefox-69.0b16.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d793e9da3997aaa0318d1b1c22586d31b65bb1eaa21049a86878fe32acbc75161f1a48f9307c3c73bed9d15808252e644622648c150f5cb52a1480a418921b90"; + sha512 = "85347a3419e55984769031850ec30f757238801cf8483551ddba35abfd0e2638c75fa358ec09705d28dcc647fa47ad37c4f545522d5f8aa54067fbcc232a47c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/dsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/dsb/firefox-69.0b16.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e9ab9d16d1eff15d049beb6b9293322b425e6da4fc1f1286c2bc785d7235b1d672df1f476a6949371af687ffa3af3b7cc214bb886a1147f96fca4b6821aabbdd"; + sha512 = "a8f24207ea3b763a3295c1feb43c22f0e502561224a4d3d342cdd7321bd4e93fca83293834163d9a6160e0fc4c6aedb60b4f72e172e99eb98e6b8c0cfef665e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/el/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/el/firefox-69.0b16.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "31cc046a58bbbbc2bba80131bfb456019c1b38f6a5efec72d140743e5e1f61b0cf10094d61fbd9f76806ea03461365a27aaf3b15531004baee5b431a59e32539"; + sha512 = "ca8a37134a897631e398448683e4805ea9fd10a30629c09f760b6b90b9e8fb6505adf3143031e88b7a189791f487aa0ed852c0a4911b93fdedb34cd0cec7b7b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-CA/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-CA/firefox-69.0b16.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "eb9b3b8278c589f1b693bae1f48d86a4611b377c3949d51d75f534f133d85436b277f5acee1bd419a3f24faca245abb5d4d9f9fbd95b2adf05c03af72f37cdc7"; + sha512 = "b2c154bf92cf4ac6a4021b199e9e8438b59e4aeaa5ca7f72df41bdf64dcbdb196d384775b759b867a717e48e7a31f457cdec2c20e3c4dbd93d3c440ce277d396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-GB/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-GB/firefox-69.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "03ba44f4957abf9e2c36ad394af34354c0674b8e20a7e75d40b516434b3428fc3ad1d42ded42bd0587f282637ab663175a217eedf41f444d7e2e77d9d08c0dec"; + sha512 = "73c0b07840bf816f093c90b9103a25d2ff00cadcf13341ff228e09bf939c131db3ade9d3be472a4eec3ca5b4131245ea4c788171e6ee42beba7dc1c7881da0b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-US/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/en-US/firefox-69.0b16.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e61379736128667d1b4e5271037b3dff8f2c6425678791ce2883345a672023665573177019001364324bb4b166989bcc475844ef30ea5a8703a949d3c08882e2"; + sha512 = "c63d7358887ba0d8af897063c5431c2bd404fb9708e6b59d73c14dd8cfa1a2137af72eb01dfe25b9e6d92b84d5b966693cc89f5446ed3410f910e2df3f92b6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eo/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/eo/firefox-69.0b16.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "081d2573b5674e28e7cd04f0e856909ce7b1d2d16ec61bdf99cc5e0fd8aa5abb3624e220d609bf7dbb0b9d2db6367d7c67a64ffc470700896ed7520a250d06af"; + sha512 = "0e4a373bac78d80e2849c41c93196782ef41a74f91c6319da690916138a78c20c9d26d8c96e5efe67a835185c8df77354b3fed5a62500e791634eb2f15909031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-AR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-AR/firefox-69.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "12fb861ad3e36473e4384f8574d479b2beb4d036dde78478b391381afccc1fb1e7888e08d0de366acc8c537f141187a0075438cf53601fd0bb4356ad7a76484c"; + sha512 = "ff07382bcc926272bc69c10aa7f35eee7806d94a18ddebfa3599451d002afdda739461aad90d8df094f56b9b8840cedef659757245d4fd1a8603ac25d2a3100b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-CL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-CL/firefox-69.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6adf0c82bf246e256db530a4abff51e6389ec5ef899abf406fdf78c2c81831bccdf88cf133e2b8fb5a4ce4d843b947703dcf7a5aa721a6bb4913b6d07d04dbca"; + sha512 = "201f631a6682c9aa13c511a0d6da256e2f207362264f6e1ea060568a9e597216407ace99508ebe820a348859eb72c6df7581276eca5040b3ee2e99e048c67062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-ES/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-ES/firefox-69.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "6b31621b8d8f0aa090839fb4db7c10618374551b04b66b1696fff7ece4de9cdc7da06243f2f6a0be931a201cd984b9c8a4ff4332d0ae8ad2a42e08fe0de0f709"; + sha512 = "76573a05de730de4c6bc76dcf98a21764c78baec4eb0ead45adae2658e9173b33c97132d0a2e5c95807a60a22c9ab2e1dce09e5b73ae2dfd905ced82ba105333"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-MX/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/es-MX/firefox-69.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e1efaa7059a8e7c4b9dabc5481ef9ad14235e310ee42a8f28cf3eedc1907484be9fec8fea7dfc76e11fd531fdaa4933b581425d826ac41e040a855a3d2bdbc6f"; + sha512 = "b619f5a2392ffa0b36f48503e94adf9cf1719911258e1752507f274078d12f74257677f3e76493fd080a0be08ca94964dc55129a59e292b1e2573676dc59e5c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/et/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/et/firefox-69.0b16.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f8683048d0b87c0dcb0d929298e7b6429540edcc9308a1fd8dd6c40e47a39011c9abd4fc495bfe9fa8702f68717cbb06611e6f023d43f84cda623e23b67d2331"; + sha512 = "951288cf8a5745e433332798b87ceb54e35d408ca9f4e9d9fb288192de430eb45065fe88f0858f1a71e0cbeaf87c85c240a6d350bf8ce2f50c8ae548cff71f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/eu/firefox-69.0b16.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6ec1a27c6d786d3af512f03836f1b795df14dba63c935274fb601228af012eb6063c035d3cd5c9e7b24976be57f0d62e03f7f136bc322e667adf8612cca08b25"; + sha512 = "78c856affa639c531d70e20b1de6f0eba59b33e403a1d24c3508fab03624b5c90db636d39b0c199f2fd0b5fab10fa3ecb2fced6cc3b1e8a06b9be11e8ec917b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fa/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fa/firefox-69.0b16.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "0ef5ceebf4c144ba6b6fe8c999f97b78f6bfc18667229a85ed2093fe3838d5b1f7213ecfd004af95cb18b2a6dedd8675d1365d6b9a09b2976a771d96b61954be"; + sha512 = "a835fa37f804055dc117f694d85ae8b750c82f7ba92976def927f187ee91330a3d0616c0915917d1d0ec3c295f803c0bd2bdc9ecae0230f9a6642e42cab0e066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ff/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ff/firefox-69.0b16.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c17d2f95b4e1441e7f5efcf597c7c4ca362aeb837debd788933c52d6803bfc987bc8eb218391dd71a0581bfd386e625eaa2f4e3ac678f74a9ad3ec4f6ae34ca0"; + sha512 = "ed3664cd4418ed5af133e00c30b3a9d23a82bb681c5d965fe00b4e2bf6ce4c777b00c352dca4cfcfcf5a895d7001dcc6de67b4ef0abb3967014c483437f9b1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fi/firefox-69.0b16.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ab77f83eb23cc32fc5bdc4bec4f5c5710d53d7e46df6004e6a4751f9ba111366ee96742862fa5b76b438fe693b06245874ea9ddb2fa3575b4966bb1ebb66bf12"; + sha512 = "3edf6cc3dec21a48f914a754718a57cd495ed8bd9b807a9c4aae412a117ad1068abf0daf6cced6da74bd4887fe51746f1bb57dbc5858917ad17d8912cc9c4cb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fr/firefox-69.0b16.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1c78f9c50efbaa3336503c6810260fd9b8d7478fcafde0a54155fd177d22a8988e35edfb26ea9e3e0d6b37984ecf72a98b2928f14d39a7927b53c76df1d60bcd"; + sha512 = "9f92a2dbaf834f13f0f0fe2cff0ac433c01b7e8155a381d21324fc1e7224f7d5c0a8374a7e5e43f679232f565958ef946e3cbdacd3e711e34ae97eb27176321d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fy-NL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/fy-NL/firefox-69.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "396d65f9647de3d46d6936143dd1173e91a2d023e82bd51d6b22fcd0a06d87e376f83c33ae983f3d192cdd34dda8f97b38a6a9b0a3c49dcc75db7ff913131172"; + sha512 = "f98eb4bdb595db2f688c25644dacddb2049fe8f8b21e83f8cd7031cd23587713f1fa53f39a0b444f6ee979901806811c16599224c6a1a7d17cda84b544ee1848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ga-IE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ga-IE/firefox-69.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c66a6cda941dfefaafaaa6e674110e4825032d468dcd0f299ff9795a7ade24e89524badeb27d6ee9decae81ed63ae1c4df1ca0f9f8c7f1d35d50ac4cc36450b4"; + sha512 = "eec73de53bce5c18ff0491d6f4018e3fb39471d3d63c6cf9527cff8f4b6b6e0a7e24e3b7fed58094409efee29df7dc35f2410ea05d5e916efa1d778926ab23f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gd/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gd/firefox-69.0b16.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "077423578f0acb3ab6dcafac6394a5a75110252532e7552e1c81976298fa50187cc9f93f43ff8745f2cf2e148f0a4ba3d206607396dec83021fb7c825295d02e"; + sha512 = "1d10666f6c563dfa07f708b058fe867b9618974394a5eb4733926429a76bb6ea59e7ecf6a2a89740cf2f04692186bcfcafd2eb6775c5b59421bab0a92a24fe41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gl/firefox-69.0b16.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "52dbe9d4f88cf6d2d5710fecc95f0ea78519034ffc9d4f111cf96e99296ae77617a11735dcae3ebff552ba1fe741c11f4f767cb9710e4fea4d4ff961d42fbf99"; + sha512 = "b56d98f5a1e558aa73ec385c03b18dc9bc615670dc5a539eaf6c925f4af3915362d2d072f29ae3bde3f9ba266a321d704c6bfcb959d47858a650ffe7fab5767a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gn/firefox-69.0b16.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cb38005b6db3b58559baed9c427d19b36550bae82d6b6049c7c705df67ce736a772f868d4d770fcadf37e7a19cf2d02f221b2472ea9fafe26d00f3ddb0798079"; + sha512 = "50a9d482efe2c22002419f4559d1b90fd5f368a23deddd78227b7d20b6a051870a997506a1de931ac8c45bd5d33ff9152f3a8ad41c735912b48dc0fe9c073360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gu-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/gu-IN/firefox-69.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "776f81e4aa1c01d8bbbc7ff83f6c0eae549ca7b6b86aeb6b346280a7188704502c1f62790eaafda06defb73744930ab61aef97b9ddbe16581de2129da88c6eb5"; + sha512 = "8ce423880bb405240a78773c3f81aa08bf42b39c68068d3cc604486a96b44e7509c577b2c8f2285cce62181b7f11565ea6910c8871b798d0b6856765b16e1899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/he/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/he/firefox-69.0b16.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fa0a8beb4edc5363d339502aa132f257a6a78c2c96a5c9cf43ebc5522e43ccb96940acfcef0c06b2e9e5325860f2b93a5cbc3d77553e8c7f7a39ed010b1b69cf"; + sha512 = "6a0722861c63a414690e9eeb2456ee492a92b8b20f8fd9973c1580b2e3ef1bdb87bb7ca0d17603c429a76805076e2a7c4cf986d643e790b2b04c58b69aeb8758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hi-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hi-IN/firefox-69.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "114d157b3e2b4891544fd1c4496c8c2b2e697250c71210f0ad034c6eacf2b35157c18146ce843d2bd2927fb9e7f71f2854e8bda221d4af91b2d50df21747d0e0"; + sha512 = "4e9ba72349a3e58ee2b584b5d3ed5f601a1af7714104139e7dfa997921e6b7954a5cb7b78b9b8b7bcb7eb09da990116f844dbd96cab901ca408c2fd49303c35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hr/firefox-69.0b16.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "701470a4164010d28590f53008568b01017c4d0047d815f51b0fd1781c037f110c4fdec0820ef6ebda01efec1c0acddb7938ed40e946ee77ded662e760b2b61f"; + sha512 = "f53f4177603c41008d06f16bf9e102855273f53856e57f79967f59af64bd38f745c4d71583db50917a45a7c3bd64940f69ecdb864dd957798c2ce5b65f5a75d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hsb/firefox-69.0b16.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "625488b1e226d36b4995d81215128d647cb780062ab450a7df05c13edfa71ca5ded4d8d778876721228bb16c3545fcc069af692eb962d7a1028c0defe74a189e"; + sha512 = "f6044e9f09cf4fb64dd9d3935332bec46ddd783f6335206a51e68a411be57169d4a6388224da462d65090cd2ebfee64946626fc41ac3d779f53391c1765fa290"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hu/firefox-69.0b16.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5113917f0b5ac615fb68324acc6dc966a457262e40f49678c215184500cef1fdd300ddc18fd3bf62222f1fe2d00c916ac8dada8adf6060a2e2098cd96fc4607b"; + sha512 = "0178b084718079f1e6117f723e2931275a28944deb5bff48c3fc9d2548ceec7a6f019253cb7fb014b04e6800bdc62eded02b1ad26efc2eaccbbd2d0ca359faa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hy-AM/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/hy-AM/firefox-69.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "70f989efad4fd4282a06e78a1a6cfc28159168428b24efd9d393f2ef7d02afc06eb3e52349797e9e5a8b6cacd13a2cf7e9bd0758dc203bcc7d0ba4a77a599b83"; + sha512 = "0f069f14ab5895b1242b0b583e2a952c9a794e363973f68d119a791d5777048849dad23badeef6f155e1539b06468a4b7b0555e0e76f137edc523d09b6a51b36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ia/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ia/firefox-69.0b16.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "a8f01c33f945eb0377f2907811db68d912ea2e7a200e362c311a9ecb5b8c5621e05364a05fdc07a35a438d0ffd8e56f83341561823fffd0aae7d7e9794ea9079"; + sha512 = "fa0beaf3088becebfc5e4f02b884a572fc86b5f89dafd8e79741fcddd331f1d667b1c2af81050b56121ff40a2c9077bc514df9ec2de4d165b536d5b17cf2fa29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/id/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/id/firefox-69.0b16.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "359744507ac8c7acaa18ef5b81b7979777e1e860ae443b93b8b510389e198a4482f02d10e86996ccf9879748613a5a26aaea9fb5affc7ed8477891dbfdd6006d"; + sha512 = "10bb29fb1f4a588f8ccde4e087bba1c7b405c44a9a79acb16d189f704bc31ba24e33b1c89b1879deba4d5c5da0a5f94ef69a7987256af6fbb6d7571db85a1bb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/is/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/is/firefox-69.0b16.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fa008324cb424c675bd5ed33eb886db661329254cd5809e3c1d51f4e530d034eabbdc607cc6fdcb3a332f5cf45078b0d49425c83e6985f9cc87b939c94391bf9"; + sha512 = "48229cafe81da44259f0768f1494685afe072558dddac63c6321955d852ddd80a3b8729692dbb9c6b283a302e6d412d7c8d4f48888a0d5a1cae12dc1a025124a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/it/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/it/firefox-69.0b16.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "406e361c1ef650cafec63b213f67ca016e251c50455866ac112039abb85bfe62ef6c56e7ac103afd87c05535f42767e937f99a045d456249f87187b00948cd71"; + sha512 = "1097ddf7dad776303b942bc80455c8902c0c0fe1667fab972754260da6fe45f383967b8bd2d51e845a66bc0728c7655050858722c1b3b8d2e8d0331c8f612cdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ja/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ja/firefox-69.0b16.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d1c5d95ec4f8ca8e46dbe90e6c16d4e2da7b2c29664ee878be09c8aa46aa421f91c419cee4e8db0aff47c768df49ed316d789fb20c50a04390bc63bdc5e5cdb1"; + sha512 = "ca0e8dd301c1e1f76acdfae325445b2ebf45a15be70febeb677d215edbff7df509db7a38409b5039aab1a76cc8cb235d597f5b87f02a96bf842ef6d2e11e6176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ka/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ka/firefox-69.0b16.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "623aee24ae26658971a1bc83b80fc45e296c9c17a82abf6956ea6f019db37b110d9642144c7c3fd05ee681a9953f9d4889dedb82c6b421d975d13f4d7e0c61b8"; + sha512 = "99a1ae878c93ddf52c96466bae92259a4e51791ae343574c09f99e5f1878a15d705c84323af6b2871ddbe14c3f4b7fa5cc7a45c27b10b6bdf5bc70ce3a315322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kab/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kab/firefox-69.0b16.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0405b91ea64f7840632b2c7f633af1ff478cee3910ffa32b6e49a87e4d7eda3f96f27eafca2c249f8ecf40ebbb89a615227ea011cd6269a7699bdf68b213f877"; + sha512 = "b2b6190978068d2d36baf58efff771dc48cbaa09e53da8d19ebedfec4da5ab6c9c1c212ab0a9fb6cf7a264565b1815bcd2a2e0283f912c9ae3ab5fc6dd0427be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kk/firefox-69.0b16.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "b8d170de3d7224c17e72d6c598f7d53184c0ac7437b93b3770df504789e862e68bbf0ba73727fb0cf8c3cbd177fd100c8c0039454a7c32bc33b6a4e05e1257df"; + sha512 = "3c56bffab7e32ba9e0a572df36c473e94a3ef7b84207f204b5fa4df1473e4f64fe11a0b7bf8dee4cc26db56e99cf21eeb17b598dc211a5d9f5b3ab3fc5d625b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/km/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/km/firefox-69.0b16.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2d6d79109681322c73a9ca4b544e5764a0c6312d98dc46403a1d9f62285ea4fc2d88900a2a2c67f32ac61826d59f684ae4e0d9d3c09a5eca0938292e8acdf545"; + sha512 = "6a33560d83232074445c0cb31949f0e8ed4ffb18ce9407f4f9b8f5bb9460e949eb5d302b7f58a4ebcee5d27de0bc588e7d047ff8a17aa3edadc0ab595a175362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/kn/firefox-69.0b16.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9f143e23caa679ef6d7d5cd4abe3e078882bfab15cc18f1209b7a5b654208f5904a225eeb0be744de341954d076806679657546f2ad2560b5a7f8df1cca2d6ef"; + sha512 = "d67b40cb99923acd769bb10d824903dc01379c9a5245f6d9fe0747b58525773b2724329c64760ec1c18726056bd1f7d74d9e292b3173555011bf7e66d6169828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ko/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ko/firefox-69.0b16.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c1dc9b159da316ffc61a64684dde56aba305a7a17fe8a6ae32520ba950096e62c8e265bcf98124c45ab39ebbd6f9edf7ef63e8760b0b434810e7ef67eb9b7586"; + sha512 = "e932cf78de717646837ef432179a0b9cd41875b60ed5ec0c082f9b285c9899006844a61073689670449206a82c6a0bd72e076a51be1551ab3f757c6f0a060bb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lij/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lij/firefox-69.0b16.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7a9077eb4d267646bdd0890d785d6378e91ee4af4b41af1f90384af3ee1274441a78fe80e33de7eca3dd10f7ac4d1fa43d9720a931ff5036264f8c0371c4a401"; + sha512 = "d52ee5886f86e511f947366caaf2769c4b3fca87254091c395077dab4b665b35de7b66cf90849958bbbdd61316d5df43014a8c9f9bc9006641a40aa2e8d79f98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lt/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lt/firefox-69.0b16.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a9fb3b19c7413da23783dbb79fb890293b9f9efaf0e50ed1f7b13aa0382dc971da247824450338564303473f735175131b3bcafbde8696b227671ffc6e2d1de2"; + sha512 = "ea57e8db294d8b293a48d61257097caca093c9a2ed0b14b2d5c486de44b542cc546b751c2cca73ff6ae4945c210018a35ec61583f5b338628894117c04dbd135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lv/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/lv/firefox-69.0b16.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "805556c78f01629f44dcd960d29292b1da81082fd110101e36ad8d41b4972207ee201938413c24b623d891d2632575862f42ad96271c18f13f4f50d12d8d06bc"; + sha512 = "66054fe532331c73b0718791d83f389ad369fc77ecb0904c6fe3f97310ffb4d88e316d9dc618a07dfd4569b3c746ac882d8b353484c580af63c59f44e8257c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/mk/firefox-69.0b16.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "ad3373da3f42c2d4960433da7bfc2717ca39c39a4f9e3c539ca72feddcbd24bb4138d0cbc790ad0c8d5fa64a652e5750b4c95e363e125d852548164062f590cf"; + sha512 = "0f67149117eef961fad9355fe61353a3a2ee15f19e92a592d6fad69e46ac488c26f2b0269f6c229df51690bfead9e85c1ae0489230ba32fb27609900a9725f57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/mr/firefox-69.0b16.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "9e9b07ddf0647977cf93d8be02eff0fcfcda2914e8c9fcea418dc03ed3bd0adb1bb71dfa9147d222866d9b86c2b2fdc8827304fb4099da6024c205ff9a564f8a"; + sha512 = "740667d86641c92ac299fd63700ad74dc4ec2fabb261bff9abfbb704e7181863556aec952b420f5883ab6a18e66d237d15636e2d9eb7bcfbece6227190b4b6fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ms/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ms/firefox-69.0b16.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a56f7c3b8c713b08e1f5e19b290fc1f0dd108d285b83fa3489bacad6757d02970368f4cbcad6ad78ef53c587989a8f96b23146024e705158a9c3b309bf530041"; + sha512 = "21ed058002c2c57c0e0e43658b12a7b257009814d13566d2d8a5164d0d3acb131a8c90f99b1e577b6d002f7e5019e296010e61b1df2c5d2e9443e8f55f20a4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/my/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/my/firefox-69.0b16.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "5be85980189d689fb1f16136c7ef0d427efdcacdd966a00c67527014588e62c20397483116e1728682be5eb6aea445c1cd3d8290452f05a32023ba593ce0b536"; + sha512 = "8273c4d0df0fda727465d5bd4b50aa09dda1c81b4e78e291479efcceadd87ad24f50e2dec1accc2783fd0bf2e30a2d9e775d44ba599384f0e8e4ad0b6fe08e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nb-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nb-NO/firefox-69.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "008908a88d4c4edf535b3cfc009140da760e40de0b14377ab79320431229b0e9b27ad745aff2265fe7d689e1391b3af3467a70f4279b82033380e3b7d234a5d0"; + sha512 = "492842b037b018bc07827902e76a117f9ee4620342af102f2753e0d898ec9b070412debc6f72dad2d899c3869c27d2d969bbd9a8cbfe4d0c10d85428d9c7f3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ne-NP/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ne-NP/firefox-69.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "7d7bdde40155ec5409b43cc150c44b6687f7ae8bbec411a5b1c257a0dc630d58c6dab289772804f632fece1a3dde5d613f939ff153486a8a38052d3f1abf312a"; + sha512 = "5e31871031f4745af8e050e18b1d2f2a16bfd18596358b189c7940a8ff11e999e44cf2e96b62404e481d0d8712f151a10290ec36e5903ab72e26986a03f93e12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nl/firefox-69.0b16.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "467e487abb563fb8354c0f3a3661951acd40c851b4f570bb9483580a9004758304eb35842b7d75b3a21f0108914487c56416584f02abfe0ec7180ccf0e9af166"; + sha512 = "8ca6f3842359e5a97445692747ffe0d65bead4222d0b2f90f86dc637a6e02a1cc75909ea03acb0c232185ad626cdcf2a5dafd27d578420385b7a4df353847323"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nn-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/nn-NO/firefox-69.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "bd3ef206e3cc0f8674391940878f5b9bb9cffaa82013bd59d1bf924bfd20171df753ca51fc74f139c8bf4a977397ba8611cd90664de80b83a5eaf6ff3aec05e6"; + sha512 = "a64d50c1625f4da5cde3aad78b04a4e3278ef3aabcb19cc9a9542e45f0c82f09a63fb464c0b2d842e107f22ad12226655617023afad112292ddc22d735a25d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/oc/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/oc/firefox-69.0b16.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "5c955c03cb776dc6eb584d29197945ef22bc1be0074279947483750758b368a2a88f23b8412ac8e76ed209f37d35dd37f33726828bf33c8cb576cd5f7f51e7ad"; + sha512 = "1b873b5a90c8130be2a782f8c0459f853d3fbd340d7500550fc7628282b1e575d92a1d0af263665f7fac7192c22910e8338b66abda828ffecddfec79dab62fe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pa-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pa-IN/firefox-69.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "48442fc58995e0f97ab255307dd6adf55b296316f19487f35635df4252547b3d3da3d76fce995918e9885a5fe79a68c0e711ec20dd22546f5dd5a4a531654009"; + sha512 = "6aadc5b934136d99161d4f52df74653ebe0ba2d5fd1e2468c103b34862a331ea269c23956ad27c7883811a474b6f915f6076d9673ab4767e5a3b0ba44bd32ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pl/firefox-69.0b16.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ab5f1d3e874d4cdacde0ef1978202fefb71ca602775ffc5d228729a6ea23c47b0efbaa3c554290b90030fd5145ad4d9a2a11b8e22973ec5923fc41edd86b666e"; + sha512 = "b3caa21e7ebf3083be1ea13da68a83775a0713f6046994991328a293cef558abc523c43572ee98587c777aa779498cc5d7e671aac622142b4801386e2e1532b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-BR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pt-BR/firefox-69.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "55f0f8539a4439c9e78ba794f9837f89cf9470cca827b036c69098c83a9cef91a1abe5dcc0b350358e707b274944a81600b90022e52884d3f2c7f7288b4a7d19"; + sha512 = "f8b591901004a08c74a79cc4a9beb5139adaa2ba15261680c20c215ece1f1f115f0a71c4a2af2665c2c35bc3c5d3b5016159dfea5f603a981d5ccdc6b28c3b98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-PT/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/pt-PT/firefox-69.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "23b9a79b6fdfae7a61a9efee4e0624a925bd234cad98c3309fe8ae389e4d01cdfd3c4f77cd2283f9649d87daba59c383d476d3f6d4768e580cf3905f5ef9a943"; + sha512 = "ba910b1e9e77a938f4208679141b24bae1dea6bf83a2f3a2778aeac59da1e8ab22ffe9333188316e170bff75bfae57258f3ff53c08774d00ee060de2d6871f21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/rm/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/rm/firefox-69.0b16.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b33e9e6a9d1fb694be1fb3990a790bf9fee990b1d45c8b3a318561c2417ba5fc0993349779b58aa2174f2fda9e610b0728a36c0d926a07f73275a5add8413f2b"; + sha512 = "0272ede3149ece3f87192f8cdcfd74313fca17fee53c3c86dedfe702c8157257f29931c14168ac11095f0b0def077f267f222919cd7f4b5ce020797c36c3c603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ro/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ro/firefox-69.0b16.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0dc002bd4872ed8907c0794430b44476e21d732624626bdb8f9cfd3c81b4b63ccd21b11456f660f58a05ffc91881903c510222b093c316f1182376eb051f5989"; + sha512 = "b58e3742fa43d52f737285c60e8b1237fea5158cd096450bb6187ee10471af0a77025fc526805c0ae8ddfceef7b7505dc637c8f72ab4188db31d0ffdf11ba606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ru/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ru/firefox-69.0b16.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "b29a6e02fb86387d1209b8aee76be34e5ab9e1848084d8f722a55bbc4f61801dd0e694ea6d284574ccb89c65ec0c12f395a97f4232b39c28ab7b75e730a436c6"; + sha512 = "f0086698a2deea24dd1510da377ed9094273a7867a920b0d05c6aa47d4f4c5042519d02c5977747df05a416a4bf94aad0a52a0b03869e693f621959a0f980a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/si/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/si/firefox-69.0b16.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a31294e1cb39c3949cdcf0b926edfd5f196e6e9a91e99c213d86129896c56b47e4f3a33b11c4b6b8d9d44a2b0fc767a87a67d9252cf1e3b4d2ae7f9716ccee4b"; + sha512 = "4b0018c753aacadac60961b1e4a793b6a0f36d2f8844ada2515ad8081822cbb869ba23f7a69143af860ad060d86e7ad157a41609c1fff0cf481b45bc55a23c0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sk/firefox-69.0b16.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f736359f8f3086d560b84070f35a2184b316c5f6ebccf9665232b031a220d3d638e85c67ede20c3ec5836ef12251f77f4df429842c824ebd6961d58a99ba3c22"; + sha512 = "f19ddd306e48cf04bd70b008fbbd6827045d332839458126ea16393b04e6b76dc8397ade3bc28f5798ef24f27c9dafb578808f3ede8808609c24a8bc20935448"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sl/firefox-69.0b16.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f5f0f3cfd91ca5a5201e3178a39d8ce0db3f01a36a4854dde16088c6b8423b5ff6e45793bc5221a02fe444a15d83078ab13ac48ae4b529144ac183aecfeb4811"; + sha512 = "104f68ebf03ca5165ad9fd049beee70658156ae80b62e88e2342e845ddaf5603199d3ad66423a08766fac2ea2db07766e66b9e09b9e480af4cfb08e680d5dfae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/son/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/son/firefox-69.0b16.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2ba05fbe3f440a9010f999bde29849976042f2874b6ccae408fea5e5057d812fd91879d5a288ccef6a4795101f854f74de794576706b90078e1f3c3887818592"; + sha512 = "4ba381efa38f56c60a7c9afd625514c2b93cd89dfbd3e99968b89b8ae57bc8344f5686f6e7c87d8b21136d8f72e4c61af617152d534b749fe0ee731220b60716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sq/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sq/firefox-69.0b16.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "cac976f53f72a5eb974ef97727a5d6ed38a5a4b8e61094f8e5d76968d6afadf0daa68c7d6b29a45df6dddef8cf26973e0ab1a65c29f906f7e404cf0b152c5e08"; + sha512 = "8a3a3b1a8a48e8e681ae7765d8a0e9fce8f87f3e12f4af3fa4fce3dac0ef74524d4a14c1f802233362969237f893e02d22fd44d7e032ce2f45e69abf8a18c738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sr/firefox-69.0b16.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cb87cabbe1a9d5910354887b0a6eda4ee055b823a0ac35bc414d41f9fae636834344451e3a882c65cf581d21e875b400f5e3e054ab053ad1577fe48eed8dbfd6"; + sha512 = "6ee469e7a091662d62250f17c7d45810f9db853571185364fd7e9f561dbe6e6582c13c5faad081769a8fd715fcb0230347cf88e642531a1d7e941072a2003990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sv-SE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/sv-SE/firefox-69.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c4412a7488797482b3315a2872fed79ef033ef4fc32ea119e4a943999f5a892c430486a6e13236127c97af3c01f25724bd5ce6e84d4a9bce69d10b5ef84ffe7e"; + sha512 = "5ba63456a302baf31a03f129fbbb820a1142a83b41a44829947ecb1878c1b7723035313844b7ac5e950440ba1feac7f14ca1473b1acc75f4899fb2abe259057a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ta/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ta/firefox-69.0b16.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "55729c9d755d83286dd88642cb130d75a827ecf98959cfc8e20f205e6c4c3ec31a03fe0a6f304662beae68677aacfaf8b993a4f79dac79c2b8157a3845bb022b"; + sha512 = "b9f59f57c74ce57b80268a139bad81014494e9b2fd173be997c5aab61aaccf28f84d0eb1089c3abcf21fb62dff02b1b8e0176e0f4e3adaddbebc5452d9f9a07c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/te/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/te/firefox-69.0b16.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "2cd9b38b607b89b909216afc403e7394574e66abdafa327eed33edbac45eba850be22ff651b9581c53a7ab4735c29f1a4f2ee3fb3c220ef2f527f48d919b15fe"; + sha512 = "84130d585c0b0e80007c9c1fec4011c44bd087576d1e351bb899893797d4ee8c9f856dbe4b9f8ad37a2aca98dc46c9eb81aef1cc236947b672f7c6a978f28bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/th/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/th/firefox-69.0b16.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "721711be47093f846b42d5bdae36ce083e05ad7edfbd75a32827189c4cab9da3af0b34551d55ebd67cecf8e04912c17f2a44b032f2a9a76e926a589381f3ebe3"; + sha512 = "2a731a0294dd73b113983d70e4c5a779fdfd92a855e635655aec5e2316a32c97812dced18c04820c4332ffca63805af816df5e7a180d9c8108eb63f4339d8578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/tr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/tr/firefox-69.0b16.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "36c4b39480b95152795ebe744c6d1390f38540c3cdd19cfaccca40f3da446a5afb6c5b8dcd3bbc87b15bcfb5214870104724d645cc630c87373b78d89c7acf94"; + sha512 = "5e1f639a0807cb403bab8157b3ccc0806d3704e27d2e682ab56bdbfbfa488b71d454dd983f4c9cd1754cd1173ff6e14f097cd2c8db5cc7075a63b94871dfe94c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/uk/firefox-69.0b16.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4b388a81e67390ff461681587914ab944230361790f5b48676df5d402aad2a3ff28c808a2c8ecb655f2540c3d6cbab8188c2b154c0e173625b7be121968e853d"; + sha512 = "33ec6d4c9ecfeaeaf5659b809faaaf60f24382f2c8918eb4bba81231c12f0c8049bbf766fa3a41a8947e6c745932b4e908f158f6a532c473cbea3c6a833e8d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ur/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/ur/firefox-69.0b16.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "43cb375b00bc335f5a5907796ffd84279799c8c907cf372968abb8a1e9c4ce4a4b9b199eb0384b548406a158216cb5e42efcc61836b5ece94fabe83d724bb26b"; + sha512 = "2b06b2b145593f6c3cb74b16553aff15b8d453b3ddfe6a8ccaf2cbfa0beec3274a2b04b10373c5420dc67062c246d484f099ca3dbf1fa94ce0dd6ab6533dc066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uz/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/uz/firefox-69.0b16.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "33c0922104c4f0d6e9a5860738bb5e5001ef24c047d617b86d16f9a8668092ca0c3bf88676c448947e4c07c3d80fead8714291cf9e947698765fbce65247a488"; + sha512 = "86b5066b07f8b80dc86873f2f418a4526e386f65711199008538ae192d9af06cfbcca1132cc95007b44a9ae1afb5a76de7a2c4d971b59177e097b4266e075fdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/vi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/vi/firefox-69.0b16.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "d4fc27a2f69dcda6832bd0372c97381e3c47883b2f9abdb21b67b2c06f392cf2e2e8aaca8f0c5f67da87f8884b7be8d407b49a3caa04dd166165a8623f621cf7"; + sha512 = "c474e765f85a145d4fd0c9410305e56fc8f32c6eb9c0ae139aef48e1b35ed4eda941c92d3030266d38738ea559088ba799db1c937a0fbe3867583beb4825a93c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/xh/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/xh/firefox-69.0b16.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c7d3c3975ccd4b2635f30aea2c2ef8e2c8197c52730fb60fc0a9adc5321a1f960565a442d73b68ab15367ff06f87ad09e463c8b9a0f871aca526716828795d1a"; + sha512 = "2fd1fac92f3bd260949c0851849424fce5ff56989e7c9486ff11702c85514929c49952568ea45d0e2889e806f6ea1556748b475646c90647a92e50716b1250fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-CN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/zh-CN/firefox-69.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f6df2df60e020f07aa210e373d177a49204ac35912172a0885e9767eebf64f660d2288e3d9d3cdf574c22c4c0257c955faabc02721c34c59a113de94674d80fc"; + sha512 = "b3d7786d3883a99ca1833905ab971aba5a4ed42fec451bd7d5664c329a4deb495afbf00975a7c9935bff42b42c828d830984d389a6b0b728586dec9017e37fe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-TW/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-x86_64/zh-TW/firefox-69.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "70d1cc8904f27509fc476b59a634eb7ac26cbf53c88069b104d00ddc3c596384d75bb5522bd38fa25f2aaebe2ade7453505622110a36f7f77f19062a846f01ec"; + sha512 = "67d506a05c404911c3b937dfef3c696ae6d3739b3113ad288b46b9a995028d48ab7c7dfbfa7a735f453698dc1b58864aed7b718f3b81bf42d3e8114180743692"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ach/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ach/firefox-69.0b16.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "74550f32169f07e5d551ed20ddc3f24f731a18966f75f80d40187496af4bffd1b0742c6ca001fa263b236826f2dfc6edd21e724bb1e4c8c8260e5526e20d031d"; + sha512 = "8115dc00b12319c89463a0c97c3117df8109d68372ce91287bc382238d0f0a6d2795d8540bef5ad5c5215f237bc1b23e4e9f11a63ec8aa32b80e0a501c27f534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/af/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/af/firefox-69.0b16.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2d305bfc2ad71d6c37a3de2e4427417c5ca67cd97eeecda91c8d5a84d72eb7f02c6d11a857af6af673caa5921abe8420b673c4ced79025eb5a639f466e0cc8d7"; + sha512 = "1bc5809edf99dea1ecbd942e92879139056e1d5bc83512c84fd110b227c37f76997e1f2d00f4471f03cc00cecfe4e3e2e62af858641539c08c4685a6986baaf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/an/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/an/firefox-69.0b16.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0a6319ac1017a9c022da4d8a3a619e9243668090e8266b4778e767a9313aaba5c1d2d5174f640c3103220b5e0dc40ec4040690767062d8e6819ac0b3573ac464"; + sha512 = "7a1abe0ba440d50362ec550da3061df3d2e498f94587591cbed920c7348e2da6f8fbd087bd3fcda2462e18722db0b0c2ec129aee8562670af44ecb333b2a912a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ar/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ar/firefox-69.0b16.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "dee2b757f449dab23baa5ff16cdc123564650c48cc4492bddd36e7ef4f99608c2a4077fe7478d035275aa3ab2368b54e2e171ab689537081b09de0388cdd0922"; + sha512 = "89adee7c9ce7e74ef7890f3b8ddabea3d6e06c90db695f3d19af64b7c6602f9d80cc2c2c6d2958ffe4909d734507074f658cf4f04701e5ddfa9a9a9d4062e21c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ast/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ast/firefox-69.0b16.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1e92c8fb6965dfbc9dcfda7bdd44a8612487541930a0e758c0e8b8fd27e2a5984761a430420924adbffbc11f6523beb80a8995f1e6d0ab37cec9d130306f81f2"; + sha512 = "e20bf6a66f67713cb3225b8f8109c4d44943102d2a37571c3489b02d88d5b677d2465e2bd51783e720e5f31b59ad51a1ba7ba0cde723e942059080e840c63253"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/az/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/az/firefox-69.0b16.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e35e1e9a217a7a8da13297e7cc1d553b7a4698ddce0eef31bea85709c836f4ca5993cd4892bdcf0e61d6a37cf125a4b9b6a4df36cf19fd4f09ca63c802069bf1"; + sha512 = "30a25fdb3280a740c11f9b3f53f871fcb294e83377fa1f6cfebdf939a73df583d8806470eb62d3174603a29eba599ea5c6d5dcb4106f4afed18a899dc30c1170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/be/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/be/firefox-69.0b16.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cf65d94565d2b25ef90353dc686cc4780eeefb29cde142a735d10e8511e4d9d1db74ce57d80da35d1ad9b9cb3b8cb060fad01ea95b46a86231063f4559cb50b3"; + sha512 = "485be4d97719bb771e25ec80f84ee94b7ac5741baf4a08a06a02ca54fc915d7c2a54ead25a0abc9d40145cdb7c1a34ccf6a727eab710a29407ab5587f6a0e778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bg/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bg/firefox-69.0b16.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "09540c63919525169cfb3c2ef8d19115cabaa63b41b21de43e15335797761d1d452c80ebfce1768a88f3a0e135a222e30486708a8b2ef5c1327738f2d5bc8325"; + sha512 = "14b2380a52cfce2dddc48a8c0cd52ed31d01f3c46728aa866e0d05360f9d078aa7f59ca7bcc33d0ca7beb60c81780d5def46e1b05786164a0123d95b80aa100c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bn/firefox-69.0b16.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "47d497da9c178e675989b046acf7d35caa7a66090d8751090e86c5b9d9ddf6924767a586d43d33a7a093f1885f5477a8bc008e58eede27bd219e0acd6b00468e"; + sha512 = "1ca9adfd64c8194fcb7014cf48a87e171d5fd667515a972259e9bbd5ae436470a64c2c03a7d672c411bb0644bd962e41f60dd5385a5c04aee1ff7a2f5b847eb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/br/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/br/firefox-69.0b16.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "bb313f01a39abb6687b71314755be566ec6944fbe0aeb5571321032ee814e4aecf57fbdae9847f4e72a8844813d086d7cdb2521a09578ad04a0f31891571d508"; + sha512 = "e80b7a6ea23d381b416af92502b74de117eaf406f139705390b756c604b58fb874eab389da7d4adab4a14925b53dec66b768892a12324f2f57979ddf9b3fdff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/bs/firefox-69.0b16.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "3b6a6e000d6887604696014e82c8668f4dd5e798287bc2e60cab98a0a51a4446854fc78a606615fd760f731c70cd10bade6e6f07fca17c5abc4e50d2c1cdb893"; + sha512 = "72b3c206cbf559784bd2adccf3a24f85f840e26b4975b3b0a2796ebd5c1ecb2bb00ccf6c1cfd7fedca191fae33f6abbb71d742e00e74aefb7b4314c91c0bf0a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ca/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ca/firefox-69.0b16.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ddde0c94dae1ef133d3312043271d7fc9d626900f5bbb473b7aa6c2ebb455d358736da2736271611f3e6b336f7c88a4e60d060101788bfc7ccccb9e2ff863259"; + sha512 = "450f99474c8f86c5af4bdd210be09a6c05d9638aa9efdcabc8a0d636d7965033f4b885fe6a48d22fd50b6144fe461fb0f5aa7870fecbafa9f1b8cc769465099c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cak/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cak/firefox-69.0b16.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "875439f58c7ccba85c6a59031d92344262de3fb27852fcc727b15ee0964d37eaedf6715dc5569cccd0f7d684e96052b84926c4b81c509fe456015eb67ff883d8"; + sha512 = "dd9396d37038bef1a0dc8b052afce384c83c7aa9ab9992fe6eae879b6721b251bed5c12f7b1599de86658e16829bcee15b411ff8dd40bd8afda29ae5996bb041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cs/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cs/firefox-69.0b16.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "c93a27a66889e2e2ced6dcea0495d9295c179b2aa2afc706196b84a4c4537e0499875bd2b2ec152a38d2c5afb5d1d45224086c2cc2bfa56907c9f9aa883deea2"; + sha512 = "bb722cbf74437cf3ac9f870fcdfdba191334c3f6970e1ab0b4d0da8257e60cce09d65177a4f81dbbf225e73b03a8616aef4289a27f25440e2526d96a501443b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cy/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/cy/firefox-69.0b16.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "66059d9f6e059bbebf42ab3d29fc9103de639e5b1fd7f4b8b0648b98d86a030d668bf35852bbe83ff27dc3d1ababe47a74f1e37a227a61da6b4c90b12543207a"; + sha512 = "e6c0f84a810005f2081ef8cd88b94e689caf07c5aa08b4c2f9ca5d5cd071a8e37d1f572c82b262f3e26381a6097c54ab80bfc4a0d09924693937751c7a1d79d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/da/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/da/firefox-69.0b16.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a3943bc573c65a0c90a88ea76882a4b43ded06aa33c1bf1d861d3d6ababfef3c75104c7614b740860cd682c4d0cf3fdeaf54a41ef206f117ae8197a73431d362"; + sha512 = "d209f91aac27c9cc0a075cb51ed4f9d41aaa74a7407892ec45ab2ce8c09e77a725fa6e8287988cd53b0b681be785c04babe13e19e63c25351cc6cedd84156a24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/de/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/de/firefox-69.0b16.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2635e6ab49e4545f562043cc56e56750a882943ee160b3f2bcc328ae53bbeda364746a3d97cec3d84086e90b554a98184d268b27efb9e51255a3778ce1f5abf0"; + sha512 = "64b843eed8012fdb91fb6573e2e7e8900e3d3ce2c476a509e1171746261ddd1c15874d539e416d5c0607b34e19b01d56f2d497e4d09c595d29febdf3461094e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/dsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/dsb/firefox-69.0b16.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "aa44a98135e4e5b3f28ac37eed0103876a817c07b231830271c2dd44351ac43da9139a3adbbc8a6ebf0cd28c87e802db27632d87e7f5afb0209f4816f35273db"; + sha512 = "27801c40f75cd6824af2f6e583b99396c07baaa66c1aed6bbd7382fa85b7969ebedb6877dc0a979775ae153c4274dcb970401cf5686bf681b3858009eb8059f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/el/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/el/firefox-69.0b16.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6c86717c1ec09829567ade584c4f114d6bc92c9ba85a4583670a038b5616521a4578ad97b023673125fe85b9a99fc7c3999fb7e4b50fd75540386b6024d26c69"; + sha512 = "7c4452fc29cd4a2c6516445fcca6c470f9f8ee81ffd600dae225eab8857ec43593f85b182b2e252cd04f3a6279a86dbad71ba0c2e0b723cd6d8c4a354b3cc582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-CA/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-CA/firefox-69.0b16.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "90af2b18f403b7fd25bf5d920c3eaca638a6fd5c75dd57afdb0c9e1a20a8404cd652d2c69b63bcbf4365af88d1483f02b929d3b825899eb465c142775e4eeea6"; + sha512 = "53e7855ab3575799e96569115cf5882233a31e4af1e15009b85593c7fc086e85b7bdf0148694789b816e8a469665f82cb5f1448aa4cdf160a5f8abc97f92253a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-GB/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-GB/firefox-69.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4ff1dfe725977d16c23333b3f3c8ca035d4973fea2d7d1f49daaf75cf6597fa56690512636a19455e5fcda984a4ac887d4b987b45b811683cb65d40daee7b8a5"; + sha512 = "db512b8a4a6a46021e2a24ce0ead90d8f56b9eff756b9b1a6c8cc1290a96eb51d763d96c0475c7636b9ee9a88adde7f3c81eb9366e3eab3448afc60e2a060108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-US/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/en-US/firefox-69.0b16.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "851e15abeda5a7d9faf74950e97b2decd6ef989c04acf8d57833f9172f0793f9741d9f1212c2aec41f017c8ccd491a1dc973beddee39ac7660e63f2a24463911"; + sha512 = "eb6ed30b684c016b947e3354da57b5886b29524b57f4bff4e071fab5d5ae978b94adf0572e74e9e31e15e493098aaba03344b632d0ff71145f90a8e5c7e367d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eo/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/eo/firefox-69.0b16.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "623247002b82238eb05f4bc7fa6182aa5f68121a87af6cb78315b4f144a17a50899905d915dba41b5dc2d372ff97ff8dfbf0ed2a0a216c85cd45f65206ad23d3"; + sha512 = "b2b343ec5448978d9ecefbe1c73c94e8d578d875dffa09fa3739c396c3a09ddef4bebb7bf2f5c12b1bc39fdd3b8e89185c2a514422883d0e8856af854369a501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-AR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-AR/firefox-69.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fe485782e38e7f0b74e96e2e06283b6ad30223ab1cdc3636fc15810b327ba564706d134ef00ab0a38d4f6d5639aa84a52cd46af4726e1fbfc9eb2ec19ce1862d"; + sha512 = "fbcc4138161f11c0c61eadfef889a72aa691bc5b9db961a52cda092b638ad5d2313fb5934bcf2dd035f225971bfe1561acab549da61a7aa885191ca2c3112d7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-CL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-CL/firefox-69.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "8520600de63e160c21f4edddefdf8f971c12456a5ffe967dd02ca00c7227b34f6b8acc569fa0c0d40c6f91bdfe97683444eb38cbda8d1cb1ba2b913c943038d4"; + sha512 = "ff8908b2c09877a2c7cbb0842e826c51069234656efc9b7964c2432e3d61154596cd63864a3a6b331fec68ece3118e5cacf9014389806dff8897933d584c537a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-ES/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-ES/firefox-69.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0e36857acf8231b9be9983aac35b2090ccd85dd2f8cd7b37021f2d62b37b17eca4e29afa8afdc000ff608bc535b3583720c4111c6bc87a67b5928e25d1912f9d"; + sha512 = "1546d5d67b1b4c778d137b35189470c1aec01e617c2ea8b52bbd58c636b5e2a262db5a8f02bcfaa45ad1fef499d9c9e135eade38f3daaeab6c456e52458927e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-MX/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/es-MX/firefox-69.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4611aa1bf2f9717093027cd38e60afecd855f9bd6f5b90e57ec64ba61c2d3cfa38e94688e5b7e02e6ca40a9ccd03ea9c25543b03be297ab76a89db3395fd7dca"; + sha512 = "da8809ae2d281547be55b0d3db4c779758ecd5c2b8204f54f732708816fa1d653f593e9e0bb24136213f3d1e94dee6394e47326b74be2401ba59732ff4f8dff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/et/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/et/firefox-69.0b16.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "94d4cbfcab4dc697462001946eb91733e7c9cad2d70d1d7070ed6d6e4cd83f364338a70f313c400ebd9f17bebc05d8297e27b5d662f0f940a66e63a97e549ee7"; + sha512 = "7d9cdace25276f868e853d7b964d1fcd18b7109d4072db49984d5d00628c9910c99cf494304fc962245f8d551ca9f95a603dbb1cc48f655b724353e869237218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/eu/firefox-69.0b16.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e140a1bb452d2a970d540b764ba41bd70f4042f7f6f2d8bdc3407cd3d428e009815c3fffe4dafe3964dce45d860c7960d0818acc6fc8878e323b4fa1dbc340cd"; + sha512 = "e3f8db0d5be3fbec65d27c3cd4f2272fc5dec401ca19a0fd5bcb7b48a196e81752d2b1c6b72bc94b3294ee09eed58b765790663185973ab34fb7816c38570ce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fa/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fa/firefox-69.0b16.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "2ce77cb106e64e49b2605edd7f6ba19e7c0782356de0a38ee572e8b5f18020ff4e8235bd83749b578d67a40ac81b246a531e21ed24a944e562444344bb594121"; + sha512 = "5be17588077f86e6766e1c257b73e8b81b2213f3f9079c01539578a6480fd07a90d4129af77f81418b4dca8278c44bdf997b3e0686ed1c2e8e4a5269644d21ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ff/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ff/firefox-69.0b16.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a3b44ae73ff9bb7ace9ddc7d7886b4362eb2265fe0f8d5b2e34fb929dc367a6be29a46d750cd33b7d03cd321827dc261f1d88cca91fbb180ee1dc72398c1281e"; + sha512 = "57f543f448b8a4abc99201eeae76b0574841a5c7815d7303844b5cdcb4a5668fa03483d9a2953f9a56bbe175f8f82e94b4aa58d77174e5ca26c8755c25cc6c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fi/firefox-69.0b16.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "934f497203bde168237ba43d49400dc48c9082a24de8f74ce887cbbc1f35057a2419dc346b88f18ed7d78596ed220d4f65371fd2bc34a1ef005803109c7e77d4"; + sha512 = "bfb0d7c4a4e4d0633879f79d8ad5a406e7e3d57f80ab1f1eed671ef85ff7065afa826769b868c90b8e90b87dc012016b419eb0a57de344ce51f49bbf61094931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fr/firefox-69.0b16.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "778509904c83b8c00c0b71331c770cad677ee487079710d9244d1bcc5a2e2f6e397b30c1c8ffd7f787f8fbbe87f509105bd2978d26f60406b8904245f170d79c"; + sha512 = "b944d8473f8c7a859b738d78140fc6b840ae7798a3a0e8c237bd81f411f87129528ddf68f33da6578547fa768fa1465625dbc4a94f265491722bd4f23a614ce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fy-NL/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/fy-NL/firefox-69.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8cd82fc3c7a2558f5408d2e18d8fffc01dc1a0c69f52e61e7da185a9b7d24c79e29d68c7e61386b6910aeb8f91276fc1fe5c142ca526112b1e0ab206ec3757dd"; + sha512 = "445018db73c97ffa87377bc78162cbe2f31dae2ffbf47ec9e0bb42001e5a15787fadf4ce2d4027693eaca4edbfcee72a7e3874594d3409384df62c91b118d388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ga-IE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ga-IE/firefox-69.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4e0184a5d0f6a8213d250b2210076e4857d27224b2d6ca27375a8951417ffc74e8fb02b9b571a12f34f59911f0663ff21d1abb09836bc0f4a1fac3c6894bf82d"; + sha512 = "2a6b8f3ecfacea21415daa0dfc8e3797b5c3567e7e7bb9ec933525d2a2e9e51dfd94fa81477878e2bca68f8127e32e387f43ac8ceb0c02622813baa5b17fcf08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gd/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gd/firefox-69.0b16.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f67a284aba28000a070f06c1b075dbf3edb60b4704c62fe80df4714df51395644507ebb89506ab2cb65ccd8d1c16e896da0c4dbac7fd3251026f0e00bcabe014"; + sha512 = "474d524fdab0d83bad98e0f05348d8db0f49c11f2e50e7b5221137359e268e37e662440961bb206cb2ee44aee9d07b4565bb8b27a696ae0df89ceff76309820b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gl/firefox-69.0b16.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c07c74904f845e2b740f6eabd334fa1aa0d74012e86fbc17624d671c7e2cb3d78143a499aabadeecdf276c3c6d4f2934a54240ec7078619491eeb28c8c50be9f"; + sha512 = "ba2dfaa33b47ce1106496783bde98b1ff7cdb0171262feb8890a6ada29a67c34165b8b7ab58aabb89029d0571a6ff8cc83b14c310270e0e7a725ffb9fd7dccc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gn/firefox-69.0b16.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "426ceb6386da90c30726ff5318613bb88875c1b109bbd73f46f6c436b61a18b76a8272807323abf925e1ebbc6531c7d82ce1af5dbaa9a2941a8007cf8dffd3f2"; + sha512 = "e5f5bf7d20eccc3d860ae2b8c6aed372944f23ed6d7a41774141cf1d67ab40c8bb2cf7e8e5931d37b9951668f03c6ab1271bb57ca7ead9aac52045244fbce93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gu-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/gu-IN/firefox-69.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "71217c32a6cf4fe5bdc922d09bc290537e58f26a75290bf23a5fc60be3e42b8b17d5b05dfc8ea4c547a149e795fc9449459d5f74efb4c7d9ab7068f5533c0bb2"; + sha512 = "9ca06aafebb4ae5a65af94c7fd4dc30bb0fb37d6f50a8a8d0b5d3a92cdbfb7a6a5fc609f5f9d93c47cbfd811198e19ab554d47cb7a03db5a9848135660b17f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/he/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/he/firefox-69.0b16.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "580b58ccefbc9f1d79027976dcb8b880c6608208322449146c99e1e6ceb18b0d9069891dccee5c37df48b8251984ad915228fdebd48d3770b54e47ee2433440b"; + sha512 = "ff9331af69d497b9886b7fbfe3954c0149e170973c96d0bd23252e0d9f97964f88f60e8258785337c8143a5abddfaa4da5d1222b27c42e38686ec44c738521a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hi-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hi-IN/firefox-69.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "52d0bf548b7cdf6db5bda320f8262d226adde14cab042458e591fa922e5c4cb66c7a10699ffd3a4e90b9be522c5dba77bb8bc787b4db73b6805a04b72d92f752"; + sha512 = "d50d6887657b6dd61db4d53c0008e42850000d56a56b53532900cd6384c64d029a7a276386a5b46aa74b05c5597a4782f586b27cb01d34058c124c5bb58faec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hr/firefox-69.0b16.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8a24d6c60af65b624a3f577a984d237ac93582bc5630ec2fd7d3c39902ca73ea47ae34d41fe90dbdabf15872bfd679e029ec361ecb7d38c17be4441f3df298ff"; + sha512 = "d5c5a069cc845544cdc905c9ed3083329b75e367c99accf1986a799a6f69f081565ed0c9e5bfcc6ea9e5c4b606262e60a62be6d4271267094c5aa701f090cdfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hsb/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hsb/firefox-69.0b16.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "085f6fe6b298047cd08c153c8fa9c3266c8fe69c0165647c863053e2b9836db9b5dd083c7fcedbb2100b22947a296da5b0894897eb801734430e153eddd168b2"; + sha512 = "9b2b8198bfad4f9f1bd5808c2d696abb1473230afa20e42e216c6616821a98cdb6bea6b92efdc8280892e04a0c1b6a967adb9c69fdee9f9c1bfb4f6fd4d17da4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hu/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hu/firefox-69.0b16.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "06c2e59c69eabee03b5bf118d27fcc5b9ee3ca21e1596926c5e75200f47ee4b27c4bba5da0e3a67cf6acd7986dd066f2ca79089156559c2cb725023067dddbbd"; + sha512 = "bb189556077d8490596acf9433146923ac6a68e26d804fd6946a0af1b247342f5140693d777b9dcda41972ad2ca6773b362381ffb9fecb58826c0353511065e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hy-AM/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/hy-AM/firefox-69.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "94f95dc01d54875be32db75a8ba17202678aeb8f0dc471a356b73ff6cf2725d302dbb5bb41318b69e904d9a685e8b833bf0ad489818fdc4aec72617cf19e3221"; + sha512 = "a295c182fb7bb80d21e551156e8e1d77327311274e22eca16f4640e833a4db21597e3e4b5f64e2d39dc40bca387497ea78e2fa198b760062a33b1cae86c6405a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ia/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ia/firefox-69.0b16.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "ad541cabe5f20fc90cccb932e4062d8088fd58b9bffdacf6da8c53cf9667d82363a8da70bb441881fd132bf0239adca681abad4ffc44808f4565eca9830ef387"; + sha512 = "9a5f01f6164751f0ed8cd34e9d792fa889a5a7ea9eefcc3e8afba20ed419da984db0983126122c8cc7770f0b34bdf1c39695632f737aa83281b01f8f713b43df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/id/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/id/firefox-69.0b16.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ccbba3cd4a34a2db26c81bd670b53e50279ee22b1e43203802112010024ab496077f2efab9f100f50dadfda7d35edad09cfee7e54997ee2034d84e8efa24dc3e"; + sha512 = "3073f0b719b1b4d71eb07b9f1a62f51176377579cdd8cdb1c8ec0876fc820289db29cb13f049058d0efcb955c15a3c377c4496c458b4b3fe438dcbdaa9d6fc07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/is/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/is/firefox-69.0b16.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "11ef7c6e96d4fe5813bfa63a322b9a57f283e444a22be440ea14acc0d186314e57119642dae7d285122a17ede96eb8d37f8f879c22101f8a64ea5f0b97dd1a17"; + sha512 = "15a8593945e4cafbbd4a1b274c652fb121cdbf567031f6919e84767df65eb4f4e42d411b4799b8e5299d6215dd3f1cfef5104c9197c1ff1feb68f89e0bcfa2b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/it/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/it/firefox-69.0b16.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c568510a83c61f9472852f8c8fff0293bc7dff741f4ad8bdcb16caa5abdb2fc9cc0186ed13c95485775c8041e9ad0a4f6433fff933626f80eafea9ffa3fd3f61"; + sha512 = "55c688602fb41d39cf4e33f96b57ff98d466623ca80281564ea6a4384b1985d29436f7288f56e969151d9873cece10422abf753b262b5ac6e283731397e53e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ja/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ja/firefox-69.0b16.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f04b5d728d9e319c2f88db4c283daba74cc36b03221a61c92dbd3301f1a2a8d725dd72fc9fc95e984082eb128a519e002bb62c59f82e6a529afbb36289be5e23"; + sha512 = "f350eca93c6110e8a258802be4ff1cb8b07e819f2fe3b24e912f296c4e18cafed279ad5ad8eb093f3bd7945b0c9cf5466d673e5b4ae342a3b2d0e418e5e6c86c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ka/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ka/firefox-69.0b16.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9c47c3e57913fa009e92858363a7384f9e71a9b6826c64edaa2772984be43c32e45c73b7599d45ff51dcb11a42fb70963ab95615f730a2f11d792e0ee1c0417a"; + sha512 = "ce392f476b5eb00620c2170cda585e4cf73416a5d564446e65e39e0deea538825f3d91e91e5624c353b163983efd0bf844baa9a52e3e308d9e232d83f9167d0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kab/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kab/firefox-69.0b16.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "aa7e4e641d79568af30845813ae6aed59d59964b37be672b9a18a0006f152dce7fdace65a6d4ae2626f80becfa56b32f0b18cc826cde2d555816a27c76b175da"; + sha512 = "ffab6510cd2b68b0b4b57ae1ec727e391a0330cf44c9c1f9fb8bd1385c8dc86f1de5dcc5712b0f0dfa5e25920eadd6561501579ee5d15ade22fce747ba88b988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kk/firefox-69.0b16.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "30817ac01333af478e9dc6be7db8e898705bc9020627b171de664e892ec13987f17e8e2a346cd94bf77bd9caae62cf8b37a1ee3714cdc034c648cdb424c72cac"; + sha512 = "f9aa18138713b9b704c8d0d3fd8a5d2c5f802d3b23b7ad89d7f18eb885b9efeee53b94117bf7492a4fe83be19b5052d5ec6fd8f203d96f7988e5cb1eb524f496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/km/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/km/firefox-69.0b16.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f0c6fac7c89b677eb2407b199d61690a3ad59128b9d1a06575dfe289718e0d5677573cb0ff3da8e313d24798a9776c4387e57a60bae3ba916383cc02a57612e4"; + sha512 = "1f0a4ba8942210a0ffbee2ec09f79d628638f58e26bc83d175d0b95ccb43636c976fba556720b39b42c37ac2fe67bd52c28f0a2f672706d967d09a26c3e446f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kn/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/kn/firefox-69.0b16.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "5ac4a09bf82678f3d8bd53c8bd44c1f6c0811a942a99321cfca1d553d68ead2abe8ed2f4af3c50e9ee88ac1ede35e201fa4fa2ec399016b122389a51f16cd5be"; + sha512 = "c23fc4fc298f88f4aee69680156d95fc98fc311630586d5a2a964c8fb74f2b56483e0b4267b90b1a3f37815ecb379e6583e7c801e57a94236d35e0e68f68bcda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ko/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ko/firefox-69.0b16.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "dd1bdf3e30b3a43d196ec50870bc8f2abcacf703860dab5b21e9b50fad5dbf9ed7cf0bdedf0844a2d56e60f9fc461e397b48f12956e2d95ab6e941b760e6f5c8"; + sha512 = "4dc91ea327d7c69b68bb065eae6ef812ca01c32dcc22048867e43130b15a15edeac505bbf859d96185f90fb3958c74fb0c3e8bbb58c4a0d7856837f864163d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lij/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lij/firefox-69.0b16.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "5c9feb27b7ccec9a6594cf027b7ce55df4e0becb5871444bc24328401e3a764d7dadfa3a56b654b18b2e10ab8a8e03c96021a33de5cdc66b0d7e3d6992a2fb5f"; + sha512 = "3588c1b35428dde09cc0262d3730407ed4bcf821b28556f7b05fb60250eac006e12ef8a929327a80429bab195632f9f40771467e572dd6821c646338d3c7d862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lt/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lt/firefox-69.0b16.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ebbda17ab983261c9a593a4368696026f4743a79c6cf70e89184390b4c1966d474b75bd751a52dabe06e303b8f223c524494a6cb753dcd547cc8c93ba911088e"; + sha512 = "972bfbd93200dc87a6f9cb246b30f301c8db216dc9067bf40f42cbd73ee5795cbb276ade5ba44a6e3df2239d481ea305f4499fe88f42a0f7d0071f84dc2fc9f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lv/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/lv/firefox-69.0b16.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "059c241db15b20d4a5713b35fc7dec60d51253a0d3c9e9e1337defa2ec33e0a3e22b2be6346b6b7fa51e35fd48870a86c2315bedbc32669260195bdff3e5d9b3"; + sha512 = "c7a0a65c0649059cf35b394b033b965b3d708531f6a8414d5fead08f2b5e5fd907c903c23e22e9bf5cdc78255e0215dfe34ce45ee96fc619fbca87fe086ed32b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/mk/firefox-69.0b16.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "170ace7a442581946c8ab52b63c935ad58cd3e6415c109c564faeec9333025fb9647f0f049a192386a2d980b7c3f9ceea62e1d56cc90e8c8a4aec568f58e4dbf"; + sha512 = "677e6238580a561fa86dbe1ba8d293aec4d51ee96adea11871e169e1d6ed0c1de29a6a44c374c87aaf93b00178719f142b44821d3f2f866cd43308f7ddc95784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/mr/firefox-69.0b16.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "91e4aa884b26041047ab3bc0c3eb5bb14a62776982f7e1edfc53f1732c5fba9bdb97b77e5f9603cfdd4bb2f67ca5f5959ea61eb4827c6075d30b502c9282cb3b"; + sha512 = "1457c464363505e787367bad9b90e6396da7e5d0840618cbd02c1996985fc42af4279ad9f53b6f0014c9f0296f1912ca5bf7832794048e69cf5a7d5b89ffe811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ms/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ms/firefox-69.0b16.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2c236d61824b559def24a9f96ff15075d17220893ce5500bf1f997d582b89b8948eeb88683997ffb64dd57c2fdc01961d877de28be6110da7ff4bddb129540be"; + sha512 = "54d0c0a9a17534891267a3dd89682a1ca24dfa42e13c0a68ca67ac800c210f77a1b504d2ea0e16293df31ac716dac2e646fddd6eb4a5996e6cfc9fb578391cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/my/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/my/firefox-69.0b16.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "909aee75dd8597d4c7d08cd28972c27fbe07aa774c93a6639d38ca152ea2d0a5330329a857b04100b67b35142689b3ab9f4376200b9d6efe8612a8dbaa19618b"; + sha512 = "21a851362356c568d93a24e7038ff30c376d712d0ba52d9eb51ad325d43e6a36f3565b48385b54bd90f846d03b626e96e002264d10741005403ab6d30364feb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nb-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nb-NO/firefox-69.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a7b65f920dccfefb64e1d0a2425a8514e555089262f2d0d5300009c9d8b8ff343f387d0f3797819808a2d2b67c10ec026fd12f0306e23d8b31573a9ebbad726a"; + sha512 = "d625f65dfe643608689b2d7858f06b3e1b06636249be516a76798bfa728827592a543e5e61279c7b8a5e8a0c07a17510232bccc98fa8fdac3f98806b94582db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ne-NP/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ne-NP/firefox-69.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "10e0715ca360b3299312c6f8c86b4d89ccc0788611c44e20d90b0cadb20e00f2071377fb934383d6d76cff49d0fcaeb155b68328fb5bc96fb09479a192df1464"; + sha512 = "5d85049a3d8f11b164d091cd7925d456e54db63fb93883e42306b1bde48c502e3ffab120c4f9d05de688086ab94470d4eed827f24689cb1872cdaeca6bef7233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nl/firefox-69.0b16.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1e688394daf56bc6900d765ae4d01941d9cc02457b95965cc9624be7ad5a50a8b8cdc6212d7270c8253d539ecbe60a21648cf13f61bfade3dafcd8e6273509b7"; + sha512 = "9716bbc5c5faa1ae284b7182f0473823d265993dc43c4ee59d6c6c17ada6cf7d898dda64cc7647ff65f46984aaf1658a5a3e2c50361d5a731ba6b82844d7b432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nn-NO/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/nn-NO/firefox-69.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "8fcaadfa9e895a97403c60a09e27282b0907346d20c8dbcc8bc9343c0bbba03d3bdf6fc22e52271d5edb9e1df214844f17dc81d3aa74adbc2623fc34f034dcb5"; + sha512 = "f227cb22ea4d15bdd4b20f2096f70d985cb3d9e174e464462c718a0bc6f533bc0c5bb098dacdb1a8ecc6fb07acd22f5dcd365e266208f75423677eb2bdf4ad65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/oc/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/oc/firefox-69.0b16.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d2edc1fc3fb685ec8f46b58559edac3e6fa3eda0df5ef7bc95c4b4ed444bfdbff43257e5cebb50ef438c7638ac3cde6411e9d5b0a93bd22876c0a13965403a30"; + sha512 = "0e116e00a58d1086093e321a188c2c060f9dce3374cb7152d753064e170eca302c0698cda110ed12a4e41b669c242e3865165bfafc4463d1ce583d0854e16075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pa-IN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pa-IN/firefox-69.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "535726a70b1d2e4562f4459df2873aff9b41ffc8e88bfe606465871e13ea4205431ce8846670b178e043e35b81ee8e71bcc896971dac2d8d538681ca8dd0db9a"; + sha512 = "9966030d3fdb5da3e2f943078294615d64fb019ca67e8fb335693580bd100f6f10ad760b50f7d26c68098a3080e87359dcb1c22ab657c43c23fc2cef3738eb26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pl/firefox-69.0b16.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1704e78bb2d0e9e8b50c078a52a01777f6df1fd4b2ed05a7226fe7f6eaaa38ae72a9ffd8780b0e6b9a51da40990de386e8acd518426ee89e61d16d6505e7befd"; + sha512 = "ffb5a5cffab404ca1685f925580c47eba975d7a26af1ef31f05cf8f1e0ea72d130042f9b11e69427a2ab8b86fe47e279040af95a18869bad0465869c43a988bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-BR/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pt-BR/firefox-69.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0cee5dc74c31ccd80b2cd81a83b909a77dc77c06f38af6290b7d6897d97e7aedf3036d03b1d42ef33dc3942566809388ca5b3e6d9b78a84793987db77fbb1fd3"; + sha512 = "14956079e61152b99696ab29a92b57a3671519c4f58111999587ab796dd8e7d6805828e8d14a59bad28218c136f282ef052e56daf024ca3923ead95d7eab0af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-PT/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/pt-PT/firefox-69.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b43c1fe0fcdfac892b73a3ef7c3ecfbdb5b646f9badb0dc5d64f9614ad35686e1eaa1e6ccc2cccf9c9a9bf25cd629e5bb893d13942a5dfba67368cf3ccf59c82"; + sha512 = "cd5fef4336203fdfbd8af89a3cc17a01e88ddd4fd670c3b778b1fe228325dd35fc64ea6d0c85681cc1bbb51c588b53972c85746d9ac0c860b3143ec93a344361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/rm/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/rm/firefox-69.0b16.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "370593dfc73e15ec56950c6fe788d579582451151e26896587258bbda65e623bcf28943413d80ba7bb629dc2230e4f42da0c26cd137f8fcbee79d85a8fb4c57a"; + sha512 = "33d608066859460da6a50012fad5a76eb78bc4a3f8565dac1753b80b86755432340c6e9b5e13c319c24d89547fd32567ad99853ef7f954aebda9b15e2eddd064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ro/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ro/firefox-69.0b16.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6a415e17b0a3511da4bc97be2cbff5cb4307c4c63bdd2bf316b3469d6ea1abf365ac84608b169efe3e5ad8629a0430bac0898750b964672f83da0999c1c9b12e"; + sha512 = "18bb7599738aff68f75dac1a6cd87e6a3a4a326ab64e9bf36f28d3e4890340c07e93b938d77ee4432548c5880b79862d9c472e283f638aa9e2d977ba8f54f686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ru/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ru/firefox-69.0b16.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "b6a7c931874e0b41dbdfa7658b3ce1f7560d20acdc2ad1cb7fd3a51c05e6c7f392eb39c55faae6d723b23cf83ba5134bf9ae12463161fc9df0b04a311bb8f7cc"; + sha512 = "c1a0c7b717740167f9906a2bec1d81dca2754c7a10f2139bee269bcad6b9d563f5ddd25d05bcc7a0621b910366853aa43663bc6d711fc1fc3b53e407dcbf9805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/si/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/si/firefox-69.0b16.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c2ccb292b6652320593dfb05af30be4a5fca09318981e255f15003bfb8911a6fc3c8bff420bdc13bbd1aea69b44e5809370ec100c4b6eb6ff54c71c85b3f52c5"; + sha512 = "e807ae18343102df9030189f6e067062421a64f1fbfa9dd0d9e5590e727c049ae849dff2fb581a2f4de892fed21144a792535df188dd08c190c24dd1a58dfbe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sk/firefox-69.0b16.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8cecce76d5d8f6ed8d778fe2d2c733f1d81255696e78f7422c464df96275149246704175ae1c28566d223ca38da908d7974f0b055ab953cd3acc08c4e1c246a2"; + sha512 = "35f1206c717f5475f4af6ac74bab0b691b21789457496c1226d6ace5d4d0f8f88e2c3467c6a01eae49c013b972e07f12b577be6543219b1a274340639799b2a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sl/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sl/firefox-69.0b16.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0cfc0a94d8273926407ebc8addb69b76fc734215e6f0199c8b7e9e932ff89315f49f2695826446591a7e223d07b61da8ac2146f5589d58093096f70425ae15c9"; + sha512 = "d665b46a8e6569e8e0e41411e647d3a27b172cbde22e3d9157a5610dfe559d6648adcd65418c45256d8fb9f56022ebf8d3eabadd9b8414f32565c421bd74e371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/son/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/son/firefox-69.0b16.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "321034ab272f1bfd07bc4938912be05b0a14e81ba537cd232ce38e408d3c9dee6d93010c62c029be27d0322db7883cba6d418b35b0afba534eb32f4bf18e0273"; + sha512 = "e0b22c18364e4394cf982f2cac370bff79c5440a949d5e69ef753bdcab05688b591f3d54e2721507c502f05a094436fcb219c8fa4be33462ffc7fd5090506944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sq/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sq/firefox-69.0b16.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3eb99ec8007060e049b1be8a70360d8839b90a48599866687b7ccefb46f736ecbcfb166936946feb4e959a941fc0534b6f843d8c62ef4f77b2cead7df32b892d"; + sha512 = "75050296533af930bc1fa4602246b9d6db0aa48d1fce9a53212fc11041a331236fa88f70d8179c9961f09810d06df297d9dcfce791357e8c7db956c160019f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sr/firefox-69.0b16.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "1645d31f9ae714a85bbc3433bfb97d910147d2b4c8e0b971a75d4bea5b8aeb2c500093e85beef9b28720a6c372db5edf68bd83be874cdf121add61fed3f098d1"; + sha512 = "ceb21bac8b36872c7ec47053846e20376884678e7017632164026f0b6a8cc56416cfc4c693229964e287381739d5018836da20f8e5d636aa9607c80567a0c36a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sv-SE/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/sv-SE/firefox-69.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "5a6c3329faf019a10d55a36cf893ce0d961c339c1a80ddec644266c164b774a6fb2bfdd371ceb50de758f12da5172c9bfc37aa6dda254c95b6fe01039c708191"; + sha512 = "a92b5d28645dd601dd5f8d4892d210bdc284ca5ef6023f3e6660d6519fd8fdf1212e757f31048522009021f00716a1faa3da6e818b3f39ac4b96d68564aabe8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ta/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ta/firefox-69.0b16.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "98810df80bd496c8fab57530c56c7aaba0425bcff3debe07dfa4a647f63d6b7cb652fea19c5ec00c61536ea0e94fed6ea583aa411cd72919852f832dd02d6b61"; + sha512 = "4935baa87058d2c2f87bc4e320d7fb1329c2380c93a72834783d5884e3e374a5b9f80b66fe1824b9d7003ba41b2f10648d8d257c34f71314de0ae9959233637e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/te/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/te/firefox-69.0b16.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ad71ef457a0eb6324a23f7a2e4c6a0dfb6b07063e1ee5f2425a6dd6ab9feeac9f9240b9193d4bc8a70b715cb4f88322f39da577b645cc9359915ccaf91d1d19f"; + sha512 = "5aef655c7d736d5c4cb91a6ba7c0fff7c9adee6dfd96b57f5c1f968d258fd7707a1b1ef0fabc049f2902085afd55455d016d9a786e94ef836e6a6379f33bb577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/th/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/th/firefox-69.0b16.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2e522f9c164049b6f8510065e2bd69394067b45f361ff127880dcaf1bb4bf893a8d4559222c39dae46b85e6b72abd0204e36296c119ac8c3442bebc8426a5276"; + sha512 = "1bec6b20ae731e982a4be6aac81bbfad2d27add2fc1339401807fb41af36a27391499677355f0737a9230466e27f34bd5e97f4b3697decd56ffe854b932900a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/tr/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/tr/firefox-69.0b16.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b6f684716068ad18aa626c05fb2ea331f33e0648c1d710f1037e3c5ad79d9f95748314d1f205fd1c3f3bda57c8512adc0bad55b56f355d9ba5f20469b00e2fb8"; + sha512 = "ccb0537f3cc85331037070761e4b450bdb07215d024052d3b946b96deb89ae30333c3b90e25100bca6cc58efc2f0f5b864daf6b353dbe7655e71106b7d5c0784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uk/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/uk/firefox-69.0b16.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "edeeea9cddcbb5505bef77b91a7f85ee909aa1fa803fe0e5a142a2207a0e8717a983bbf5636c3adf0798fd77e509bb90c759615810f19a59a2839e5336264d1f"; + sha512 = "a3490dd08645d2bc21a0a7176b1e9ba2da47b4d2a5ef45472715dd6905eb1cb1956849fdd006a4d370c0e58744e126fb1902d4997c7280fff256885becb39877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ur/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/ur/firefox-69.0b16.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "36193d23c39331bbdae452acd06fa9db963366cb302ecbfc19724ab41fbba4d1ff3daa0f58cfafda95146792dbc1988878080ed104b8f77f1f81a53157728a93"; + sha512 = "a021c72eb298bce45097ed0d2c9aa2ade86b06668bb0d22e1832b600ef15691680b9836598467ae40d20203bf07246ed85485d0f2b3d145452725544d62b033b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uz/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/uz/firefox-69.0b16.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "06ebb9c3c88d2332fcca2eb51f4a2995c9e181da9e84db1d8f57ce1c2ad4dd35a6b0ed3e7a61395bda7302bd6e7eacfb2114b51fb71e2e3dcefc9d3ef975036d"; + sha512 = "ee54245bbc0845e680f5b02a2b217f2e253daa99e531fbf721a0f9dc03e68fe77371665bf2db7aad94748ad5c641bb93c7e3bf43f6e3f4e53b7ec91306d69f7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/vi/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/vi/firefox-69.0b16.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "944b716ccd4ba2ca23f1fe1ab8f5a6e16edee1d8f1ed3d2d785f061ec3317431f941b6aa811ed02f35d9862e44dd7b31a860e292509632258b45b6160a6bbd5e"; + sha512 = "e14901e594346298a43cf9b7cf70be1cd26e6f19415fd11c09e5ac8eca7a43fb07d7b4f4e238f4b13e986e1a9e37f23d73e456990403f2983a9939b8bec455b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/xh/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/xh/firefox-69.0b16.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "f391a9ef0b66224e91bdc99a0a509211a56af3958f0b2d491d11ab024771bc91986b79b87733c86f8d045564d2546f68a8f2891bb13baacffa55d8f481a87421"; + sha512 = "a256c23d0c478dec86c5a3413c7e64c61e7e4a519c5e1a343b457481543529354d588b07f1b0ea37450c2d3d317145796401c05988ed6d35f545612d6c5f87f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-CN/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/zh-CN/firefox-69.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ec812067a347aa55d3555f156ce9dcce040ac7fa363dd3ff06dae9120e8186f521b08e4b02ce23e41adc5ee443dcf112264043efdadc328b43ba192d977f7d15"; + sha512 = "a10aa5ef7b4fb6e4e3ac64a7d25c2d329eb42a0e5e0f680d786c9215d1f536a9daecbe5df31fb8484eed1471ccf89a596a5d2f97ae9875686b6f394f2a3c25ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-TW/firefox-69.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b16/linux-i686/zh-TW/firefox-69.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a42ceb0523b083feda01262678344ae138bc5ff64c4713791a005191b5fe8378813501de11b25bf9c50019f0a07b9180fb34547ae4bebe98eb9964ab9312560b"; + sha512 = "790725d0674be5ee347dbef3c2f0ac0d017cd972ae32dd318767535a4006432c5d56ef2e13a602f705fb177476ee120a5327dfa3625b6966a9fed8bb04f50c04"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 2f79f6900cd9..dea752874ddb 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -205,6 +205,6 @@ stdenv.mkDerivation { url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; platforms = builtins.attrNames mozillaPlatforms; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ taku0 ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 5d4ee39a4b2f..a9ca0a5fe06b 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0b10"; + version = "70.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ach/firefox-70.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "9d036f8217a95ea3d601e10050ee15f75f6d3eea5f38f5a1ce0a773d92cca7418a863385555ec9112751016e4008672f8de79c17b7156775d7ba3eee2a4c19d9"; + sha512 = "cf64b9cd170d5a1bf1765ed07df197a3d0c7411b5281c89a0d2adfb3d9c404ed9fd2c8c021fe93971b846d7ebfdcfdf08f3a5703e156d6dbab61619f53d6d415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/af/firefox-70.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "def33babd8a97fb1b9f9059a019d5c823e965f404baadc1daf3325a3f7437f0152585dd6ba13f67542eb7b1e7cb2f265986c7813c35e65cb79febba5636a6c5d"; + sha512 = "e2815831dc99e0373541a56a38fa936a97d93a07a2dd7f789f5e4cc45860ce3c1b70bbbe709d35534364586af5b0dc626a4ba36dc8881244f98665a80ba57764"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/an/firefox-70.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b51086111c0a2a989c6123729028b41a834f25bff19836b486bfd935d52055a8c23bdb0e79eb8718d86a4b4781ed6fdd02b946d2dc5e0b86de9fc2166393f1e4"; + sha512 = "d7cc4b7a1d7fabe186ae10a9bbd5d746415178dc3d17255e2278c1b5a9a7170403cdd153668b94220ea68be387b0c7b3365c8d460bfe53f7b381e7f3da12948e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ar/firefox-70.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d3cc62cfa029a7112aa8b27257e2b1b7c3adb99d56d3d749b19009be92ada130353f6d5bd8383b78ddd179417779d2425ecfa2d778a4752f7a876f3fbef84c34"; + sha512 = "8fb79f3636682c83dcf42b143892148fddb06eefca4c5eb72f5ed703b821dc2bfab7a167a58992d83202866dc07bfa09eee876cc567586791440afea676efbbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ast/firefox-70.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "75ec692ad8b8d56e13b6b34a980c9f37034b188a675dd0c975e598277fa919587a90a3be11867bd63db1c83a12876d10e2eeb83e5666f10c256adad5b9f369f7"; + sha512 = "468bcff942edfc8ba843f6f5a4b42aeb2b606186701d6a371565c4803664591037fe44bd026fca790ff8b8bb036619862ec51f04af63acfbf393fe8ac677907f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/az/firefox-70.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9f44dd00187942430c69898298e677dbfe8385a9e43d312681c7d487ae3353b0dd668a87945d41183bbdffd8bfe7331d1d752a594fa515372139385935134417"; + sha512 = "983f8d78364c1479a252806f912d015e791e8073bc7848c0bebb28c7a39d6ab08bac2bd9e4a7f1c1cb68b8d2894eaa927541a78836717066491b450c0b34671c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/be/firefox-70.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "faf91758f3cf17f8dbc570195adacbd93a57f46f0750eabceb6e66df16dbf459670254712b63146b89be67442ba828d5506a703cd51bf3d7c42708ba30bba3e4"; + sha512 = "dd31f1d7d3f6fe10f9dba54475512016be4b26bf59ca0ce55932b23cbc29954bd80e95fb1e29f2ec695e8f16d0b0145ed0d160f1964fe40ffe079a3833ee8090"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bg/firefox-70.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b712fdfa9643d00cf44129ec7d0f718ebb46e48fb568d70989b5c094f1a7c231247672620955f397b94e7de0aaa74893780155901cc1c4e26ba4ab9646b566e7"; + sha512 = "d08edb6750464805ef379b18008d5f3a76a649ee4d6528b4ebd255ab89205756e2c9978bd9a27f56a607117186d434fa2df49ef4494bf5bd4f1f8e2eed10b30a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bn/firefox-70.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "9a41d3c3647f3c7c0f5d329edf70693f63835a5dfaf67df08d7937a2efdc89b4cae263e4447ea09e05453be4a3ca658a965f3aafe432cad86ce9ce754c4e5813"; + sha512 = "a3c200e13d6b20a7fcdba2524501d936a183213f590213727facd9271867ca3d5ac0c59831b88e92a424b3b154bb9cfc66dfd8908ee28fe6a4ed15146944eb7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/br/firefox-70.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "8c3ee20552f7c85723cb8489cea7f64821619a09deaffba94f42c1b29c55894e40720cb3997791c10baf27c99ea11976741c30286e417b207ec620a3dee4c771"; + sha512 = "235ca44c123dc8034541637b8cf5b7d7d3e361300639033dcae361bfcedd41360a5761486c990e7328e479b3073b5f68f01bd38228170c352f993c0bee4757c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bs/firefox-70.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "348c1e68f57f2a09c134452aa110b39cd638d97bb0b8adaef7f57210c9d95e3a8a6732e72a437219e517799835c4d1d6332af54706239bc604f57e166d859898"; + sha512 = "2b2202f8397edd25f871d0e9b7e2535be98559bcd84080b8418460f7f1e558cb779f1588e94d87e8e713639cb3bde3efa8de7baf2e2f36bf387d965bffb9552d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ca/firefox-70.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4630f3edb4f435dd169335c67477ceb6e42f2d8161dd9559ff58525fc117f7cbf45da534de6e160bf824b3b4b41ded3d3dcac2782f2a208ab7d0e014b4ba40ed"; + sha512 = "23b7af96430ff5202529e5bbfc5d359d8cb9419b54a8e7dff6b1c828ccd1cd3ca686ed062a29f7e8ee8201ae1a2bbce7032a0f3f0cfc63168fbf0b49c52a9391"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cak/firefox-70.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2cae224ee70259a60c0868b83ba933eb43867ca0345bc0fea9693dc3ddcd9130d7325ba953d729778e7ed0eae334b200abd11dc1e903183514c11475e0a61269"; + sha512 = "beda7fd930fbcf0985711917ea4b78a94042072a8cdd325079f3568bfcf2456efa0666efa4f869430cbfde34091b9d7d101edb94fde0a0c6942f61ee9c8a4fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cs/firefox-70.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "434ef8593e4771c00b772ef3be672fa82d1084431882a6b95011cdaaa04035d08bb1927ec0eafe51d44e7028e2038f798073c5287335300989866ee7f7347ed6"; + sha512 = "1b47c85b7b5125ba416e18345c7247b85f29e4136d56333da14d8f2c3ebb7b9f81bd0332f6031b36e68e21d851f9390e171f75305bfbe0f46dd0b7c995e0b2aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cy/firefox-70.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e26e3a3e571efa96d03169f17bb7e0920b2ba160830440ed924b6b60c244d31297bfc72d810292e07b9abeee9cb4843f0c2369192b827362fd65bb3f9da4c577"; + sha512 = "071d30f74d13311693dbf3b4c1a111d12e53aaeb8d6207f8628f7a45acfcf797a722a5196086fc7b6c12545a8a177868a5669542f0535a4223df155867ec6b30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/da/firefox-70.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4cac02fcb2efbe5736e52232b2cc6225572f9fa2518129d501b7d86d782177b4581d9d0ccd5d90131a1e2d676dc43ce9d0841f036701cbc543d379a24ac11fbd"; + sha512 = "3640a0a07c512e60e4119a683ac44cc596dc2a187d7f04a4b087540ca5deaba1c220403e398edf4c36247e92eef73de252d597ec082a7bc6e6c77e7ea799fef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/de/firefox-70.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b8279a32bd29f70e9470707c9d8843a39c9c7e95c1b732944bdcdcb1fc383d33881ab40f2d00ea36bf01ab7501a77e754dbd2230187fbb2eb0b324cc155a4412"; + sha512 = "58538f8a9a0d6e97d49c005f45dc1b1842c07a6923a556d98aa13b4c979502a329adaf7b1782522e02a770945ef3809dc68138e73736593fa5ed5d07a1c9e265"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/dsb/firefox-70.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "761e8e0c9414a8a72fac258d52729ad4dab8376e249218ec49ceb47311bd798346b57902671ec394f1ef2c15b641c47f9741e67c76f54684fe4639b609e1700f"; + sha512 = "8a0ca47fdc85672c18bf883929eef9fa56b2b3b79e584c415c76f3005a55cca944700d27ca23b2ac2051c7c130b42b3551dcd1c05ec7a347ce6463ceecbb0748"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/el/firefox-70.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ed8d934d5c7c3bbc1126f04de045cd5f0ed9a529a8d4f207ff115c2e8dd4e152c801e5a4aa0b37fc10dd8fd1f1e363b78f21b4930d49e25649264b751c1260ea"; + sha512 = "c29d7b350fcfc7b6b76b02ef8677a21800d786e709b5e1b886532f74c8c11696da0fbf2adf6b22fd8c5edb6ab312516a2535ce3185ca5334cff9d79974a4f5ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-CA/firefox-70.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "60689489f53a863d55cfbef67499220efb00aee32ee6ea7054f41f14df43c1b787a04ea374e0ab950dba2110b2728b980fdc46f97136614ef8b97eee210eb58c"; + sha512 = "d04571c4f4b4bfec7f8a0eb2ee2ed9e9f91c415609106a97ddde7122bddb8f8a25685e4bc6c2eed5ccbad2111bc3e9db6e3ee27c422cc1813a8bb1941cd04af1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-GB/firefox-70.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c3e10c0f0922e4bab3558cbb6be106278fa782b50a0fa5e38db6adf7ff60e88717af15437e48ea23b15762424d89a94361663dda8e02d6fdf9d6c19a5afc90a9"; + sha512 = "c1f39142888d46884a51b892f232f6cb78309d65a6ba342a45d4bc6f3448ae90bbfd77d44f0e1611948a66a63bcb6d0f0e76f2c6f5fc3083d58b12b6df7cd2ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-US/firefox-70.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "135e4b561e311d6132164808272bd689b486b840d652ae0ea4ce9a7096472836fe798309d0feafc1ab8cfb32b2c72b396a63734b4795e591863a5c89bd49802c"; + sha512 = "1b0eb7dd1995822cf30aa85749741c1bdea6cc98b4eaeb1d11fd94b56d2138a177428734169355257a165350cf21b72141386d6fcbca606e9d3bc11f292563de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eo/firefox-70.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "8991bccfb8cf10e0df6a2288968b334edd0b71a4030c0e008daf124b6e5256d73dbf5b5b376570852a0fa338570a9d286f24ef63dcf039842cd0fb1eb5901695"; + sha512 = "e03f025948a463007708099a6e19abbd5a3e272eb03e053c6dc7ef156b1e4e83d68ae02bcce8f19fca1409e96e07f88a36537e08dcd73f1f289cd64a57b3aafa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-AR/firefox-70.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "57a8275cf23e29a9a425ce23ef3bc787596df0dda95d5dbb2673bd658ad0bdcae3fa554cf51899d5a2719ebc218b70bda176c3467a01a7a4da7a60678f668101"; + sha512 = "f48d98ebd744d4915ffb6f0cfaec981b8177b0f74297224555bfbfa7390dbec29eae93f4dd3ba51bd84dbeb71a4c60519414f2a4c3d75b7c96b59610e30e5f9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-CL/firefox-70.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "2528855037d5a843895c639cb0d2b353784e59dc2103c4175e085f216d490ea037bf440bf4bbf926301143079a2885040c294c77b10f032135fe070b20e99371"; + sha512 = "f593020ba37d0ce81a194772d1acc2f528ed826b009e034e17d3119e482b0df9e8dd518dd597687e566d30e2a736d89850e3cd2487d7c723e242a12f69962b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-ES/firefox-70.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "4c5c6cbd1fa3680489bf6324e975bcea43429f7b55be853d2523daa45adf1f22772d0427f9df005c7e3c22543830473df82d4da818aff2ff72c96902d0b72e5d"; + sha512 = "081641bedfa1f4831641aa0029f8ec34db6f4965f9aff2c5344b779387dd887c2cb371908778d6cef6ccaa0448c98513b300244dab30f36f68776506f840b43c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-MX/firefox-70.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e2400bb17d7df8b0541de8c391b28d2b5e7ee9523dc73d90e9d10ec578b3acb58051c6bb510b18c076b7dad8a4b4a7ddb605db3af318022c369ea78cccf3c441"; + sha512 = "fe58f3745c1b0009e065979cb6ca451f377d837b0a41062e0ab04d435cc935d931d6e8200521850ce3161aed6f9583a67df14d0cab5853e491b1a433909947d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/et/firefox-70.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "ebb2bcc463312c187d2c5119c4e0e5580a78477be61b76a028a28791398311e0fde3ddcda039397c9d63f8658ceb7490b62fb6e69eeed34c204e60b6867b216d"; + sha512 = "2d1bfa94424af6f6ae08e11c99e83749408e9be1ac7face25d392c0475df978666706fd694b76558d824d226a50fa5f1eb8da52fd4ff3a1bb615bc83986ecba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eu/firefox-70.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "8c3796a5189f40324b2227750ea72b09397df750a154e1056a8bf9b7933a8ad6935a64be569641bd391fdaeb9d10cdd330c0ad031ea012e9a64848d8a034c650"; + sha512 = "7a192de6d021fdbca6764906284b4490653705147c56b9709e83c7fc087916197c954ac1cc19cff3da78220d572492800ea5773d3e03cfac6ee75d5e6d8ae85b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fa/firefox-70.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "239371297c2524142842dd18b9de92c8b93b7fff82c045599d19effad81344703c65cf77e1db4c665de2b565cfe5ae7ec8a7589b68ab25b5ff0e6ea90b7c4cad"; + sha512 = "427af8a45ae42e31ced616daf2d5e418e745bf43f87dd4858c983746dda1d52e1b909db542e9822c39019b13d1b47196c7041040f8c56e9f0712d7fbfba8b935"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ff/firefox-70.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "064babe379e9753394acfda8e1a9ccebbf1b980ceca6d0898e897b5ce91d06c74fe525c5c2ac34d9527c55acffac5f70a88ee5742ab363e3f0855d5d851bf56e"; + sha512 = "8a0627bff20eec56a7fbf6be6131bc004c12fd3033ceebe365a1367dccaf773c7c4f8592ee9a313a01943ec962ec010932d3f0fea7a94576372bb8fb735c90bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fi/firefox-70.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "411501345e1f1f9bff9d03f2e97e756d750cce3fc753be5572016de12bf18c1b6be716f39b0db87ebaeed6bc300264eef9d1624d82fd289767ac32c2765cc44c"; + sha512 = "b86da9c7cfb2edab970d91b098c5ae3da60f83a9b772033d8a8a0a4db27afe62f5db600a17a883561733f1939bb95342273b4c5c7e004870c4eabb08648b822c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fr/firefox-70.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9bd4161f31256e12ece7d5cc28eb78dc0bf2249a6643d6d962524582b10a520ce3dbb578fbee803f9f2fc301bd57adebb7fd6f9d3f83fa7c7fbb30b7e16960f5"; + sha512 = "54ad1fe9eaff331246817e2033adf54d5267e991ee016f96edc21b5c322a46103f72a5662df06da313a840aedd04f677340573e57b55a9a1fa611af3ead97e0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fy-NL/firefox-70.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d14d82ba14694de463c45aa32ab5782643233c12591a1c48732067a4366f22467e4c31d231164750722f2b6f6b61b2a8a2378e866b55de706ba83052cefeb24d"; + sha512 = "c13363513a633def5c2fdfcdd0327b201f5d6d04d0dcd698f614799ac88424d19612eacfc6325b11808617a3cdc3f92e5903d84cdd56fa68212cb1b2babb9a03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ga-IE/firefox-70.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1fc14f670747b47d6b784e7a4f1875c90cf566009f084e5923af853f4c46686cdd0d66eebf410a4d9f024b260af57151d281014303ce93226b95c20bf41d1944"; + sha512 = "23644670ee388362801cc4ca62fc6bf370d479821e0811ab493405ff3c8fce538ece89184c9d4f020c8a5089d3f7addd1d4fe298b55199dfe12f73408a988314"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gd/firefox-70.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "60bbe1d315958353d50dac327a358a3c1b52f5f93ea93262d640d91cf85207f47fc34fbf689c9efb60ff63b8cb8d7e991cd7edc8effe2277c8b70bf026d36608"; + sha512 = "967d24fee05d35aaf27be6ebbd3d31112126ee04bb750d3f17a2bd6a1abeab5ec7ee43235a26de5f19e5979c6d295e74ffec9f1bbf6fa32564f50986487b0455"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gl/firefox-70.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "dc13fa5d442188edc445c0a32e0dfe96d6320cddf6369c6a70af52f77ea375d98b596655cea8df02c81c7db4a8fec9ea9e48cef7579665e7c4ef89eef9022dd5"; + sha512 = "9976dfcfbf3d93df9c06a4328bc73ed5e1a3b922a8a616cd3c298d5955964ffda4e4fb96e85a23cb9c950602959e11d86f3d58840d475e5c6f5232992da13184"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gn/firefox-70.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "23c145e14f86300430479ab5253c854921672341b3ab0c5748bbfb1d7f4553a22f7e7c76ab3d48eb8110c9a69caa337cfb0c4cb66b53b3a267cb077375449897"; + sha512 = "155eee867cf421717c5c6720c2926318dfd7e3900bd42bbadf6947d291c3afa7b6d81610d53052700f32338e9fd4dd66ffc240ceabd5e6c6b6a3d5a18462b923"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gu-IN/firefox-70.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8738fe7c58893724e6a2a5b46dd888823fa0e1621639341b36b120913f28626f9ecc71e7ae54d16704a411f9c58908ff4ac7f77c8c4622f4278969ac7fe665af"; + sha512 = "82c58161e908a2dcbd10f8192aa9c89e220a5ef250d5b5037f483a415105946fad0527b0bb6ef3ea78b6b6a785064f116e17bcac7b2f45a1f0676e689f030677"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/he/firefox-70.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "09fc26d62b294e76662e005980cf54bdef3f5d0b38ac83da3fad4b85bcc0bd614651249caa4a37bf681a7f1ff03470e79980216f24d396833fcefc808ceac4bc"; + sha512 = "c6f8f8c144d6acdbf65a733627a7b977ae0b1aea7020356ad8e8e3d1cecc568c015d5e3a523df00bc94262b1ba7460f22de6d06421119407914c3e3856b91736"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hi-IN/firefox-70.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a51273d8cd8f4ecc4d7e5140daec8d834dbfc76567a62d92ac5a469da733a6231fc6c91e5182bafade141366936080499c51f6fdf6d61f023292c0fdda186507"; + sha512 = "3ab7baf8b0609aa76cc3e72daa5bb0aab1feb6e4957ab032cb0011b575ac4f5f41689466a6ea10717c14065c463c6469967848a22a76bf9e03e53e9b3aaef6b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hr/firefox-70.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "19947b47816f7172ce94fc1a91516520fad41fc09fb8d5c25828ceabadd8506a2d5dcc6f1e1f32c43c7afff48066bf5729ff9c831dd5f3dfe1e509a3874c4965"; + sha512 = "50be7cb19abc57bb3d3810bed8786c1ba8f4aa3f4c2d4d6ec6347b1cd263c724c6f138d2f95e579010c3dd893b432dfac169f964e78585601211de2b4144c02d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hsb/firefox-70.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1eea8f2b9904f4dfebb08c718df271adf3bbc9b7eda5d0109e3cc5e34aae7688e1e81769b9bae51c8252b3d69aa52a9b740e242137675015973fe2310dd4b92a"; + sha512 = "cdbf552caa9d85ca5cd2501a98c7270eefbc4ad31db3cfc8399dc5e2d7dd7344feb71b1fd7bc6023e74dd10963668f004c4c7a74f518cc849539d9f780081c52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hu/firefox-70.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "098bdd04332e0cf675e3cfacaace38a40920fa58660098e27483555ed5f55b06f9dc8e64b38a6bc6729d7e2ba39faff02a7f90cb0286470bbae26ea523ec5fe9"; + sha512 = "731cbc3fa44e815fb9e437f863eb218accd37a009e136a653947a5571440dd839f025b724c160ef3076f87285f51503a1a9020f470076a71dd246caed8f66237"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hy-AM/firefox-70.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3228e47d2e168b9b93bb96631345a41a0130eba87ff03f8b57c0a71377f011b208037df5f03936e9d8543d994872bca26a78ed19f12a52c723063775f76d306b"; + sha512 = "0be8245de7830aec18132d8a36d9eb48528070b09d87cfcd8dff78b0d26d79dbd2cecd94bf5088158253849c2690201e38766cf85719126d232932384c7dbff0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ia/firefox-70.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "7fc1f0b3d8a4957d04080de201430af03db69a56082b8dfc07ff6992b10e0c357693aef3e6f1231eb3d3bf135218f6e77e79e000f329da7c8cf9b144108c1248"; + sha512 = "09fea9073150d0b6464d0769317c94d397eefcbd1577b73bee9601fe3babe12b7533730383a56629c2470e39628f11f0d0fef36a41f3212865b2643ca2f00add"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/id/firefox-70.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "740baef5685aec6ce47740e925f0f764dfaac1a736a634c119bf012bec24e7872238cd128d19f2f1d59e8452f54e95a9c10816748b4ddd8b7e469f8bf1568082"; + sha512 = "94b0340e3cd930ba39520ad28198a108bff9ffe40e8e1de77bc783bcd211d7cb5017b2c894d212a7a024ceb69c681f76bf513a38a3cd40aa6f846afcff32b3a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/is/firefox-70.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "10566dd3e42d4499dd82900e160933f0d66773576341ff7d39ab6d1bcef2188a291856d9f3854f87f2086df77b914f9c30893446f4ae0f580d07613ce6ec31cb"; + sha512 = "68fb812f36082a9bcc41416a0ddc704c69ecd0e5d958d16c1171c7be27097342a57980692b1000fd13c1de893404fab0d150ce675e0bc4efa96e06748d392754"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/it/firefox-70.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "67e67041f213108d6fc2fa6fc5144fa20c8de19237669949a0be8786885c054710a5971bb826127c75facf65fb5a5175a349d60e4fa7d0f3e016eb48f434068f"; + sha512 = "e02f944ca83b869785b92a40a5e13f088275cffe26084f85f5d866ce5f9b0d0234e7a9fb5907e4f97663fb00091005ca73142d14f99465c3a8b1888aaa5784de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ja/firefox-70.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "24da0b3cb0f81b593563dc3eda3bf3559357d2f3f1b9019772850bc49f410ef4a12800e0a54edfc888c810083f43d74757359c82438498fe20853435bb7cc066"; + sha512 = "83611da83e6cf95dbbb3dea3586ac3fc5ab9e770a75a55e3868543c9f43fe481f5e6775dd45eb1cbeda06bb60619fe7867af64c7c8c2efc862e7f23fdd0d0ac1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ka/firefox-70.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9212744cec092fcf7440258f2d6c07f680b6b89bb73e804cca0323d4d86b4d1c7ad6bf2c24ae6cade056d9fd742fea5220847bd17203d319ef87d1d015af9179"; + sha512 = "94683999f9bf4ccb13dcce3f993291e5568a3a4f107bccae6f8b95a2d05c8e68a62e9d24ba9c60264c17a027f1848e82cce6fd143994e69e2000688bc61df543"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kab/firefox-70.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "dc48121c91f66d5c33c7afeec4218861cd8dc0aef232a4940048724541269a22ecf21645f032a51289cb5f362dda8b8073084de152337cefe21c3e4c97d0744f"; + sha512 = "fd1bdb8ff2df2e8c18ab7d13b1e07b128291b410607571426dce5054e8e6b221eadedce560c5e16d65ca2917910df02f74d6573323f7a26375f1ffcba080f22e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kk/firefox-70.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c64ae21572eddf9b97b0fd3c97d0927229c54f42af3fb65bb3a8e579064937b76f4e3ac32ce3debe24537dfc5d6aaf3615f1aec7289e62a043b1aac7b2df653b"; + sha512 = "3c53e12ccf2698778d579c09a26a522a038c4510d7af8fc9accbdbcb2c9013e12e243b88c03e7075ea76258abf2d234fe0ff7a06538f6d8e0f363ca3887617ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/km/firefox-70.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "8348b595287e8b22ffaa78d50bda5550ae027659f91c83317f2307e180d8aca29b8e58ac0b39787e7abdbd66ca88cf44fd937a6eea2064fa8df9173ac9978898"; + sha512 = "2d3bab56eed0ef36ee41b11071dc2ee0407c675421fb23fe095ac81ecc492813bac115d03b3e832c33b03fb2df89b37a6153a388b44e540d48af93234cd41888"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kn/firefox-70.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f7a2d48278c9c2da883f889c89ab83778b2d9a43a32ce6186d7b7c5428a62138689cdc3182fd851da4b992b51902352f0e28c3cf7c9bd9c014712206f4c21c11"; + sha512 = "b4dbb60f0aeaa203483a8c7c79afa9a9e8214b032507c0754b4320eabc40a39fc0a242709779faa38affc2e570dbfd70e1843d712c361ed9a3c52dca17b72eb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ko/firefox-70.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ef00c8295bb7598e0fd9a9023c4c404759e41436685c23ef0ae9c756bdd12e1cf34ae6cec4d5327807797128a3f54f105804445b11b03317ffa0e2495e262442"; + sha512 = "9c3e9876dc6363282cb302a65c3cf82bb14fb022e3f125fdad2e554d70501ef2b275826c4dcf064119463ceb93e6f0b8dab8c273364d1331d6ba5244eb0119c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lij/firefox-70.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a7927a14c82f8f095e36e5c1440e8e95bbd8906bb2945c0f8b6363b93290d9e3195c15a48d0a3e6ee9da44ff050c016e2ee7118f1e1f2c14bc234efa450fba4b"; + sha512 = "689c0b271e7efd6c45de879d573cd5fed31d1ee2445849ac3442559f11d33a500fe70e861b54b288cb84ed42434071f9da79db2c1c8f7460ebd53445079439ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lt/firefox-70.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0b382fe2188a0251cd0f45a4ca6b9e1e057249e01fbb2fbe76a34035fae4fd704f1eaeb75319acc75df1a94ece00d956b5886f07a0f5a21a5e00a6acdbd8f830"; + sha512 = "92ba0cf69d128848f2fc4dd86171ed7e4eb56c6dcf868d3918c7fbf41bb76305839f410567bb1ee7bf4ff114b858127dfb0320f2672560cb38141c88b601070e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lv/firefox-70.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "68cc69b2e070219bbd23322480cf232bce9daac37afa9b7a8cd4d8f512d82ac170cc3926a0245218b6bce0994aacc54d8f3dcb9ea0a7941e9bc3b707787ad04b"; + sha512 = "54587e5040c387431e94b4739a9e34020d7dce1777195122d513175b71ecdb44663c416fa648ed648cbf4f6279b7fcecbf819f6fc3a61155698f0dcff5f42212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mk/firefox-70.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "91fe3a635b0cbc401d5293c04da69dc3a59aafa062be8376e559858dbe9aaca49ba3826fb7486e8f12ebc582bc96a83268ed480b95324e008c77270dcf813f18"; + sha512 = "b7943903f7bd3783e5c3776d35125b19ed88e87f6449f25a5b26dead87407d0180cb21b67c89971d3e975d454098d22706c74a33d21c2888a90a0af9ef7b601a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mr/firefox-70.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8315f540933ef132f30ef28c744fba49b30fc4152d2929a7ed673939da5dc1c4de490bccca83a33dda2ebcf27624ad1892e93756555ee2da8395039ce76a5d38"; + sha512 = "07e742844231a1dc7a09a268501934c63caaa482ed7117d1a498c66b6f5c1d559e3b0d59cac06b9c3d358add59a13912af1dd11a6c2cf72d5cca97b68ecd1c32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ms/firefox-70.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "fa8272b4bc3d1a6a032c987331bafeee26b7f0881a75ba1b788171441a35e1ca95bf9dff46c529eb926dc867b524590ecb3262f2de04c0fcd8ecfad806955a6f"; + sha512 = "c649789abaac00c55ed415bdbd9c28185c56795754324517f5044cd753aedc004482501537c67c42afa616ddb5890a4ec992379fa30a28b8a492a0e559a73f95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/my/firefox-70.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b46e40abb59f4157800ebfa9e79a5aaf968fba405a77dc1c7360965d5d690139d8ce1f5735e6349a198c2cedb0a1fc90d3cdaa2d414e0800a7130de8c45753c8"; + sha512 = "06049a7770f621a9a72b5e563b485b81caad533410db23558679100f7a422fa1cf2a85233cc1bfd5d5b9c1705f8299544b4cbb4f52de3c73cf33bbe64cf845bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nb-NO/firefox-70.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "469a56fd2380f457bc84cb2fc96fa580ad0e7150042b6b9e0ebb27b29f315f34f8c2e2caf42284cc184531e392632eb52773be0d080f32281c540d81f3b63752"; + sha512 = "5f80bdb4a310d46cf5b3b36567964f444c75c92e19b5ae5cab81847b2b601f04ee3d43a2325b8bd6d7ed3422f146e90612785b25f982bbf95a86057344ae35dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ne-NP/firefox-70.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "88540a7aaa06488b3252e898cf654fe1031921e27e98525dfb5f44f770d60b43b5fd5450e5321b27b31e73e663b14fe98716f25b7db5b4acceaa7bee55f4cf79"; + sha512 = "f35496c71aa7efbab365e80050ef218fd4bad1e8c015bb97df65aa0e4f16613b531d40bbcf4739aa462077026259ea6f1d7ac71b10e51e04e75d120dcbab3ca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nl/firefox-70.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "5fccf7ad91b99aefce329b515bbe5096141618a96469912fd32f621c98be17acfe579cf03137d96cdf8d8319c4ed3d4b28e8bbe1ec2f3251b8c004e19b14b1c9"; + sha512 = "21327076b9196d799a40d28f1fea66f59944bbb0757fde66aba2b0f8b929a0d45a01bb0901c4b6eff4e0e5f7f033a44d2dac83c94494b7f95003c3dd620f1ce4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nn-NO/firefox-70.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7d9faba6bb18f19d9acab0c63bc4ffcbdf8eecdbe345943674ff2ac9545d24efae2cfeaeb34ddc8e6f24bdace18d6a6ad77d2ccda7518063ee1cea2e66382a8c"; + sha512 = "dc444e5546d1985d0ee4bbe2394e9e51131b46b9e41dae54c1402a9b08aa7de4a7d73fb57bd677af151420e71073ac398d28f4ae324b4e6e3028f01fdb98bd76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/oc/firefox-70.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "fc14d0fa30457836c0b41950df190f931c6c011a569f9160083665deddb33b6947d92485ed1e2c3adbad6a9bf51480d64c108de79a39889a87059020d0748f51"; + sha512 = "0c0fbf38f078c0fc4ae38112611f164808c7b9fbc4e3ef7d57e622e918f5c581915095d5bf7c92cc0ef9beb67cb04ba9b1ae1e011b7c8f91f23a79a326481931"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pa-IN/firefox-70.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "641580dc6260a863ee948e2fe7a814e7aee991efe556ca60cc6ff0074ffab369ca9dda05d9c3028ee22d000bb7cf5264dc56cec844f917039a7e2193b2709142"; + sha512 = "b9f07313118ddfd5147866045e047f9ae7cefa0116d86aaf7f5dbaa2a64bf14f7a56bb748e115945d04aeb1dc4572d54b3d122c1e775062ee1de366c710726d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pl/firefox-70.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "467b4c1f71cf5732834ec482f0ee1afb3d047b4a25c6a38928fd9199fed3598e94eb34ee3da7d552e3135a054d13423d94dabb430b19d00f73d0c99d6ea1df8a"; + sha512 = "bd1e920304e1bb7bf6cf198c5537f1b106b1484b7ecf683e1424d208b736d2a3ab40c7e885a385611ba6f033a2ae4fb00cf6113810a20dd8808a34ceb11c7b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-BR/firefox-70.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "af6e8ea04434f992a88c8a2fde33274776841bba274b0249b21f3ada6d991fdeff53a5499e0c92ec54e4f1acbd52b5d8226af89cab7641062d73cddfa56602f5"; + sha512 = "e1bb5ca89ea0b60cb2997b9dba3fdb25e90914899f38a51d4506cb9bbd3d61f33d32ec3a9d2d79857d339f107134a021e0253b6a54916b48b6aaa5ef4aa08638"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-PT/firefox-70.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "238852418c739d91ee6213da7c3fb9be47ca2c2f1ef13e459ebd7219814c6052147a9b8c37aa2f09155a15c84f281c20a6f23b53acbcb20ccc92392347970816"; + sha512 = "622bab9fe052fcfcdeb4d12b6b8773ed08e14dcf51fdecad24a638811a2f25c1a1efa13d7aa45dcdf06726eb366ee78c4abc7d22016303a9048df9af314c14bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/rm/firefox-70.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "13f001cc46a461176557a14de16303976f6f6cb91f778d6c9f1bb6f4973f2ef939635c28c64eac24ab2318abc558dd8b7b1b71e3ce71d5422c13fa0508900c49"; + sha512 = "b02769fd926eebc180eab8f3ab9aab7d2a8d78d81f51116ef156865c74b60ac76ec75656455557dcfda2323c3dbbb438f8979de64309851f5b77c01175fc4b24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ro/firefox-70.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2f454799772e92899a138a32702200c8a261e653fb0a9b588e312091e5acef92362eeeb18bc26ac62e6ca093f1ed07e7839010d07396754114a0b989d5aaec07"; + sha512 = "572204e2a2a6d7535ce36ba9479f1fd634069a1fd9799eac6a3e5dcf02133859f4574ab7dc36018be88e53ab5a8bafb561e5994d013c0b9da7c9ea467183bb81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ru/firefox-70.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "efe333e4abddf173a87bce8e3b82a5112a2d36f5ae690c5ad09ae668804ab3dc67a6ca3fc4d1fd49ad9591a482a5e617e4f897aa6ef59638920cd97e863d8a92"; + sha512 = "42a99586fa8d07827a597c83fdfc746beea7504e800037efe0e82b65868dcb0e1ba6dd2aa401dbe64a30879d521215d180bb39906ad332d9e362405036da48ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/si/firefox-70.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "245531ae683a796db5628becba71ba68e389d8d9646dd678a08327e41c66d2f1baf9ba223ac70d19eb110d56cb932238d1642ab129989067f4e9fe87b8d73f19"; + sha512 = "288b629c23e7bd61b64b3f5947a93753ca780906b537d1f97892424c7ea9f890008370f5ce44e74062196558e9a088856236c98031996f5d9b40b454827fb1cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sk/firefox-70.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "633c280502541f20572aaff136e0e7a2f4ca2bd2bf8c286703688ebd1fcb4516933ad46761b9bf90da033b4085985ca96e3224e8fd30d6b22bc2d531ec9195e9"; + sha512 = "47b295382b39a040171ad46268da5005173a1206a3ea26c7dd8138d287ded24740f031456dccd2fdd72266691aa2d893ffc93211ebff2759666a643e3e448915"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sl/firefox-70.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "0fcfb99cfc7be32f2ee53ec3d5d3cc436c6d423c3570e5d2564bd9e662d2e1b13339e1e63a702943b54de4374c756fcae5c6ffeefb5d63a962b5e16ce69d222b"; + sha512 = "fec91027bc619c7a6d0092db4493e40ab31311191117e1cbb39bac33450c9f8705356405b6ee38b52201ba39e4da8141505759f891c7e6ae3d8d22f9ae29a629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/son/firefox-70.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "da0321adc6aab116cdfbe1a9e67bca1e4eead2612827c783225badeec0c25af867cad573b16d4c9e052c325e922c1cfdac506fe77e707a7e554bb2268380ad15"; + sha512 = "8a1eff23ddf4391e77947519a5178724ba9393370669bc05764b971bdd930ca8ef9ede4cb0ba60c50daa2214d4212c6159f7379e16ec9a5c538ad8d7d39f0ff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sq/firefox-70.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d3f30a04a94669b0a4cc2f0067b6f15431de64a8e27d66f700274f498f4a19121fb3008a23e14c8e6949f9c261bcd4669a0afc613d4c7dc08b3075cbbb61dc79"; + sha512 = "3811b809979c87996b8db041cef14b7987331067dffcedcedebf36b9b9569c70088a38a624361b25ea5dde2af6005fbbe5add558cde41d5cfed7687a2bd96847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sr/firefox-70.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3c85221edfabe9cfc95a8d73a7435e8a4273293a4ed79d925059f12f7cff87bcdbf6b48779377bbf828fe3cd2ec841c3e0720d69c6c97b5727c27b2d3a08d42c"; + sha512 = "fbbc294a2f387e6ac44e4edc1a9b9a384d3677abdb6717e550f774d731037d0a7ce8036f25229efbacff75423e9a185423d2a39ac951c77ae62653097bc9ce26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sv-SE/firefox-70.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b88eb668b293a98f17956fcd48af915ac077c3f5c2fa0dad895fa4c05c577f0c56fae5ed2b4eba22518c979ba6af768ed92d8ddbd17e49a96388f36155388e98"; + sha512 = "0fbe4d264e97ce88bda435f7c8da09e589407030945b51b68004b5df2c0994bbe294a87b7a18a2e03a8d1de05cccbe2f23ecc59dbd1945c28b80c75e0ba45c1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ta/firefox-70.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b70452ca9eaaca80a4cba956037e67e236d1663a6a009193a4e78f80bc77f5d2fe77ee385ce6ec27d1356cddd59017741aaa9f78f6c25e2b706064b0e22aeeb0"; + sha512 = "57b86a405d32d9ca991c995316d51fc6f9363dcdbba2d0d1d601f302afaf863911e035d30ad67751210b4e3c726b3734b62b63b7dab6cc2f69a172bd8c62493e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/te/firefox-70.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "57e762c6ca3f3c9ea6c6b0088971ff8800203d38ca90bf65801a3d4f84f44e836d7454051e609f3b7bb4a851ba5c57a57d9781b81b872209bca2df3ee23283c4"; + sha512 = "54ac916b2352b545ac8f5a9ccea2cc1ea5b3e267dadec7bcb06c3db7406f4dc5f7479a0f2c3954e9e19d093fed849df50b45c51d69753626149757633039a4b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/th/firefox-70.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "4cd5b8a3b6d77f6e3653a4f9a1eaf36a93416f5c0e89c39c97863304227ff33363853d27174a90bc9d5e54c4b7d3c72b3adf2a09b2485655d1d24f7bab96f7a0"; + sha512 = "95ea774a8266d51054e7af4db09503963641981c8db332c8119e61c3d6349234aae202cc3e9726449454440f10f8ead17e4d6c682f261410937f7355cb7668b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/tr/firefox-70.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1f697f15c169a0ed5595699a20d37a3d6034d4ea2df2aa02dda2dc73b3fc91c07d8c344bfdffac5a4a6c4a44f016c9246dae1169c4ff7fdacfdf9d5093a4e353"; + sha512 = "44b70293b353fed9b8435de36178ef6ee3fea108ad4ee129a1631eb32714c06aa23d58064746cd62a0f407b1f0557da38bc749c3113f3ba1d1b5d049eaac126f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uk/firefox-70.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cc6c67520fa96593cdad128612a291e8b6c78914ddeb7088036743173b99dd3dd94a4670ce9e38e265591e1da95845f448e22eb8f0074877863dbf748f9967dd"; + sha512 = "ec6beef8f0b068b7c301a4a1a0c769b66ed5af08414d5306549b9b077592b06a2eafc175ecb097b9ab5033dad15344e52588506685222c14f73411a5fb9faeba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ur/firefox-70.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e22efcb9c9b36059209d40f1bf34bd65307b1319cb6c51a12c99684847228bc8cc139ee0ba7888e87042ac2b5866717e661b4f4e2bbd30f46dad6f18ab5c7df8"; + sha512 = "d1efd485f869b6555672d80057dfecdf7775cd45bde0711ad90dcdac8ffab4b46bf04e9350a0aa7629d9939c953f434e75b6aa458cc835e6cd06efcc7fa1bccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uz/firefox-70.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e27b755d4af110b3751de25925e95eda62037cdf8236db7587aa47aef099a055b5ddf1bf08f031ffa9c79142ecef49f2045751bb41c18d9fef9e0a2734440612"; + sha512 = "b7cae3888e2bc4a7b31a0b7313b7476799b16055f7af8e4016083da8a71f40f523f9963d79f53bd6a96c1bffe2fe2d34d62518bdbd9ad137fe17f4c175fd0f06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/vi/firefox-70.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "33617c205dfc61511df43de79c29ae8bae059e6d0d3bdc868a6965e98822efefa832d6f1ff514676f3531d4b5c89d8fac4da780b85151b05e2e05dd41ada3f1d"; + sha512 = "aa4aa778e35e72122fd857c736c226d62e5f6ec73f1075500728e90f9c2ddaf9c0e6033d1785b4102918a6db32a744617552769c29cedde655e9a3f0b173a4e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/xh/firefox-70.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "76ce282b86372019e4467d66ad1025ca6641cd8c5f4bce509def9aedcfc028b491f86cd5149a0496d08d55711578356c21ccdef786f910afe9b8ffa26c2c4c8c"; + sha512 = "41619782aca727c09262de57a128fdc7936cd4b3ace84565cf687a006bd462a3218682c56693efbb233df221c66b2b545cd701b025d6b3a5308b132ff87b35a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-CN/firefox-70.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1ccf7de81d4dbd19a9499cdfb3f286f86dee4451c5bbc5ce0bfb85d184b351e45b0d9289b609d3eca60ea32a45cbaf2160664511443a6c0d13d144945606ef26"; + sha512 = "befc922f6256bd8416758c4fcae972e939e645a752a97863ac0b432310605cbe46dea4c713d4ed86189a9f4094131fdbffec10b4d771b061335baeb180b75ea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-TW/firefox-70.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f645642c10edc2d36bd97bbf1b950710d1b52770717be35fe58b081604a4dba55b5dc417f1553cc6574826ebe7bc3435f0904754f5551f98f93d61023ca2de01"; + sha512 = "3bd89f88ca805e3b19edacb97efcbf50ffb2f4b3baf67c1d64d9c475922c6ca5ace13e07de292f95efc0f78bd1b0fe9e9e9198288c3d874263c7be6175291eb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ach/firefox-70.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "58b0df5500016a4c87a60233c8ef2d479937ec002b10ae53ee973b997c8911dcaa77470c8f0e6e3667cad5f2e4f11006a767040b0ffbc33d04b8a937087e9994"; + sha512 = "800146462c9bdef3a5cc021995ec558ba02fa1b5310973286d1360327aaa9967430d1432775c44c21dfcde6b06d39f9b7b7568661734f70f1452e78071ee440b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/af/firefox-70.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a9d47c62679e0c24a759812b6b194ae890e4cea6bbca683eb55f016a81eb05c207fef6f61f2ebc6c8f85cfb25d5f71f62b70502355435913094dfcadde81aba6"; + sha512 = "61b65cbb84523e3cf98e59847d07ec5766b2db3d5fd27c4633add006d428aed40c77f100dd87ab222b29d95bfa4cd7e2f7fc8ebae2fb4712935f51546939dbac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/an/firefox-70.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7b8fb37c1b458c9d04d45b69e3dcd054b14cf6f9bb3faa4c9bb978033e8e7fb67724ed8dfe1bce39b4821d669f9289e7ec3367a826f67ff9be81cbe37267cdf7"; + sha512 = "f9808793e9657622de595b529fb6341c13ded793177413ff5f829712f7054f42c98de5a5e153deb3f8b8f3b3fc8e80fc3737e1dc5ec577731744bd0e992d7be0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ar/firefox-70.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5ab368033e7281d7bdfc7d27b95cc7d28e8c5528e75ecb49e0b68fbbc02d2e3ff15e5c6c3218e3dd339ab2ea1531e47ecb888f7e379881d953667ebe1de3a1e7"; + sha512 = "9ab1dbce20235787d945f3ea6ada45ba174dbb9169f206c2aabeaa2fae8bba6f4cf55577c1985f59f62d2a302d97ad2e3d7b7baa68682e4ecf3b8978410b45ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ast/firefox-70.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2df1a20c28fe5d114cc1e0b0d95723ddbe4f7da2d38e9ae7a1cb43fb7808968472e32157981c612341d8e9ecf590b8d068f6b84dc3bd2642228b9d659a29e367"; + sha512 = "c5e4aedcdccddd1968564170d7f74deacec13e801bb19cb97ffeb7923924d66649b2bfcd0823d8e2b27b737bf5b0b558c57f931f1ff8b6928d2e2ad0c63d270c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/az/firefox-70.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "fcee266e1263300751f9d3829a41381cffcc82316d419cc5ad739bc67e96826cbdf7324f4cd5cc16aeb0cc3496c5188383810e311f6454b0c4794cb20b4a0703"; + sha512 = "d67fba709c62bd06288bfe80bee2e08f370824420b52b07bd0e8c6dccc350770f0710e22ce55f9ac4bf989aea74cc3db1ee026baa7fde967fdf14f8dd9694702"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/be/firefox-70.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "06f63c9f406e1c0ce2bd6400c30304a664b8728900a52ce1e015682596bf7488501da8dd6a766d54150b81ac287f04a058f110863ac6483c89348ca49fdbde4c"; + sha512 = "9fcf25f380bad5cea7c8fcceecd0734239bcf10d3081a22a24899103c96a388596135676a0769a8c2cdcce0ae7abc67e8a0b65621725de4201919d250bc28f02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bg/firefox-70.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "ff644c16c203058c37d7baee9d787d4373b3e0a2bca1d25330b11dd6da9fcebee5a93d038c283637783d27a216d062a0db84c462f9d858b35bc2dd26c638d960"; + sha512 = "a7a5818af9299a4b63098c102019134dcd74001a92a2d672d2c3c9e8dad6a58c28fdfd14ab10b96262ce34fca4947905f100a5d89df0e106df3c8b9a0a1796b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bn/firefox-70.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "54a33277a4b10d53cfc8f794ce1ecdf328f83ae99f0dfee6d47f9243c17d83351301e3138121f45928b9db54b2b9e63d0474533ae6644ca874b20405f4acac89"; + sha512 = "60de18a8524a67dfb90ee9d272ec06e70b4393b3ed76acc7c86a545af561b323710add4a4d8a896982dd8bb48bf3e32496fe800abf50fed509d91f0e54a8d04a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/br/firefox-70.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9dc72a4327bd02cfcb328bba9731ee90fda96e22ba4c46615ebc3ca0abe19472261386ffaeb06070b1456103090276c1da544fbb4c3ba8cca29a5f296fe6414a"; + sha512 = "61cca84ee862455860c3889480852df1ea62dfd9ef18209ca24fde83b3971ed7788811b4c6ad57a19d32525fa67ac82ece938700682385a4b99587959bc2af9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bs/firefox-70.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "34d0f109426869a9b6ead4d7509770f4b861590a028aa2228d4e4b508c72cb2be184a3734fc7e71b7fa0318e9b454a95bfb63314f0ee3c8af11339f1a3d15c62"; + sha512 = "45fa72a908bd24e6e8f35fbb1337b394850eeabc7d52252007a93f1f2993d4e43fadd3254a41664ecd76da29ed3b72dbebd95bf0735c71f07d9d19f3e3f723b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ca/firefox-70.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d4d442549316d417b1c013759b64d31b6fe1a55990b02357043528c5985c40dba1edd060cd58bca5d8233eb1a4a6b850bcd6cd297a81c9d6bed8f032538b9a94"; + sha512 = "53f9de3f0720b489cb7ae59c2dd2b7c0cbc6bb7306e802253562fb508ce0ff1415cf5b76c0a3eb085e592562cc1d39817009ba1e668e4c68f4ee0c8b5947cfa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cak/firefox-70.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c79a799abe3281b64e654f317de6956a1dedc4049b8c5f98aa41cd12d0d290018e7ab5faf411a777493b8e6e8d761637bad09db75edd0812cf8e57e49ebae4bb"; + sha512 = "ccac21ab9baea681bb170309fa3c1e7762aa731e49b831a4a45bb5a1477bf2582e1ea9ec78c8c63838589fbfe74b3f8e31653caf7c13355cc92de959b0d6820d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cs/firefox-70.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "bcc5a60b5795207cae1ffa2359e7668fa6f09583ea8904a73ccffdb13cbffe312a6f0bee62356fe1533f25d10b592d8ca620942f8d265ab0450a7eb42ba95c17"; + sha512 = "ac08d633f909edb3663d7e7cf5a27c1226d91a244786f941fc4fe771a7d5104183fa43782b8d838bbb50ee9342be081e28467b4dfaaae1c4b2a39233d5a9e31d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cy/firefox-70.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "221b4186252a507fce2398825039814173e55d767b1221835c0ced80fb19e4108006169009874c76176d7c39f25158cd9f554c7c08a18e1f2aca585c09054293"; + sha512 = "176f3b9699e0b2b8c7f108add3a07b90664e7eb5170c9669cb5b67f2b0a6c0b2a6c47cfb2e34494467aa865f12c12c525fc967761878b92e067baff2d6e625ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/da/firefox-70.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "947eae9a8a2e3761d5ee5d7d23d5edb2c5977417e0c812528116fe76216b7de6738978fbd561a0e78fa8e47877f880b63db5f92e4987814c69fd683f83b3dc82"; + sha512 = "29b8ccdfd4f202f418ce2005e5edff4f69d3c3c337ee78069ee9c13b9fd3e90d29b28ad2801d8133119ae3048b6a09ac8105dc4fbaf1dd8f267fd15bb9ed31a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/de/firefox-70.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "78e94aa258713c9d1d1c893d37b79062f6af8b7de49bd70857b77ed8a6eeccb8c6e452b9fcd35f726d504fafee49a7c45cd876ae7e4493bd1c11f13a737fd02b"; + sha512 = "c041f802e2c5d57f013f018e192f2c62271ee15f53a7bdc9adbb447f5b3319e4da0c9743b0cf8ce4dfb03e94d0b81e0f8256b749c4eb3ea3a3b9833bbee28db2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/dsb/firefox-70.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "041797c6567cc399d88bd34846092aa1af2e40d380d9c286e423ea797160e63616bcc3bf611c28e3eb3cfa2136db9db749f32e72141361064a71130db69adc3f"; + sha512 = "a6ed5dba712d1c5512f5e0e1caad7f0b0f7e2ccacd891bad54aee79cb749bb79610a46ebc75bb662352bb8419d8e0f047c0b0f8214f11edf8153708040188b5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/el/firefox-70.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "432d58b92a720d14b3df6cdaf685e471eef8b1f7b7ff7c9685304d99bb2382f4eb1eb0535105572d472e7887e880ab6cfe18baeb7f1660dcb59c432120dcf41e"; + sha512 = "987c29ca1d3b65bef9b5464b2d2c945cb66a6be671ce09b421218c3fbc6aeea0de6e5f7c2105943ca41b7f56d7aea25f8bdf4289eeff4618a92cf45c4234ed05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-CA/firefox-70.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "d7241e3dc44a5f66d7fa39eaf19fb0ba04f67ec1816cefe0dc2721e12df7d73b69d2fe1c7ebb24c2f5957ea3b575452ac6998bb9d9933d5ed39463d846b59d03"; + sha512 = "7e85aee04f790b6efe29ca592c38cd2962636d7b8b5901e1779fe371b7a8546f700fab25ae5a53d170afe67c3ac64345954b358965010e65fe1a63ef803dcfd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-GB/firefox-70.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "5b12a9bf265009d1baaadc0707042a4290ba398544249d39ded6f213dbf8274207cc924fe5bd47f416b0923d35559a43724a31e8ab9b5fbb52f0c8749d6441e4"; + sha512 = "a16b6b40a0c52c53b28113e5bc681b56846664899e5876d47b873816a8ee7cd309a1e49057b0bffbd923e5faa354f1f8ae4e01172ffb24062d7451fe361e8941"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-US/firefox-70.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c12dc9983539a597b00115cf1350007f9441c90e281ebc3d0d91c00bf4b260678925f52e4a1409f02f8b56d43f30191bd0eaa1ef29c3000bc3ebf1f527a5f635"; + sha512 = "de2716443b6dc3757fe58d42ef4fc526c1218601650ba7ccb0b0a9f77b7acb04a4e4af2c79b7587ab8d8e3515ca6602b563fb54ac5e102ca30952c39843c7d31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eo/firefox-70.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9429af640db7a461a66e67d7b35239eed02ed9ec5b96718c4337fe3812f93a2039c5c5eb365fc7ca3e502368657f6a33f7318b6594cd3767d0fe72314c4eef8e"; + sha512 = "bb0b25735ec9bc607661fed392c0dc841185f84b06410dc0c2b7a05245d62cdc4978285246d2b281b08507ae2de2b4fe561dc115d838a10e581e484cc12dffd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-AR/firefox-70.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "92200fa63eb1f034b80a28e45d4223e6a27a7d4f2daf07d9e1966f76927e0e6dc0da996c7528bf2dd87189a2b061adb6e44a540b7af6598923e1fb47eefef7d8"; + sha512 = "6161b532fb8412151cb007fe0fa679ff0f195206d71b4a07f8b312a28c0fa0041f32e960fc6f88f3c88e54a850a24d00dc370e8a3a16fcc5b420c0a9cfe2e674"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-CL/firefox-70.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "094dd4ff8ba4c4f5205f43b73afade5a210ac01824c3c9f475cdbfec83bebfc6390b899ffd44c395f379c40baf9254943ed5d15b30676bb5216ae8f40c02aec5"; + sha512 = "490f550d9091a70a9a693acd80f24cd644188a3ed0199781c5c04583ae2a66b623df8a5d1a5d3b1c7617a214aef09f99d306577db5bca1034ed1afdea8d909d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-ES/firefox-70.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "500400ffc47aebf23b7bc816be356550242b8655b703ddb992c18ae032ac524dc94513a81a05e4a593fd70e753a25c567e4c8089c341e6dbf374897d89c210f5"; + sha512 = "cb648224649c1f5a22c7b5eef4a4b4cb7381a76009cc1a4b0f2db7f1ca850f21ce3f5f4effe9e114f2ab55a0ca4a3f0180b5e7610cd895cbf1d8eff24a77ea82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-MX/firefox-70.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4d674f72fd150d30eb87bfd0bbd716ac93645dd69b0a8eeb5c57648077059436c6b071b4746a8b9104732e48ebbc8797c5981adfdc785500bceb99bb8b2a3190"; + sha512 = "bb5c9f06d2b17507f9036192558029a6068bc4b62c1403e228284722fd1011ca002b5b7669320c3613fb8362433a13a05960945c56721a220fd8e45e2908367c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/et/firefox-70.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ad4e26c6f7800bea6eec1be23e5964ae880b87e1bcad875c4925916c4b901bf0b4be3643d69a1785bc0bfcb35affccf2394cc2805ab0f2f8022c5bae666b70c8"; + sha512 = "642e8fb33bbffe1dbfec0caee8299051678c930b5b8382b7dbb27a139aa01edc737566b3b88444425296f29bedb30acf7e1e4bc39aabe37a4705271b0ddfa2e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eu/firefox-70.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e8091097cfbf737c775e8448e42866bcb167305e4d186b17190f41f45b12554fdf959d55be029c29915f8b3277d8d41192b740a65c218de84707f931f4e55bd6"; + sha512 = "b6856d8c07830809434528ade2e85da9577562e69e6753e0a3ba96e9e015642b77ee5cd913b017fe7ea96cd1eb985d8eed013c38e61078f37e155baf7d115711"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fa/firefox-70.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b6ea01641fdaa57026f7ad6193cb026c68392952dd3cb7e33f14bfea5762e04eebe23eb042e8b05bdef7a1f6e8bdcd7daf181f621442273f0f6a10f4d74b69a0"; + sha512 = "46f320dd9b746cfbdf6d41e6ed4fee3c36027a21bf69eec769dc656d4c4620ee702e4f6bd82a3121f14218a68948bcdc032a215bb0effe93d35b5f5e044152d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ff/firefox-70.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "293f1d5c58dd55c4a9af1deed28c3e89531df45b00e4ccf7add6e2e28b6eb34752e8eebe045392b1bfdc7a7287422ac8fb8f607822f13c28cbd7114b1a207941"; + sha512 = "f32d17a087c4fa5ab1ac6b692709b067607b5a9efaf8d15fdc3d52f9bf02db3b3e460fb1350ee17f583a8b32e1823d91aa472451598dbc3eba2774b953b32195"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fi/firefox-70.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5615e699341e9c49388e4db80d9628dc0bdb964a13885f5e5b070fef3c1a397145ad13b5c583305c52d6c1a5f466dfdd10fb97b05924c3220043da08b41121e5"; + sha512 = "ed4ce81ee0446841d989ea575654463ea8186e2e1b71e771380f2cb0ce6b2858ac8903330623be00c57a2a50f639ae320e794681647292fb6ed060fdc850d50c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fr/firefox-70.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3fb4b9aec3ee90cccd3f2fb34ff0665e68e7b55cb237e1760fbbec481748596f4c61c0e633cd1b5ef6993500f057fff74e983daa14343c820b9e3bed0cc90e2c"; + sha512 = "0b199767300180ed093b32685373d1b702a2d09587df3a4d99fc9f0d6b82c41b4002e83fd26be00b24dab4c1c3d38552d46676a5df52a69474f623ee94d72657"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fy-NL/firefox-70.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "47ab5c06277c1aff27a54e42e01501b6b33dd0452c9ed069d6cae1a19b551459b4988274ace92001a15409964a09beae84b49c356f9005416b2660a3c5b7275c"; + sha512 = "8e714668d8ad01ee6dc9cd5e5f607f393ec09434e62d1d08a55f4312a52b31591e64064bbf0da28e2e47d0c571e895e9061197ceb36d1ab5899f09de549b86c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ga-IE/firefox-70.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "0df94004a3443899ee641ba604174c996c03ff091b0e0738f5a61e5e30a2627e2d3ab468e7cd71065c6585f3eb450a9f0d6b9c82f997c8ae81aa9e891adb2dbf"; + sha512 = "4156af0bb459848815ec4bef7b91f69328cc44d9b23f56911849098d4b30422f013ac74597dbfe6610df093439170b5566e87a290e33dcb6b32d5e2e95525622"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gd/firefox-70.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2fa916963a8ee51ebe2e4e230efa2bdd36922008276ac6f67de09eea1c44b53070254e232b9713b4c1884e280727609c7e61d169219b8f56652964c7012e85bf"; + sha512 = "c2d188a2f4a63f9cc106b2dcb64d3277aea07de0f4290fec560927d8ac577ae57c0f6f9dab998833a51924f1f4eb94cbce9312ac7bc69205a64fe766093c0847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gl/firefox-70.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c4eef282b8e1658ef582c3d3219e283d1c741a00dcc3b3fb6b29494c7d0098ff7574cc92716f798c98a6ce0cb7e8362ab0b48ec1160b62520a5bc5cdf582e99d"; + sha512 = "c9427d99935fdfbf3b5ae3b0e9ab9f2b31b0a7b0d5b55b14effa1fd979d5f32b73016c939821f1db6eea286047334486b017b9000803e6ede4bcd4a564e89c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gn/firefox-70.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c6e913c6df1765846191e7979655b038d3a4b12e44812be36876380da49b646b1208119f299818fe4b4ee67f2999f3c5e442be40ec8343a2b6d6b3fcaa6edc05"; + sha512 = "e039e1bf1f0250c1179b3bd185c1a612754f496d39e087059bc485af6a280c15cecab6e7869a63357c7b0dd713ef3efe5ceb6cc4c1f7334fc67560722e63b523"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gu-IN/firefox-70.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "348e13f235c3c80b28717571916d2aebb7d0a6865d6d4577f651ed3061dd66bf02a43bdecbda879b69f78ccd9a8e2de8ac96f3abe49b87562fa6c6c398c21b2f"; + sha512 = "9a8d9a076e521a8b5a4f1cb3c06538d9cfcfbfe32862b48301c202a212beeea2d888964d317bfffbb4e4b5a56ef06ff2acda22f0b129a2521d23a5234817fcec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/he/firefox-70.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d0100433eb4194c415249b1adf984b4f3dbd8a11e4785008086603fdf1a2e6dd8d319e76296d0e5d9f9fcc0033b67f12d062b7ee0f2170c9e74b1cc73d55bdf6"; + sha512 = "763c4dc5241d3ec4337c17d4f7c7ef13667ad1a7ace2e71b65ead7fc4e771ffceb1eb1772c340ed8349cf401b1d9c4fa7f4e16031f5227e45a8e813e08437159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hi-IN/firefox-70.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "91807a5b65da4bd3d2c801431cdd5922617433068b85ac4f3c87de9e3b881239c9ffbcd6d426ee4f88a98c4fe706f2a03b105df4b124d9fffc029b158fc15105"; + sha512 = "a6092b8f611976117489fb9a860a801aac9fd598394be0b42e88091760a7f05c10d04d4e90b228a801ce784a981f4770c78e544614a68c2d9a0e8ab13fb89ff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hr/firefox-70.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3e0d747dd6e79117799fbbdc585c73312c13a21b8ea7c0ae4872b66d4da670267dce1942b350ad00026e3258af9da362e81c59e791820d3341c49ebd0e3816b1"; + sha512 = "ae2d26a2e98cc180699fa5f0a8fa1426525db4ccba99a57841fc8499e9595f0231de7802cfe347a81906d3abec3503b624ff224b1392ecaece17468ba12bad9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hsb/firefox-70.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "777ad7021020da8d302192f56e93de358af7deae7a60fe5e9f13a3b3d98779e99c4f23b8c3a801b0154f5ba35528f5800d93167de0fa3d397108df7f7ef23a58"; + sha512 = "0524a4f4ba2ddd3143f9f95e07749aa5f8c37c8f31cc9030f220a99d1a8d270b61ebb63ee3118edc79712f3af3f1795ded34492144d0dcf1857f04cbb3cf3451"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hu/firefox-70.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "651b0a70264ef15320391311ce357e944fc1cc59a7b68875578dee031247ebf8566dd70c566c43f94773751b73e783f1cbdb3cfadd0f9d11c302bcfdcb014d0c"; + sha512 = "64f4bd68c9a62965162bea7ca4bcf15369f9d3c69c0f6080d0bd660202f2a546f39835b8987e26da3752adc366164b451f842f2694305bf60a2b085749b13827"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hy-AM/firefox-70.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a3372d320797626169609e5e2d97a72f8a54cf7bdd106fd41eaf2d8e6ac8cf0615962b3cbea463aa412badb5ac02f7c1c04cf7aad546cac73caa2742e7d985af"; + sha512 = "6d33a2bf17038e24c323bd53372974062fe5a11278eb535518637ee68712f4c2da93a3dd3378161f1e67efc51a06c746578af10f02c81fd25b747820e963b5f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ia/firefox-70.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3f3925da5a9d5525f4427155061cec77307139ea61eeb532bf475aad3bc47f30af07213d26500ac8a2287bb81d37ad2bd4490626afcfe8839f94287779212612"; + sha512 = "0e4a78c9c03e7d87a934023cd0608426794f3e9818c7929b1e12bb300cc11d576334396c1125ceda555907363288726e286f6a376d6e301f386854ad3b437d35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/id/firefox-70.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3a698899d82d3a10a7c6c4e2eb61706896c73182f16b1752404a422d2731ad272052618e87bea89455eb2ffa410e138614c2c6285c1089bbc830a0217a0c9cd8"; + sha512 = "76b89937f37aedf1534b8e06601c9d59680426a55b3df3726318f438de1ec259c335876a1da31c6996e54c0d9efcc651e1504f764d4b426db2f0d97a1ca1e9ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/is/firefox-70.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d5cfdea22357a74ab7daead5a2e8b5aa16e454f0d63c569221bcdc71d8960f45780661cafff8c60499fe50dcc49d967600096e1d2f44bc1f7f649cd3f16df8d2"; + sha512 = "17c164cc5a95f3e89e2bbddf58442da84dcfe784812163b68740dd1caa9ab823333c3188abf579601437217e0e9e58871424d1227b4ade6a0fc77e5798ef9099"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/it/firefox-70.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "92da285bcd16df6a1f61f9ad7a57cc7eb867013421d61cee6a5eedf26e2a518a1988b53f6a217048eebbaa78551324a391f9c52e03d475d32eae513a4c9e2296"; + sha512 = "ae37e92971d2f0c6ce322011e66c2857aa73518f1d4e8d26c3c2cf1d99bea8909ff2541146b6789096af5141cd927dc82f91ffb9f7eaa0fcf4276d4782e72a97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ja/firefox-70.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "995903a57a7fc0f41c3737e570d61a1fcf226054d7c11be982d66ecad685aa9fa6ae6ffef93797aee387b3b442fc049f6329b5d88de86e7e809529ccf817947f"; + sha512 = "32690138d8c3dc2be001579602269ab5e89b7509f6d289a4cd0fb50b90e7a9a61ea57af8b064f904833504f0d523f1bab0a03f456fb75c967cc87f3e8e331b9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ka/firefox-70.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "834ba5046a53091f3b24038069fc98f6d40350a401ac811a75ee6053e9bcffa97d8b3210eaaadb748b328b7679c80783bde5cdc1d6340e80b7240174a3b7c140"; + sha512 = "6611137ec50a1a35b7ee3fa15a2066fd3231717ed6f7a4884c36306653226ee4211e8364e4872029d9b1967f69d10b799a4d58131d082f882e1b39e758132ebf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kab/firefox-70.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "75986a7f8dba13177b00a99f219fa1e5262015fb5688dceff96222ec1a2f6ae758aeeee620edc090acfa59a4870dd43ea181dde61a5a7e68e693e59af97d54b9"; + sha512 = "f06c8fb18639967870bd581d2757ea66631f35b167688f4693198f6d70d1f61985946216410c401f0aa881e566df5a0f13d085e1ee880a35fb9ed21b0fefddea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kk/firefox-70.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8cb2cfe5ba91af61096084aee42dd7f666605bdab54cd7304c6e839765e41e2cee627d34ed65b7162934b60eed448090e5c963813f87bc0805e79e4f92e99523"; + sha512 = "b22bae385110057cd77440101e27234afd17dc74602bf05763975ebc68e0940b4501ff168613fb664b2087a2782fe44a52589ab9972cfa44f9097513460cada5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/km/firefox-70.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "77d511c378a386c5567a47d4115fbc5c5b88dc03838a3de838c403f7b2d986b367e5cf43efd93749ac9635436f4ff1827ed3a59345a8897f332963f0cb12496f"; + sha512 = "7c49611ba0dfaed7717f385925ccc621f5313496235a90c3851d26f11ec183541553979e6efe67f36faf7997d1e27a15e3d5646f33ed884fd66e6553c93d7db6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kn/firefox-70.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "51646a4e9ef0a644266a925705e4e5d2f4488697c076f9156862d258bdb4ed2eb6b105d5b9047dfaf574154d4fca750365f86f0693f312f68d8984812997badf"; + sha512 = "c1fa863fa066a7832975963afbcf63aff6caf702ee8c58e2d54705e61b1863d71b81d7d0b9b8da7cf41d7c950a66820d8e1137a32ef91bb283ffad9b36b84388"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ko/firefox-70.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d122b9dc0c0d5f4b7d62b3f188558e0db25549cfddef321f54b53c66e704ac895e9c67d3c8970de1f4ba3e7ffdd47bac5a4430000c289fb332c1e3f9d5893b66"; + sha512 = "8d179e7660331ba4c90f666ad3792064cce4fc551144ae3a8d550f620765e43274ad18ca9eeef988c2a7ea612dcf82dfb65cf225f875b154a4d4a4c11e5d7a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lij/firefox-70.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f1d45f8a8938599b0eab9aca11b1a917b8be86a224ed5e2c2b9bdc3ca0e4532958c6cd3468c17512b718135adb4284074fa2f4f32e851ddaaf72535cff60d58a"; + sha512 = "e36bd824232bb3d7d7fb4779e3207cdd504d84861bd0b5b2ced6a29ecb9d16b10e2fb267162ca96452f52e8089a085021869eb107ad8ba5cfdb49f8e42e56648"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lt/firefox-70.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c6d7dba3ea655c9c419b5960f7d6bd6c4816a55e835470c1c77ad820fa48fa58a25db12dd26393d0eecc6aa77ee022d27ad4ba42779922a451297a35a65a87fd"; + sha512 = "4ec494f1fc2260d73aabd695a29441d12620a8118945974e8a0ca6f21a0e9e49bf8a6378d4409f26f05cef369c990e1432d0b11eec99b98399e994703ba286f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lv/firefox-70.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c5f8b3946e256c9d22b735e65987073776a1b7bfbc80b198e9a026f42b2d6161ea244d748de9948849d9fe3b760b30bb92bab2c459c8d925565f41ef39e916e7"; + sha512 = "3ffa772cecb4cea1c775b20b3ce505c2d84a9918c1422d85c5a2bde80c4b1432f223d828343af04c7c9518ae54bd7771e8144b66165aae1bdd140e068d0bda1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mk/firefox-70.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e847e1aceea05139b2f1884298d59bea6a57dc3f33edca3d0175e9137de40d8e9347116951a9e5e9f8acfe43b458bcb8744a404093d1857d0b42f72ffaad90e3"; + sha512 = "e8cf48b2e4a841c6101ab0759db844dce8865bcaf056dc0d2a5c43653bf86602dcdb337422a8149a4d4527f33ff79509d4c4a3fc221ca50c0f78fac80d7e45a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mr/firefox-70.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "92014b5413076602f711f3c71730ddd462b69bf67fffc104f2b18fd92189ae43a94c368fc4047c43366c3a15fca3cda9d8368631da51bd04f1c24727dec9ca63"; + sha512 = "a6be024f8c41f106157845fec1d5d4a5f81456d76f174883e8bc3d2f1d8dae327b20de89539980fef316baabdaf2cdf058dc91c12bbad1fefa0f374d66ac3222"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ms/firefox-70.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5c5decf31166b853e39b9a830ada9996778ad9331fb7ae21005968c1577daa156f852aab12e21da3cb5cddc55284b8cf0b439c205c0ddbe93b919de19567b7f4"; + sha512 = "4beb0656f90497f480a171d762d3b85260f4f7388847260faa15bf7835bffb88a2d44657401b5d0680992864b1a4ee8acf6a6f56d3e9f41b6704808f775076ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/my/firefox-70.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "60f910bc5a9cc7102bc6c9dfe8748e29d9590220acb5ef5c5b25e5c8b7186c6d17093df015df61296ba461c0a1f7dea139a94c4f920cd8cd8d770d0ee03d61ab"; + sha512 = "98c47dd55ce49f4933a1fd67626a6edaaa20b4945ffa21195f19c9676f284081d32de83047dcd6d0e7737be94deae34fd306484f0ea80527bf0e3117cb67fd04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nb-NO/firefox-70.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3b7702091cffa06e91d5c82c0d18468d09c6df66ce2e0aa84180db7cefc627c1f2dcb9fe889351d265a5b4a0ff49cbffe957a22b7400c8300642e68462e317c5"; + sha512 = "5d51f3e4dcdb82995c456e164bd4875e735029238ad47e7361c2af29c2c22ad43398279dad33356a858e054e268e846bdc72d8a82e869f12d2871dea8f6a75a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ne-NP/firefox-70.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6c66a05a2cb9d3224beeedc821874634049258e107820f3b1881a1cefc8d084091a418bf6c46400d56fafd7022979f324dde5309e365e06c9ec806a5020ebc0a"; + sha512 = "794aee0947e1a3b81534fee16e3d7efef9fe6d8eebd8ec18b8bb120b3a3cdfcb4929882d09e8ee15136f65d88c0d6c25cbf8570f86e8c0f337f86f12fb11580c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nl/firefox-70.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6fb7a1357f73852706906386572c1a04237a041890f4bbc6ef5c1a865ba541d6af86eb6b055ada442251e3dd7d4ce30a79ebc50ebffa3850c2bbee44ba866a19"; + sha512 = "e63f00aa526cdc8cb4eba86f4b920dc38e0a5f9eaef0a4103bf380f72b9fe2421aa4ee1417bca18da719ee01d57964c2edf21c4697121d70820686ad2f7379df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nn-NO/firefox-70.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "cdf167ea3728623fa7d3d9cbc39df02ba32750bfb61ecc9dfc574e9126c7e4b00c9c8fc938a6368d4f501d2b381eaefff9fb3024d4bdaad6f853c924fdc1b2eb"; + sha512 = "d9e30d8d820ef5b07f6814cb5e37e3918b321968229d33911afa815ea6e727f4d3b505a397b60f1c1e679dfb79f9e130de450c10f8946035153f535060b9d4cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/oc/firefox-70.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9e5180bcb7195b7064ea10046f1cd044e6d287ce732be1d6f4c0a3c5adb2a26b951d76e92866a667652616bb7853f5249618220bad09ea2d32b8aa71131d9371"; + sha512 = "94004a03a0b07fb91a30677168d19ecfb29d5613483da62859cc68d9e392f94ecfd87f29b5f3c44cdfbb3fe067216fe4f6db997da2368aeb289fb7b1d83029a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pa-IN/firefox-70.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e0ad213505bad75ce2947b0bd501df174ef4516916bef43e083506721438e83f5a35139d5aa661569ec8d955eab87973995e29ac077c330af53e9647cffbd825"; + sha512 = "5d4d9952600b81a93ed62314a536d91729ff6a423ae9359436e632c9d807b13ac19fd6b1d2034839450ed5ba5411b91afeb52d0cfd74ec84a1924b6036563b74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pl/firefox-70.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "9e84080936bbf5e7585edae2b3ccdd1d9a825ffcefea7d4399f892e9c2a18fab580928e74671e14dbde3ae0cfb0ad081f6ae3b9cd9ff1df3c778a8d0f399e11d"; + sha512 = "6f3f628b38e06494d528c96071c0ba0738582da37f16a4a28eacbd17aa7574f1ef795c662ad09b8a15637bc25fb6b791e1bc54b3d530031c66450f5f7ba3ca76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-BR/firefox-70.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b98aa88bf2c9207ab21708c7fb72be8256a0c89df32ed51202c9f24fe232d38285dcf7cb74017ce50e7eee22f091de494793eab15c36ae5724d393f49d70d78c"; + sha512 = "e97eb866f17277db6303c58411fb5f4ef561884c0e5437dc09d3da63145107a8ba5862a8d965d4c5ba38f40930e82c440ae1a26b023f6a212ce177c77df72f4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-PT/firefox-70.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0afdbce1e0c0571a31fd5f90e40bd088a3df479ecb40c851750480e917fa60150d00a35a32083a846640c2c9ed5ee455e1a71ccf2ba226f0fd6899c2e22490b0"; + sha512 = "81cd5a4c5b2a89079a45826f34ebd6564a929e1ba73dd07efa7d8a8b4958a36fa083377bd0e7b6b1e86a83a749f1117f3e7f2703961e668cced5cbdca8e95c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/rm/firefox-70.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "224c878a035a8c3a5fa6baa45964e676ee33bd5a52273f7da755a36f4d3191fb11eeed10acdfe8e5417eb2ce55fd524206cd8973a1874073d1b1c936a0490f5b"; + sha512 = "2b78c41faea2f3f91be9c21de826e5e8a2533a76dc925458e2f75f085fbce71bda63dfbaedfe988f29ef9384a0ecbf4599174a210269c6adf3f875d227374385"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ro/firefox-70.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3c07f89c0b52a0ab59d1820704fcd65c4d90cca95a4cac212b97697c6a25b918cc7cb2d86eabb4e58aa961e868c21ce5350aeee2ff2289b052fbaf9b1f1d461d"; + sha512 = "d01b01df0d9e25635b85abec0e0ac081beee02a97bc50b1902b271aa4ae5cacb410d7b9644d76785d54622553eeb8f4ca4f85e40c7867c6f99840de570974a2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ru/firefox-70.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "747f637a451e584e70414b11a5bbb65cf45a55c4491de0f0877efae6d348cffa3c4442235829474d1609d05749d3f785e17f6dea041a318dc504f795d312a88e"; + sha512 = "36ac6ec95c9c1e3d5caf1315854324bd0cb41fd6e83dabd81d3af2189fcd111ea7ab8a384e5a07f4618c9046b8f59c3590c6bb8d1a12a2475d19d7d65940a26f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/si/firefox-70.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "43a5d175b3759863ac557a69c6650bd3d7a1b2fe4747466a5e5d3b8eb5570c5b4d9ac18120ad5a79b768731409f1179fffbc5be9e6c171523ed5e0b71945eae2"; + sha512 = "796878bd3a982443558d042c64520d6cd65c1eb247c6630e1c1073c75be3a2d3e3d4f164deb44336ff536c6a7a81650c0806de79cc3698d6215fb87ff2ca50e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sk/firefox-70.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4c11c5e850d9dfbe8285973acdb85de064b9009df28b974dc482c8138472c8555c6e44718d770f561805a8dc4d600ec77cead4d217d76f412b1128db4dc3d31b"; + sha512 = "48f3179f9ac81ef1c69a44540adf994874a91770eb1b2af51804a791c10540485a61af2b1fd337f7cec86682c5a3df24e8e030add48773459b8ba7caba6e88ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sl/firefox-70.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b02dc1cbcd8307fd803d477a73c7196fcdf4cc7ce7b250892ed0cba61c2003c63454623a953a0186359e117b0ece427d977561f04d29757d2889236289fa7fe6"; + sha512 = "5ca3ddfef139448e411bb226cd2abb3a8fc4100986a294bedc5bcc4a1906a6b0ab82f6e3d536dfa66e404bd5b7eed671e98cb22f1d082764cc5d3080fa0363f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/son/firefox-70.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "aae03bccc5904c2b50d4bdc4bdbd0995ca8eeba67973bbd5ee5488606c2f0759b88334c500aa2b48edadb2c6ea27b16452db29a6647377de87a6f6d054acf202"; + sha512 = "a14b7a55043d2aeec02d1f28f30038e0ffbc3f76df1c5abad04413673d5e6d7290feab39e0ff40bfc35bf993fc49311b0cca38735c367da233808910c2a864f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sq/firefox-70.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2c9708666b8226ad9f2c107c3c9c8607942781544a6eb9a050915d5a55712fa5c9bb38a07581e9781c054a4799f4d677788cadaaa30dede88b508771da20cbeb"; + sha512 = "ea1575fefd6ffccb7a6ab428663de5e80b48062e13d3424d05b5aa3b86972236839f6a0df7546b5ead27be0a40293f2e9d74472d2756d9fa86bad18d478993de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sr/firefox-70.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b575acaaa5701c18fbb90cc71d6627eeae41a0ac1cf42327843e7c120cb51e7761b54669eda69577ed2c3c8c98ee9be66dba65e914283e50afb058f7b94c3487"; + sha512 = "8c5ecc59a41613ac259e1f1515e6475fada7cb7c33650722ad9d36005b8aa173afaab254eec004be082bd74406c88aa4754dc3f4dd131b9761fc82778a7dc573"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sv-SE/firefox-70.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "728c09e2feaaee2faebe8bd6a42ac78685c98c5d0065d14ea9d29df1afadb429f9d03519e9256e678f63c29d59f392805ea8843f7df8d25c3d42c557e91feca4"; + sha512 = "f6446ff3add515a7fe46af9752206c05632cb95b5e65e19c331556a6e4e304f765f8cfc9cd90fec2892fe7302230a5b3b85c462a557e7074e255ecd94befbcd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ta/firefox-70.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5415b52d2270d55c12254ae4cc61cadf0b743cda3ec80f36e8e5ced2bb0599abfa37725994f680165c3803889cc04f218dbd2b89f3011bc41a8f1fe204b1a821"; + sha512 = "03302b3da44fa586df13d2f20faee5da5e82151550498d7c0e0fc70efca8a98db47443bdd0289fe90d602ca53c1e82c9f610cc8432fefe5c99878faacd0c9153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/te/firefox-70.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6361e327a8d71977488d0b6e5d4dfcf9271dc4739b52e31a979bcc686b2a6f326065e88ebafba05e38e6628955690a934c02b510eb5ae0ea15371bc309ae43b3"; + sha512 = "49b3921154e909685e8e52a892a2af322e650109fa6b17bcebd62908e71b5b30c0346905c2422124629d93e1cded40b6f81222ad4871057ac482c1df7ca3b53f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/th/firefox-70.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "883fc0aabee67ca6098a4e860f58018bbdb511aeff8f1ffddf8c012357208dd2156ef0fbea7e92f2f0fc0da8d8a60d913ca638742c2b6511fbb4d943b59cb944"; + sha512 = "497da9beff43403f2b09da713474dde509ea2a71145fc8006a852536e4ab71a83586d67d6b7238b3b0ed3d135db6bb2716716b959463b13d92935f2b1ee147ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/tr/firefox-70.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "e5f302af1bb937aa0dc0283a97a61588a7ad72dd46f74c0514645edbe23a5c25032a585230709fffe34d3b7e739797e4a2a33c2b2115f4623ab2da9b7c5fda4e"; + sha512 = "43762b9401ad7337e0ff00003a07d374271ab032a4609bf9abb1fc3a69ab578e45721395d06aa4fdf41e15a71bf503156632b5e3d6f94b5d6e62592c78a267a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uk/firefox-70.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4590f2774f1b119bb76c23b65103a635c4c51541fd9ade6ae44d997892f21015c71d8d718697acff6525420d6b2d5352d2f3c4afd3f35841fd7b207260c1ac2b"; + sha512 = "e10bbbf8a8f899f2a7b57bed9a846d6b490303c456027b034a750dce6b21416415eb0d9420629d008d901ab903e7c643fe7ad5bdf5aab511da9977d536d71ffe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ur/firefox-70.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d559ce617dd2da4bf45eed7a61c79703064f29ca473993fd2df64f8e7006a6026c70e732db66fa33f78e550eaae88da2dd67cfefa85456d7e9e8a1d28e67b5be"; + sha512 = "9155b7efa37b299ce74ed6faacafb354947430265a34fea9e101a9f0947a57a4a3b001bc7b583002ea08d3b7f33074926c4f6184b563fa5a1811b2b7a9b05fd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uz/firefox-70.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1770b55e2f8a7119d5395587f9f7d7fdc10f8c3c55f954f62d08a1ec3fa66600cecbe94cc7cd04580c1ba568ce5e839bac52e8c8b3dc654937e91a8a573db358"; + sha512 = "a3a3aeaa6cfa114e619ba9685dbf9d796015f26b9fbb4529f69d17f8c40c0771d58ff044cd4f97123096244f29b964f1756868e35b5dec3fb79f7b32b7a31ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/vi/firefox-70.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "754513e26d09ceff0957a5d520097b600db660657feb1d8484ce046e90e60d37268474df79ebf5a450436b9f6574f0443fb7d647ff0f5b045055591488e4ab67"; + sha512 = "167a38acc587a4479fcd15d1e47f34e0412e846a0689a119c1f382ef119bfab3035450326d086f6c8efd67a93300df234d53165609c47e94327b4415f40d88c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/xh/firefox-70.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2e2e353006a2ad5430a201e0b7ed793d439afc1f7f4114258065f58afaa351eaf2be32f3dce1401af350cdc5753fffc13fee856181e51b961d688049c348c3f1"; + sha512 = "6a0ab1589a56d6563431d2e5f01e6c01a65be6865cb4b4d52a21b6438727d378ded049730374d3400603286104e4e05f246829b9a45513998db6c9c14597d6cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-CN/firefox-70.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7b86f1c8b7d81b90f7b72b3eec110257758da38f7f3bca50006a339de5ca1075e06762f07ba29b23a0718c6014ee30564329276098c9f8569487b4831f7b5809"; + sha512 = "f3e20c68a34ba6aca4bffd07d0bc1e5676ef7f2d9b56aa175431825e90221255bfaa76e40a6fdacf812172317deadd3e3a29756331ccb09aba5804ae58d2ca8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-TW/firefox-70.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "1f2a59adb5f3e243629f54ceb769e032eb2274990a7f5feb43a0c7f2df8344aea31fff8cb0ab9ea2e220f68548a7266ea052f8c02ef3fc8bbeb0b5917a1c853e"; + sha512 = "dea1df5beec52f0d12e18907922bbd2f27b4a20c87874c199d04671f636fbfebfc1d64bf0c8935ae41c139d4beaf08e164aabe47da8be67d4855b1fb924aabfb"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 5174bef5b914..58962c1362a2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -315,6 +315,9 @@ stdenv.mkDerivation rec { ] ++ extraMakeFlags; + RUSTFLAGS = if (lib.versionAtLeast ffversion "67"/*somewhere betwween ESRs*/) + then null else "--cap-lints warn"; + enableParallelBuilding = true; doCheck = false; # "--disable-tests" above diff --git a/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index 59ba69c1c4da..f2cc277f3dac 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.19"; - name = "links2-${version}"; + pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix b/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix index d6b775107d06..3f4f96d33efb 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix @@ -7,7 +7,7 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { - name = "lynx-${version}"; + pname = "lynx"; version = "2.8.9rel.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index 32e4366a4e46..e8841a0ab6fb 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "bluejeans-${version}"; + pname = "bluejeans"; version = "2.180.71.8"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index e8ffa7144684..772ca926cd75 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let ""; in stdenv.mkDerivation rec { - name = "flashplayer-${version}"; + pname = "flashplayer"; version = "32.0.0.238"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 29a01840555d..2d2d2a691006 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,7 +49,7 @@ }: stdenv.mkDerivation rec { - name = "flashplayer-standalone-${version}"; + pname = "flashplayer-standalone"; version = "32.0.0.238"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 30bae8792c2e..101ae99d6659 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: stdenv.mkDerivation rec { - name = "fribid-${version}"; + pname = "fribid"; version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "https://fribid.se/releases/source/${name}.tar.bz2"; + url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2"; sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 8a25036c70a3..bde4ce15d7c0 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -46,7 +46,7 @@ let in stdenv.mkDerivation rec { - name = "google-talk-plugin-${version}"; + pname = "google-talk-plugin"; # You can get the upstream version and SHA-1 hash from the following URLs: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1' diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index c6c1d6a334cd..fd956f62327e 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, firefox, libX11, xorgproto }: stdenv.mkDerivation rec { - name = "mozplugger-${version}"; + pname = "mozplugger"; version = "2.1.6"; src = fetchurl { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { cp mozplugger.so "$out/lib/mozilla/plugins" cp mozplugger.7 "$out/share/man/man7" - mkdir -p "$out/share/${name}/plugin" - ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin" + mkdir -p "$out/share/${pname}-${version}/plugin" + ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin" ''; meta = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix b/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix index b7118b49dae6..d41f84404201 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix @@ -4,7 +4,8 @@ , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" }: stdenv.mkDerivation { - name = "otter-browser-${version}"; + pname = "otter-browser"; + inherit version; src = fetchFromGitHub { owner = "OtterBrowser"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix b/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix index 3a7612bb0fbc..a4979d3bcf2c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "surf-${version}"; + pname = "surf"; version = "2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 1afe4dcea02e..fc3cc2e89a91 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -113,7 +113,7 @@ let in stdenv.mkDerivation rec { - name = "tor-browser-bundle-bin-${version}"; + pname = "tor-browser-bundle-bin"; inherit version; src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index dbe4ddca10f4..f15bf165e826 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -72,7 +72,7 @@ let ]; in stdenv.mkDerivation rec { - name = "tor-browser-bundle-${version}"; + pname = "tor-browser-bundle"; version = tor-browser-unwrapped.version; buildInputs = [ tor-browser-unwrapped tor ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index bddac77d1d69..7356768f3973 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -15,7 +15,7 @@ { https-everywhere = stdenv.mkDerivation rec { - name = "https-everywhere-${version}"; + pname = "https-everywhere"; version = "2017.10.4"; extid = "https-everywhere-eff@eff.org"; @@ -46,7 +46,7 @@ }; noscript = stdenv.mkDerivation rec { - name = "noscript-${version}"; + pname = "noscript"; version = "5.1.2"; extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; @@ -64,7 +64,7 @@ }; torbutton = stdenv.mkDerivation rec { - name = "torbutton-${version}"; + pname = "torbutton"; version = "1.9.8.1"; extid = "torbutton@torproject.org"; @@ -87,7 +87,7 @@ }; tor-launcher = stdenv.mkDerivation rec { - name = "tor-launcher-${version}"; + pname = "tor-launcher"; version = "0.2.13"; extid = "tor-launcher@torproject.org"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/uzbl/default.nix b/nixpkgs/pkgs/applications/networking/browsers/uzbl/default.nix index 1d08895f1b01..f86c4a84e58c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/uzbl/default.nix @@ -5,7 +5,7 @@ # but Python 2 + packages during runtime. stdenv.mkDerivation rec { - name = "uzbl-${version}"; + pname = "uzbl"; version = "0.9.0"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix index 1deaa33ee840..0a72099e653c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "vimb-${version}"; + pname = "vimb"; version = "3.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/browsers/vimprobable2/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vimprobable2/default.nix index 678f226816a8..8a2e164b3639 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.4.2"; - name = "vimprobable2-${version}"; + pname = "vimprobable2"; src = fetchurl { url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2"; sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr"; diff --git a/nixpkgs/pkgs/applications/networking/c14/default.nix b/nixpkgs/pkgs/applications/networking/c14/default.nix index 242abc2ece79..4495fc095796 100644 --- a/nixpkgs/pkgs/applications/networking/c14/default.nix +++ b/nixpkgs/pkgs/applications/networking/c14/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "c14-cli-${version}"; + pname = "c14-cli"; version = "0.3"; goPackagePath = "github.com/online-net/c14-cli"; diff --git a/nixpkgs/pkgs/applications/networking/charles/default.nix b/nixpkgs/pkgs/applications/networking/charles/default.nix index 3946bf886250..09be379b2409 100644 --- a/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -21,7 +21,7 @@ let }; in stdenv.mkDerivation rec { - name = "charles-${version}"; + pname = "charles"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 1bc7cea54eba..6712dcd486bc 100644 --- a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cloudflared-${version}"; + pname = "cloudflared"; version = "2019.7.0"; goPackagePath = "github.com/cloudflare/cloudflared"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 647261a138f2..92db34417f47 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "argo-${version}"; + pname = "argo"; version = "2.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/chronos/default.nix b/nixpkgs/pkgs/applications/networking/cluster/chronos/default.nix index bc9023a222f6..78be19cd81e5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/chronos/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/chronos/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }: stdenv.mkDerivation rec { - name = "chronos-${version}"; + pname = "chronos"; version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22"; src = fetchgit { @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,libexec/chronos} - cp target/chronos*.jar $out/libexec/chronos/${name}.jar + cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \ - --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${name}.jar com.airbnb.scheduler.Main" \ + --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \ --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" ''; diff --git a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix index 876630c559a5..115dc3835fc5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "machine-${version}"; + pname = "machine"; version = "0.16.1"; goPackagePath = "github.com/docker/machine"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 181663513d3e..de122dd2a5a2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: buildGoPackage rec { - name = "docker-machine-kvm-${version}"; + pname = "docker-machine-kvm"; version = "0.10.0"; goPackagePath = "github.com/dhiltgen/docker-machine-kvm"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index b8b9fa035d18..eb2946cec771 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -2,7 +2,6 @@ buildGoModule rec { pname = "docker-machine-kvm2"; - name = "${pname}-${version}"; version = minikube.version; goPackagePath = "k8s.io/minikube"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 6b0440eb84ae..1c2caff50d53 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }: buildGoPackage rec { - name = "docker-machine-xhyve-${version}"; + pname = "docker-machine-xhyve"; version = "0.3.3"; goPackagePath = "github.com/zchee/docker-machine-driver-xhyve"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index 376f8113b23a..438fdfb2ebac 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix @@ -66,7 +66,8 @@ let }; in stdenv.mkDerivation rec { - name = "hadoop-${version}"; + pname = "hadoop"; + inherit version; src = binary-distributon; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index c116e46684cd..b32862bb4d67 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "2.14.2"; - name = "helm-${version}"; + pname = "helm"; src = fetchFromGitHub { owner = "helm"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix index cd0ef728f83e..b9413577b104 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "heptio-ark-${version}"; + pname = "heptio-ark"; version = "0.10.0"; goPackagePath = "github.com/heptio/ark"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 5eaf1d13d618..7938265d1b8d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "hetzner-kube-${version}"; + pname = "hetzner-kube"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix index 6274168b3da7..52abc3189903 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kanif/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.2"; - name = "kanif-${version}"; + pname = "kanif"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/26773/${pname}-${version}.tar.gz"; sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879"; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix index 19194c2d0873..1a14e1ed273e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kompose-${version}"; + pname = "kompose"; version = "1.18.0"; goPackagePath = "github.com/kubernetes/kompose"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kontemplate/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kontemplate/default.nix index 1e03efddc062..e38dc355d246 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kontemplate-${version}"; + pname = "kontemplate"; version = "1.7.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 6a721ef14c1f..c8b95baf2f39 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -6,7 +6,8 @@ let generic = { version, sha256, ...}@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in buildGoPackage { - name = "kops-${version}"; + pname = "kops"; + inherit version; inherit goPackagePath; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index cf0116ba8569..e1b5a4425d51 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -3,7 +3,8 @@ let version = "0.12.0"; in buildGoPackage { - name = "kubecfg-${version}"; + pname = "kubecfg"; + inherit version; src = fetchFromGitHub { owner = "bitnami"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 190711e3096b..e4adabd75813 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -14,7 +14,7 @@ with lib; stdenv.mkDerivation rec { - name = "kubernetes-${version}"; + pname = "kubernetes"; version = "1.14.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix index 171ce3d3a54d..ab8b7deae72d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lib, ... }: stdenv.mkDerivation rec { - name = "kubetail-${version}"; + pname = "kubetail"; version = "1.6.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix index 55a827f9cf92..982f36def691 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix @@ -22,7 +22,7 @@ let in buildGoPackage rec { - name = "kubeval-${version}"; + pname = "kubeval"; version = "0.7.3"; goPackagePath = "github.com/garethr/kubeval"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/marathon/default.nix b/nixpkgs/pkgs/applications/networking/cluster/marathon/default.nix index 49cac6d50635..72bd82be6c16 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/marathon/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/marathon/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, jdk, mesos, fetchurl }: stdenv.mkDerivation rec { - name = "marathon-${version}"; + pname = "marathon"; version = "1.4.2"; src = fetchurl { @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,libexec/marathon} - cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar + cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ - --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \ + --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \ --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY" ''; diff --git a/nixpkgs/pkgs/applications/networking/cluster/mesos/default.nix b/nixpkgs/pkgs/applications/networking/cluster/mesos/default.nix index 8cff2494bf8f..0ffc7a1fb6f0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/mesos/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/mesos/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { version = "1.4.1"; - name = "mesos-${version}"; + pname = "mesos"; enableParallelBuilding = true; dontDisableStatic = true; src = fetchurl { - url = "mirror://apache/mesos/${version}/${name}.tar.gz"; + url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz"; sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr"; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix index 5551f635bc36..43e960d9403e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix @@ -11,7 +11,7 @@ let openshiftVersion = "v3.11.0"; in buildGoPackage rec { - name = "minishift-${version}"; + pname = "minishift"; inherit version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix index fec737ddb2ae..a4236a9408cc 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "nomad-${version}"; - version = "0.9.4"; + pname = "nomad"; + version = "0.9.5"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -10,14 +10,26 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "hashicorp"; - repo = "nomad"; + repo = pname; inherit rev; - sha256 = "1jgvnmmrz7ffpm6aamdrvklj94n7b43swk9cycqhlfbnzijianpn"; + sha256 = "01491470idb11z0ab4anb5caw46vy9s94a17l92j0z2f3f4k6xfl"; }; - # We disable Nvidia GPU scheduling on Linux, as it doesn't work there: - # Ref: https://github.com/hashicorp/nomad/issues/5535 - buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia"; + # ui: + # Nomad release commits include the compiled version of the UI, but the file + # is only included if we build with the ui tag. + # nonvidia: + # We disable Nvidia GPU scheduling on Linux, as it doesn't work there: + # Ref: https://github.com/hashicorp/nomad/issues/5535 + preBuild = let + tags = ["ui"] + ++ stdenv.lib.optional stdenv.isLinux "nonvidia"; + tagsString = stdenv.lib.concatStringsSep " " tags; + in '' + export buildFlagsArray=( + -tags="${tagsString}" + ) + ''; meta = with stdenv.lib; { homepage = https://www.nomadproject.io/; diff --git a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index dd57add14af9..758786f586a6 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -21,7 +21,7 @@ let k8sgitMajor = "0"; k8sgitMinor = "1"; in buildGoPackage rec { - name = "openshift-origin-${version}"; + pname = "openshift-origin"; inherit version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix index 618bea36de86..de0bb015852c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "pachyderm-${version}"; + pname = "pachyderm"; version = "1.8.5"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix index 3572bfe7f5ba..e675d17491af 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix @@ -15,18 +15,19 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spark-${version}"; + pname = "spark"; + inherit version; src = fetchzip { inherit sha256; - url = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz"; + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] ++ optional RSupport R ++ optional mesosSupport mesos; - untarDir = "${name}-bin-without-hadoop"; + untarDir = "${pname}-${version}-bin-without-hadoop"; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix index 052797db2f3f..0835d268cd79 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "amazon-ssm-agent"; version = "2.0.633.0"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 3218e6a25b39..8e9e6691a79e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -3,7 +3,7 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoPackage rec { - name = "stern-${version}"; + pname = "stern"; version = "1.11.0"; goPackagePath = "github.com/wercker/stern"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix b/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix index c61896d89218..3423163f5902 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/taktuk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "3.7.7"; - name = "taktuk-${version}"; + pname = "taktuk"; buildInputs = [ perl ]; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/33412/${pname}-${version}.tar.gz"; sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr"; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix index 2b39cebbbeb0..606cd0370aa2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,6 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "terraform-docs"; version = "0.6.0"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix index dd4a36807ea1..1bb8df88d010 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub}: buildGoPackage rec { - name = "terraform-inventory-${version}"; + pname = "terraform-inventory"; version = "0.7-pre"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix index 2b2c3caba862..bb634a78e23c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "terraform-provider-ansible-${version}"; + pname = "terraform-provider-ansible"; version = "1.0.3"; goPackagePath = "github.com/nbering/terraform-provider-ansible"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index ae456185a80d..1aadbbc5ccd3 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { - name = "terraform-provider-elasticsearch-${version}"; + pname = "terraform-provider-elasticsearch"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix index 291698f3065f..4571d368991f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "terraform-provider-gandi-${version}"; + pname = "terraform-provider-gandi"; version = "1.0.0"; goPackagePath = "github.com/tiramiseb/terraform-provider-gandi"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix index fddf13795f3e..06d7b8a9f073 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix @@ -11,7 +11,7 @@ # buildGoPackage rec { - name = "terraform-provider-ibm-${version}"; + pname = "terraform-provider-ibm"; version = "0.11.1"; goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 96b5c8a0fa1f..23c4f4bfa8b3 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -18,7 +18,7 @@ # https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples buildGoPackage rec { - name = "terraform-provider-libvirt-${version}"; + pname = "terraform-provider-libvirt"; version = "0.5.1"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 56c30df37c5b..ddeb5851037b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: buildGoPackage rec { - name = "terragrunt-${version}"; + pname = "terragrunt"; version = "0.17.4"; goPackagePath = "github.com/gruntwork-io/terragrunt"; diff --git a/nixpkgs/pkgs/applications/networking/corebird/default.nix b/nixpkgs/pkgs/applications/networking/corebird/default.nix index 1ee2c694e0b4..6dbc6954ef51 100644 --- a/nixpkgs/pkgs/applications/networking/corebird/default.nix +++ b/nixpkgs/pkgs/applications/networking/corebird/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.7.4"; - name = "corebird-${version}"; + pname = "corebird"; src = fetchFromGitHub { owner = "baedert"; diff --git a/nixpkgs/pkgs/applications/networking/drive/default.nix b/nixpkgs/pkgs/applications/networking/drive/default.nix index 34ebc84cea28..0967fd95dc0b 100644 --- a/nixpkgs/pkgs/applications/networking/drive/default.nix +++ b/nixpkgs/pkgs/applications/networking/drive/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "drive-${version}"; + pname = "drive"; version = "0.3.8.1"; goPackagePath = "github.com/odeke-em/drive"; diff --git a/nixpkgs/pkgs/applications/networking/droopy/default.nix b/nixpkgs/pkgs/applications/networking/droopy/default.nix index 62fe4e2e662e..c74f5789d84f 100644 --- a/nixpkgs/pkgs/applications/networking/droopy/default.nix +++ b/nixpkgs/pkgs/applications/networking/droopy/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "droopy-${version}"; + pname = "droopy"; version = "20160830"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix index ae0643669dc0..54ed0f2eea04 100644 --- a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix +++ b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix @@ -15,7 +15,8 @@ let dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { - name = "dropbox-cli-${version}"; + pname = "dropbox-cli"; + inherit version; outputs = [ "out" "nautilusExtension" ]; diff --git a/nixpkgs/pkgs/applications/networking/errbot/default.nix b/nixpkgs/pkgs/applications/networking/errbot/default.nix index f89b8206dbe6..5b1ab692abd2 100644 --- a/nixpkgs/pkgs/applications/networking/errbot/default.nix +++ b/nixpkgs/pkgs/applications/networking/errbot/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "errbot-${version}"; + pname = "errbot"; version = "5.2.0"; src = fetchurl { - url = "mirror://pypi/e/errbot/${name}.tar.gz"; + url = "mirror://pypi/e/errbot/${pname}-${version}.tar.gz"; sha256 = "0q5fg113s3gnym38d4y5mlnxw6vrm388zw5mlapf7b2zgx34r053"; }; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix index 4d17cc8bddd1..67346d45b9f4 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -3,7 +3,6 @@ with pythonPackages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "rss2email"; version = "3.9"; # TODO: on next bump, the manpage will be updated. # Update nixos/modules/services/mail/rss2email.nix to point to it instead of @@ -12,7 +11,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; src = fetchurl { - url = "mirror://pypi/r/rss2email/${name}.tar.gz"; + url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; }; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index c1a9fddb3c21..169b88f27185 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "rssguard"; version = "3.5.9"; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix index 459aee01f43f..c0a6185309ae 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: stdenv.mkDerivation rec { - name = "rsstail-${version}"; + pname = "rsstail"; version = "2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/firehol/default.nix b/nixpkgs/pkgs/applications/networking/firehol/default.nix index 335f393bc077..ab2ca1601520 100644 --- a/nixpkgs/pkgs/applications/networking/firehol/default.nix +++ b/nixpkgs/pkgs/applications/networking/firehol/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "firehol-${version}"; + pname = "firehol"; version = "3.1.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/firehol/iprange.nix b/nixpkgs/pkgs/applications/networking/firehol/iprange.nix index bb245928f07c..194dfc25ebaa 100644 --- a/nixpkgs/pkgs/applications/networking/firehol/iprange.nix +++ b/nixpkgs/pkgs/applications/networking/firehol/iprange.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iprange-${version}"; + pname = "iprange"; version = "1.0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/flent/default.nix b/nixpkgs/pkgs/applications/networking/flent/default.nix index bc0a519a0eee..bbd9a7601acd 100644 --- a/nixpkgs/pkgs/applications/networking/flent/default.nix +++ b/nixpkgs/pkgs/applications/networking/flent/default.nix @@ -1,30 +1,39 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5 -, sphinx -}: +{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python +, pythonPackages, qt5, sphinx, xvfb_run }: buildPythonApplication rec { pname = "flent"; - version = "1.2.2"; - src = fetchFromGitHub { - owner = "tohojo"; - repo = "flent"; - rev = "v${version}"; - sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r"; + version = "1.3.0"; + src = fetchPypi { + inherit pname version; + sha256 = "099779i0ghjd9ikq77z6m6scnlmk946lw9issrgz8zm7babiw4d7"; }; buildInputs = [ sphinx ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = [ matplotlib procps pyqt5 ]; + checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ]; - checkInputs = [ procps ]; + checkPhase = '' + cat >test-runner <<EOF + #!/bin/sh - propagatedBuildInputs = [ - matplotlib - procps - pyqt5 - ]; + ${python.pythonForBuild.interpreter} nix_run_setup test + EOF + chmod +x test-runner + wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH + xvfb-run -s '-screen 0 800x600x24' ./test-runner + ''; + + postInstall = '' + for program in $out/bin/*; do + wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH + done + ''; meta = with stdenv.lib; { description = "The FLExible Network Tester"; - homepage = https://flent.org; + homepage = "https://flent.org"; license = licenses.gpl3; maintainers = [ maintainers.mmlb ]; diff --git a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 530671e6173f..91002e6f75e0 100644 --- a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.43.0"; + version = "3.44.2"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "13i505y34b6lg7knzznf8812d9nwpnbf3hidpq58cbv8c31m5rkg"; + sha256 = "1dny16ybzml6py1y8vprylqq1xc08221w5xcwcmygkjrb0820kax"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix b/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix index 25ec5d29613a..e1ba71ff2c88 100644 --- a/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix +++ b/nixpkgs/pkgs/applications/networking/ftp/taxi/default.nix @@ -5,8 +5,6 @@ stdenv.mkDerivation rec { pname = "taxi"; version = "0.0.1"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; diff --git a/nixpkgs/pkgs/applications/networking/gdrive/default.nix b/nixpkgs/pkgs/applications/networking/gdrive/default.nix index d5ef1d7beaab..f16b6337d71a 100644 --- a/nixpkgs/pkgs/applications/networking/gdrive/default.nix +++ b/nixpkgs/pkgs/applications/networking/gdrive/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gdrive-${version}"; + pname = "gdrive"; version = "2.1.0"; rev = "${version}"; diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index 94d5be030da6..c5cf7a7c2ee9 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0rc3"; + previewVersion = "2.2.0rc4"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0lj2av2kbh1drr8jzd71j85xaiwp53q1g348lk2qqzr35yh16n99"; + sha256Hash = "14fzjaanaxya97wrya2lybxz6qv72fk4ws8i92zvjz4jkvjdk9n3"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0a4gx0qhy50v7nivqn8c2kz07crgzg2105hzmwag8xw6bpqmgm1d"; + sha256Hash = "03s2kq5f8whk14rhprg9yp3918641b1cwj6djcbjw8xpz0n3w022"; }; } diff --git a/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 15e0b5a07b43..830eae1fc281 100644 --- a/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -2,7 +2,7 @@ , ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { - name = "google-drive-ocamlfuse-${version}"; + pname = "google-drive-ocamlfuse"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix b/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix index 9057fda2e600..4fcdf55777a6 100644 --- a/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix +++ b/nixpkgs/pkgs/applications/networking/gopher/gopher/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "gopher-${version}"; + pname = "gopher"; version = "3.0.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix b/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix index d36533fc9e5e..45d9235afc98 100644 --- a/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix +++ b/nixpkgs/pkgs/applications/networking/gopher/gopherclient/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }: buildGoPackage rec { - name = "gopherclient-${version}"; + pname = "gopherclient"; version = "2016-10-02"; rev = "91c41b5542d08001636708e2a5054521a6004702"; diff --git a/nixpkgs/pkgs/applications/networking/ids/snort/default.nix b/nixpkgs/pkgs/applications/networking/ids/snort/default.nix index 0fdfbacb45cf..88df3857ec14 100644 --- a/nixpkgs/pkgs/applications/networking/ids/snort/default.nix +++ b/nixpkgs/pkgs/applications/networking/ids/snort/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { version = "2.9.11.1"; - name = "snort-${version}"; + pname = "snort"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 163f0ba3f497..716989c7b565 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost166 }: stdenv.mkDerivation rec { - name = "SkypeExport-${version}"; + pname = "SkypeExport"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix index 75e1791644b8..f01b8d387f83 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { version = "0.6.3"; - name = "baresip-${version}"; + pname = "baresip"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index e1e851b13bbd..5094a13119f7 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-discord-${version}"; + pname = "bitlbee-discord"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index d6c8fae2b585..84067dc5f19d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-facebook-${version}"; + pname = "bitlbee-facebook"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index a034827c4ed4..798dab2b646d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.4.2"; - name = "bitlbee-steam-${version}"; + pname = "bitlbee-steam"; src = fetchFromGitHub { rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix index bbdb2ae79f83..001eadbb01d8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -2,7 +2,7 @@ , gnutls, libvpx, makeDesktopItem }: pythonPackages.buildPythonApplication rec { - name = "blink-${version}"; + pname = "blink"; version = "3.0.3"; src = fetchdarcs { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index d76cebd11b01..21b21e253499 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "bluejeans-${version}"; + pname = "bluejeans"; version = "1.36.9"; src = diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix index 350d09078c41..daffb539676f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "5.0.1"; - name = "centerim5-${version}"; + pname = "centerim5"; src = fetchurl { - url = "http://centerim.org/download/cim5/${name}.tar.gz"; + url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz"; sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index fb47d8db8c85..3186009db582 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -2,7 +2,7 @@ cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { - name = "coyim-${version}"; + pname = "coyim"; version = "0.3.11"; goPackagePath = "github.com/coyim/coyim"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 2158409471f9..c333ae7ddcb0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2019-03-07"; + name = "dino-unstable-2019-08-27"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "cc7b0aa7bd5b6599159f654fdd8a2fd111e16a3e"; - sha256 = "1cq62vif92fz38si2bl49qwy4ys9gxdrvzkv25av6c6nwmyih4gv"; + rev = "ff6caf241c4d57d3ef124a8b7c3144a09f320ea0"; + sha256 = "1gjxfnywlypi3slvxb91b2mycrsqjinmafnkkngahyikr7gmqgnf"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 189092a6d5e0..1d9d645b0ed5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.93"; + version = "0.0.95"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz"; - sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi"; + url = "https://dl-canary.discordapp.net/apps/linux/0.0.95/discord-canary-0.0.95.tar.gz"; + sha256 = "06qhm73kc88pq0lgbi7qjy4gx9ighkmx128fdm1dpzfv62fjdasw"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index 97a4341dc4d7..f04afb6f1f71 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -5,7 +5,8 @@ let version = "5.2.0"; in stdenv.mkDerivation rec { - name = "franz-${version}"; + pname = "franz"; + inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ea793e3c0aac..e24ac2e18317 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -3,7 +3,7 @@ , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: stdenv.mkDerivation rec { - name = "freetalk-${version}"; + pname = "freetalk"; version = "4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix index 6878c9a870b1..57b745057dce 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -20,7 +20,6 @@ let gitterDirectorySuffix = "opt/gitter"; in stdenv.mkDerivation rec { pname = "gitter"; version = "4.1.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 9e1b9fe9c39f..47854683e0ed 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -39,7 +39,8 @@ let libGL ] + ":${stdenv.cc.cc.lib}/lib64"; in stdenv.mkDerivation { - name = "hipchat-${version}"; + pname = "hipchat"; + inherit version; src = fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index 689445d7dcb8..e2203dfe6eed 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,14 +3,14 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2018-05-11"; - name = "jackline-${version}"; + pname = "jackline"; + version = "2019-08-08"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "bc36b1c8b80fee6baba4f91011cd01b82a06e8eb"; - sha256 = "1xx2yx8a95m84sa1bkxi3rlx7pd39zkqwk3znj0zzz3cni6apfrz"; + rev = "b934594010a563ded9c0f436e3fab8f1cae29856"; + sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc"; }; buildInputs = with ocamlPackages; [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 820a742245ed..04a31ba403a2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "jitsi-${version}"; + pname = "jitsi"; version = "2.10.5550"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 1fb743148118..f5f8414c870c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -37,19 +37,19 @@ let in stdenv.mkDerivation rec { - name = "mattermost-desktop-${version}"; - version = "4.2.0"; + pname = "mattermost-desktop"; + version = "4.2.3"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; - sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6"; + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; + sha256 = "14xyn8dp0xxl4j9xdsjik9p6srqdxbirgcgym2sv64p01w3kc9wf"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; - sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80"; + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; + sha256 = "063rrxw76mjz71wp9xd3ppkq3s017vrzms879r2cilypmay7fhgs"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix index d86d62021fbd..f41111237114 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mcabber-${version}"; + pname = "mcabber"; version = "1.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix index ea190db07a61..3e2718c9c573 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -18,7 +18,7 @@ # rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix' stdenv.mkDerivation rec { - name = "mikutter-${version}"; + pname = "mikutter"; version = "3.8.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix index a75835b3c7e9..7b76154021ab 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { - name = "mm-${version}"; + pname = "mm"; version = "2016.11.04"; goPackagePath = "gitlab.com/meutraa/mm"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index d337c62ea094..f214f7221438 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -22,7 +22,7 @@ let }; in mkDerivation rec { - name = "nheko-${version}"; + pname = "nheko"; version = "0.6.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 64443461e375..ff260c9161b8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -2,7 +2,7 @@ fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "oysttyer-${version}"; + pname = "oysttyer"; version = "2.10.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 60fd5af0a1ab..079fc7d57fb1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -1,7 +1,7 @@ { stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : stdenv.mkDerivation rec { - name = "pidgin-carbons-${version}"; + pname = "pidgin-carbons"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 59b1d463c9d2..eb6d954eb334 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -3,7 +3,8 @@ let version = "1.5.0"; in stdenv.mkDerivation { - name = "pidgin-latex-${version}"; + pname = "pidgin-latex"; + inherit version; src = fetchurl { url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 18bf89a5f2ed..9a1e46e5ac55 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -4,7 +4,8 @@ let version = "54b2992"; in stdenv.mkDerivation rec { - name = "pidgin-mra-${version}"; + pname = "pidgin-mra"; + inherit version; src = fetchgit { url = "https://github.com/dreadatour/pidgin-mra"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 7e86a390edcb..34755809e392 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { - name = "pidgin-opensteamworks-${version}"; + pname = "pidgin-opensteamworks"; version = "unstable-2018-08-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index f407ed6cabe3..c418b2e992a8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { - name = "pidgin-skypeweb-${version}"; + pname = "pidgin-skypeweb"; version = "1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index f482e12a4bc9..936974a1a880 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "pidgin-xmpp-receipts-${version}"; + pname = "pidgin-xmpp-receipts"; + inherit version; src = fetchFromGitHub { owner = "noonien-d"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index ba1d64c8b925..1e998bcc8065 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { - name = "purple-discord-${version}"; + pname = "purple-discord"; version = "unstable-2018-04-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 61e8c2b58d9d..d226490b2755 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation rec { - name = "purple-hangouts-hg-${version}"; + pname = "purple-hangouts-hg"; version = "2018-12-02"; src = fetchhg { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index bcfcbee85568..e488ae73be00 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: stdenv.mkDerivation rec { - name = "purple-lurch-${version}"; + pname = "purple-lurch"; version = "0.6.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 0b2cba649207..3c4169274877 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -4,7 +4,8 @@ let version = "2018-08-03"; in stdenv.mkDerivation rec { - name = "purple-matrix-unstable-${version}"; + pname = "purple-matrix-unstable"; + inherit version; src = fetchgit { url = "https://github.com/matrix-org/purple-matrix"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index e54af933a081..22554a4abf8b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -4,7 +4,8 @@ let version = "40ddb6d"; in stdenv.mkDerivation rec { - name = "purple-vk-plugin-${version}"; + pname = "purple-vk-plugin"; + inherit version; src = fetchhg { url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 8527593c1a20..df2665d8ce8f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -4,7 +4,8 @@ let version = "1.3.0"; in stdenv.mkDerivation rec { - name = "telegram-purple-${version}"; + pname = "telegram-purple"; + inherit version; src = fetchgit { url = "https://github.com/majn/telegram-purple"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 6d75ba40ce01..41f205514e76 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: stdenv.mkDerivation rec { - name = "tox-prpl-${version}"; + pname = "tox-prpl"; version = "0.5.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index dfdc92cfd4b8..8f86256069ce 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pidgin } : stdenv.mkDerivation rec { - name = "pidgin-window-merge-${version}"; + pname = "pidgin-window-merge"; version = "0.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 8b6863384b3f..71168e1a692c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -13,12 +13,12 @@ # FIXME: clean the mess around choosing the SSL library (nss by default) let unwrapped = stdenv.mkDerivation rec { - name = "pidgin-${version}"; + pname = "pidgin"; majorVersion = "2"; version = "${majorVersion}.13.0"; src = fetchurl { - url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; + url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix index e7527bafcc65..1ddc603dc62e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -5,7 +5,7 @@ let gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { - name = "pond-${version}"; + pname = "pond"; version = "20150830-${stdenv.lib.strings.substring 0 7 rev}"; rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix index 79a197d1a7ac..bd88962c40df 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,7 +21,7 @@ assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "profanity-${version}"; + pname = "profanity"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index e1a2fb40c5ae..b77407bd0c83 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "psi-plus-${version}"; + pname = "psi-plus"; version = "1.4.504"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 4ab3c64d16d8..6a43344fbd3c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -11,7 +11,8 @@ let rev = "v${version}"; in mkDerivation rec { - name = "qtox-${version}"; + pname = "qtox"; + inherit version; src = fetchFromGitHub { owner = "qTox"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 60a4dd39fb0e..a23dbda6cb2a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -2,7 +2,7 @@ , auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { - name = "rambox-bare-${version}"; + pname = "rambox-bare"; version = "0.6.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index efecebe169e9..97c722f09354 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sencha-bare-${version}"; + pname = "sencha-bare"; src = srcs.${stdenv.hostPlatform.system}; nativeBuildInputs = [ gzip which unzip ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix index a6aef5e6a2fb..96ce9c32a7d6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ricochet-${version}"; + pname = "ricochet"; version = "1.1.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 168719bf0e4c..8dc053631e92 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -79,7 +79,7 @@ let }); in stdenv.mkDerivation rec { - name = "ring-daemon-${version}"; + pname = "ring-daemon"; version = "2017-07-11"; inherit src; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index 0546d2dae472..d1f1c0333616 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "restbed-${version}"; + pname = "restbed"; version = "2016-09-15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 383952f2a893..2755d181da2b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -4,7 +4,7 @@ # Versions of `riot-web` and `riot-desktop` should be kept in sync. stdenv.mkDerivation rec { - name= "riot-web-${version}"; + pname = "riot-web"; version = "1.3.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 3336c05aae74..010ea1bff7c3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - name = "signal-cli-${version}"; + pname = "signal-cli"; version = "0.6.2"; # Building from source would be preferred, but is much more involved. diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 0b4c3aade87d..c97a908d33d9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,7 +56,7 @@ let ]; in stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; + pname = "signal-desktop"; version = "1.26.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix index cf6031aa05b5..cdc176be65b0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version_major = "2.1.7369"; version_minor = "1"; version = version_major + "." + version_minor; - name = "sky-${version}"; + pname = "sky"; unpackCmd = "ar x $curSrc; tar -xf data.tar.xz"; src = fetchurl { url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 96eef843d5b9..cbab67e5e1a5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -66,7 +66,8 @@ let throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "skypeforlinux-${version}"; + pname = "skypeforlinux"; + inherit version; system = "x86_64-linux"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 79464f54232c..6271e338a964 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { # https://github.com/erroneousboat/slack-term - name = "slack-term-${version}"; + pname = "slack-term"; version = "0.4.1"; goPackagePath = "github.com/erroneousboat/slack-term"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index c24e2c4301e0..58cc7a220b92 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "e2a6a9cd9da70175881ab991220c86aa87179509"; version = "2019-07-26"; - name = "slack-theme-black-${version}"; + pname = "slack-theme-black"; src = fetchgit { inherit rev; url = "https://github.com/laCour/slack-night-mode"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 27b8aaf887a3..d3aa302d601a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -57,7 +57,8 @@ let throw "Slack is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "slack-${version}"; + pname = "slack"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix index 17a38479f82e..7a9ab4d127c4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation rec { version = "1.17.82"; - name = "stride-${version}"; + pname = "stride"; src = fetchurl { url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 51e7f081d1e0..db1d0a54dce0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swift-im-${version}"; + pname = "swift-im"; version = "4.0.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 21b9510a6057..3c532fa506a5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { - name = "teamspeak-client-${version}"; + pname = "teamspeak-client"; version = "3.3.0"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 4607961cdf08..3368ec1124eb 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "telepathy-idle"; version = "0.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix index c6b930fc590f..11845ecfb26c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -4,7 +4,7 @@ # should use that stdenv.mkDerivation rec { - name = "tensor-git-${version}"; + pname = "tensor-git"; version = "2017-02-21"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix index 06bcd7a0400e..edfec97edf8a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }: stdenv.mkDerivation rec { - name = "torchat-${version}"; + pname = "torchat"; version = "0.9.9.553"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix index 95879fef05ad..540aa3fcea4d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -3,7 +3,7 @@ , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { - name = "toxic-${version}"; + pname = "toxic"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix index 349a1363259c..5ef0d9162429 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -3,7 +3,7 @@ , libXrender, fontconfig, libXext, libXft, libsodium, libopus }: stdenv.mkDerivation rec { - name = "utox-${version}"; + pname = "utox"; version = "0.17.0"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 109566b5d079..cd5109320c79 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -4,7 +4,7 @@ , xz, zlib }: stdenv.mkDerivation rec { - name = "vacuum-im-${version}"; + pname = "vacuum-im"; version = "1.3.0.20160104"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index a4bf26a0b1af..b0824c780225 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "viber-${version}"; + pname = "viber"; version = "7.0.0.1035"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index b992263e215b..03bf3b3bbdd2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,7 +4,8 @@ let version = "4.0.1"; in stdenv.mkDerivation { - name = "vk-messenger-${version}"; + pname = "vk-messenger"; + inherit version; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 9f704e52721d..da4c5073000a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -22,7 +22,8 @@ let tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; in stdenv.mkDerivation rec { - name = "wavebox-${version}"; + pname = "wavebox"; + inherit version; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 980d21572cc0..4047eba1fbb5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "xmpp-client-${version}"; + pname = "xmpp-client"; version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5ce59adb2aeb..b9791cbfbac1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.0.285090.0826"; + version = "3.0.287250.0828"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0brpb5i1lc1hwal0c5n2zh27wxrm4gfbqc6bm2dgwnck04y8i4c5"; + sha256 = "0k4h43wydbcyx7b7gwxkmvbph8qc6kjpcypd7vwz8rph1l7kl1y1"; }; }; @@ -31,7 +31,8 @@ let }; in mkDerivation { - name = "zoom-us-${version}"; + pname = "zoom-us"; + inherit version; src = srcs.${stdenv.hostPlatform.system}; diff --git a/nixpkgs/pkgs/applications/networking/insync/default.nix b/nixpkgs/pkgs/applications/networking/insync/default.nix index 3719a69138c6..3a2b32f01175 100644 --- a/nixpkgs/pkgs/applications/networking/insync/default.nix +++ b/nixpkgs/pkgs/applications/networking/insync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "insync-${version}"; + pname = "insync"; version = "1.5.7.37371"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n"; } else - throw "${name} is not supported on ${stdenv.hostPlatform.system}"; + throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index 870e40d81282..426619908d65 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }: buildGoPackage rec { - name = "ipfs-cluster-${version}"; + pname = "ipfs-cluster"; version = "0.9.0"; rev = "v${version}"; @@ -9,7 +9,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { - inherit name src; + inherit src;name = "${pname}-${version}"; sha256 = "1k7xcirvi07p5g9gr9jcx5h39wk7jxfsyjrn5yraa8xdqhn6b6nx"; }) ]; diff --git a/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix index f070c5109376..39631bfc5c87 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "ipfs-migrator-${version}"; + pname = "ipfs-migrator"; version = "7"; goPackagePath = "github.com/ipfs/fs-repo-migrations"; diff --git a/nixpkgs/pkgs/applications/networking/ipget/default.nix b/nixpkgs/pkgs/applications/networking/ipget/default.nix index 45835248d0d8..9f206a8f48f3 100644 --- a/nixpkgs/pkgs/applications/networking/ipget/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipget/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: buildGoPackage rec { - name = "ipget-${version}"; + pname = "ipget"; version = "0.3.2"; rev = "v${version}"; @@ -9,7 +9,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { - inherit name src; + inherit src;name = "${pname}-${version}"; sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8"; }) ]; diff --git a/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix b/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix index 746d79805f5c..cdece4eb644f 100644 --- a/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix +++ b/nixpkgs/pkgs/applications/networking/iptraf-ng/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.1.4"; - name = "iptraf-ng-${version}"; + pname = "iptraf-ng"; src = fetchurl { - url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz"; + url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz"; sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; }; diff --git a/nixpkgs/pkgs/applications/networking/irc/bip/default.nix b/nixpkgs/pkgs/applications/networking/irc/bip/default.nix index 7c40a4e12a66..0792aefe25f5 100644 --- a/nixpkgs/pkgs/applications/networking/irc/bip/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/bip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: stdenv.mkDerivation rec { - name = "bip-${version}"; + pname = "bip"; version = "0.8.9"; # fetch sources from debian, because the creator's website provides diff --git a/nixpkgs/pkgs/applications/networking/irc/communi/default.nix b/nixpkgs/pkgs/applications/networking/irc/communi/default.nix index 917de745d277..8278f90d321c 100644 --- a/nixpkgs/pkgs/applications/networking/irc/communi/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/communi/default.nix @@ -1,7 +1,7 @@ { fetchgit, libcommuni, qtbase, qmake, stdenv }: stdenv.mkDerivation rec { - name = "communi-${version}"; + pname = "communi"; version = "3.5.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix b/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix index 0b52515228b9..a90446a87fa9 100644 --- a/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: stdenv.mkDerivation rec { - name = "epic5-${version}"; + pname = "epic5"; version = "2.0.1"; src = fetchurl { - url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz"; + url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz"; sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; }; diff --git a/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix b/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix index 8c5d2ffa35ea..8bdb23d50dd3 100644 --- a/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "glowing-bear-${version}"; + pname = "glowing-bear"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix index 34c4fcf0c88c..331be19abc4c 100644 --- a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,43 +1,52 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 -, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, libsexy, enchant1, libnotify, openssl, intltool +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +, pciutils, dbus-glib, libcanberra-gtk2, libproxy +, libsexy, enchant2, libnotify, openssl, isocodes , desktop-file-utils, hicolor-icon-theme -, autoconf, automake, autoconf-archive +, meson, ninja }: stdenv.mkDerivation rec { - version = "2.12.4"; - name = "hexchat-${version}"; + pname = "hexchat"; + version = "2.14.2"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "1z8v7jg1mc2277k3jihnq4rixw1q27305aw6b6rpb1x7vpiy2zr3"; + sha256 = "1kz81xfis0bw2cfd6ndw32jdzdl5azk9ixqj4a3lginmlj6fs45a"; }; - nativeBuildInputs = [ - pkgconfig libtool intltool - autoconf autoconf-archive automake - ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy + gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy libsexy libnotify openssl desktop-file-utils hicolor-icon-theme + isocodes ]; - enableParallelBuilding = true; - - #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path - patchPhase = '' - sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c - ''; + patches = [ + #https://github.com/hexchat/hexchat/issues/2237 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hexchat/raw/8a08a0c8a8da503b18f2fbb15194c5f3728a689a/f/0001-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch"; + sha256 = "1199dj3wvjqj6h5vlm7lzhaax84j9ki6an8y8fs4rww27iq0lk8g"; + }) + ]; - preConfigure = '' - ./autogen.sh + #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path + postPatch = '' + sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c + sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build + chmod +x meson_post_install.py + for f in meson_post_install.py \ + src/common/make-te.py \ + plugins/perl/generate_header.py \ + po/validate-textevent-translations + do + patchShebangs $f + done ''; - configureFlags = [ "--enable-shm" "--enable-textfe" ]; + mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; meta = with stdenv.lib; { description = "A popular and easy to use graphical IRC (chat) client"; diff --git a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 5aca2c49d14b..1751812d67e8 100644 --- a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { - version = "1.2.1"; - name = "irssi-${version}"; + pname = "irssi"; + version = "1.2.2"; src = fetchurl { - url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx"; + url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix b/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix index 27297b01dce1..6a58241b89aa 100644 --- a/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/konversation/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , kdoctools , kbookmarks @@ -38,6 +39,14 @@ in mkDerivation rec { sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0"; }; + patches = [ + # Delete this patch for konversation > 1.7.5 + (fetchpatch { + url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53"; + sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y"; + }) + ]; + buildInputs = [ kbookmarks karchive diff --git a/nixpkgs/pkgs/applications/networking/irc/sic/default.nix b/nixpkgs/pkgs/applications/networking/irc/sic/default.nix index cf72bef62b17..b081a6b3672d 100644 --- a/nixpkgs/pkgs/applications/networking/irc/sic/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/sic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sic-${version}"; + pname = "sic"; version = "1.2"; makeFlags = "PREFIX=$(out)"; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index d9a5ef6602df..2421d6d2bc14 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -28,7 +28,7 @@ let assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { version = "2.5"; - name = "weechat-${version}"; + pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index de7974d4cbe3..49616671507d 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { - name = "wee-slack-${version}"; + pname = "wee-slack"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix index add52d85d8b4..6d9acdb68e52 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix @@ -4,7 +4,7 @@ with stdenv; with stdenv.lib; mkDerivation rec { - name = "wraith-${version}"; + pname = "wraith"; version = "1.4.7"; src = fetchurl { url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/nixpkgs/pkgs/applications/networking/jmeter/default.nix index 34f332b003cf..3f626a6ac483 100644 --- a/nixpkgs/pkgs/applications/networking/jmeter/default.nix +++ b/nixpkgs/pkgs/applications/networking/jmeter/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "jmeter-${version}"; + pname = "jmeter"; version = "5.1.1"; src = fetchurl { - url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; + url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz"; sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4"; }; diff --git a/nixpkgs/pkgs/applications/networking/jnetmap/default.nix b/nixpkgs/pkgs/applications/networking/jnetmap/default.nix index 8967a5d824aa..e2a8a2d56bd1 100644 --- a/nixpkgs/pkgs/applications/networking/jnetmap/default.nix +++ b/nixpkgs/pkgs/applications/networking/jnetmap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "jnetmap-${version}"; + pname = "jnetmap"; version = "0.5.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/linssid/default.nix b/nixpkgs/pkgs/applications/networking/linssid/default.nix index 14ee8095247e..daddf6adf7e4 100644 --- a/nixpkgs/pkgs/applications/networking/linssid/default.nix +++ b/nixpkgs/pkgs/applications/networking/linssid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "linssid-${version}"; + pname = "linssid"; version = "2.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix index 17a3b92e2f97..492cd640d871 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "alpine-${version}"; + pname = "alpine"; version = "2.21"; src = fetchurl { - url = "http://alpine.freeiz.com/alpine/release/src/${name}.tar.xz"; + url = "http://alpine.freeiz.com/alpine/release/src/${pname}-${version}.tar.xz"; sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30"; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix index db3cd7782e8f..15f707e06a2d 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "balsa-${version}"; + pname = "balsa"; version = "2.5.7"; src = fetchurl { - url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; + url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2"; sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx"; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index bb4c6c54f161..d7df94f7e673 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -30,7 +30,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "claws-mail-${version}"; + pname = "claws-mail"; version = "3.17.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix b/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix index e5a919af2e6f..78b1aad03fbf 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, lua, pcre }: stdenv.mkDerivation rec { - name = "imapfilter-${version}"; + pname = "imapfilter"; version = "2.6.12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix index 4139b650fb78..189ac1e6aaed 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -3,7 +3,7 @@ , fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: stdenv.mkDerivation rec { - name = "inboxer-${version}"; + pname = "inboxer"; version = "1.2.1"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/lumail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/lumail/default.nix index bc0918737dd5..0a670b2b9a6a 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -25,7 +25,8 @@ let luaCPath = getPath "so"; in stdenv.mkDerivation { - name = "lumail-${version}"; + pname = "lumail"; + inherit version; src = fetchurl { url = "https://lumail.org/download/lumail-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix index 05e784856554..ffa3e92d390c 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mailcheck-${version}"; + pname = "mailcheck"; version = "1.91.2"; patches = [ ./mailcheck-Makefile.patch ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix index d81513406624..4cbaee4488b1 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -9,7 +9,7 @@ let inherit (pythonPackages) python; in pythonPackages.buildPythonApplication rec { - name = "mailnag-${version}"; + pname = "mailnag"; version = "1.3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix index f00ec6e6566f..6c3b3a69b1d6 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, libiconv }: stdenv.mkDerivation rec { - name = "mblaze-${version}"; + pname = "mblaze"; version = "0.5.1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index f259fdebf228..c694398bd7d2 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -26,11 +26,11 @@ assert gpgmeSupport -> gpgme != null && openssl != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "mutt-${version}"; + pname = "mutt"; version = "1.12.1"; src = fetchurl { - url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; + url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81"; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index f4b0846b98f0..615b810d0029 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20180716"; - name = "neomutt-${version}"; + pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix index 3e235400498f..b87728dd2cd1 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "notbit-${version}"; + pname = "notbit"; version = "2018-01-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 126e2854574e..67c673bc913c 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -4,7 +4,8 @@ let version = "9"; in stdenv.mkDerivation rec { - name = "notmuch-addrlookup-${version}"; + pname = "notmuch-addrlookup"; + inherit version; src = fetchFromGitHub { owner = "aperezdc"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 90c8590d52d1..d9eae3c9c503 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: stdenv.mkDerivation rec { - name = "notmuch-bower-${version}"; + pname = "notmuch-bower"; version = "0.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9ddedac09747..01081ebfb3e2 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,17 +12,17 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.28.4"; # not really, git - name = "notmuch-${version}"; + version = "0.29.1"; + pname = "notmuch"; passthru = { - pythonSourceRoot = "${name}/bindings/python"; + pythonSourceRoot = "${pname}-${version}/bindings/python"; inherit version; }; src = fetchurl { - url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds"; + url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz"; + sha256 = "0rg3rwghd3wivf3bmqcqpkkd5c779ld5hi363zjcw5fl6a7gqilq"; }; nativeBuildInputs = [ pkgconfig ]; @@ -40,16 +40,12 @@ stdenv.mkDerivation rec { patchShebangs configure patchShebangs test/ - for src in \ - util/crypto.c \ - notmuch-config.c - do - substituteInPlace "$src" \ - --replace \"gpg\" \"${gnupg}/bin/gpg\" - done - substituteInPlace lib/Makefile.local \ --replace '-install_name $(libdir)' "-install_name $out/lib" + + substituteInPlace emacs/notmuch-emacs-mua \ + --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \ + --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient' ''; configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ]; @@ -68,7 +64,7 @@ stdenv.mkDerivation rec { in '' ln -s ${test-database} test/test-databases/database-v1.tar.xz ''; - doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0"); + doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3"); checkTarget = "test"; checkInputs = [ which dtach openssl bash @@ -83,7 +79,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ flokli the-kenny ]; + maintainers = with maintainers; [ flokli puckipedia the-kenny ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index e25dfe834f65..a0dbf98f2763 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { version = "5"; - name = "muchsync-${version}"; + pname = "muchsync"; passthru = { inherit version; }; src = fetchurl { - url = "http://www.muchsync.org/src/${name}.tar.gz"; + url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz"; sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 410e5e10ceb6..7382b97ba811 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -1,7 +1,7 @@ { stdenv, lib, perl, perlPackages, makeWrapper, coreutils, notmuch }: stdenv.mkDerivation rec { - name = "notmuch-mutt-${version}"; + pname = "notmuch-mutt"; version = notmuch.version; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 70f74dff3097..986ee5fe3c9e 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -7,11 +7,11 @@ assert sslSupport -> openssl != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "sylpheed-${version}"; + pname = "sylpheed"; version = "3.7.0"; src = fetchurl { - url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${pname}-${version}.tar.xz"; sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6921279b27f2..da817731e07e 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -23,7 +23,7 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { - name = "thunderbird-${version}"; + pname = "thunderbird"; version = "60.8.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix index 2d96d0336132..7f7296cd7006 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -8,11 +8,11 @@ }: mkDerivation rec { - name = "trojita-${version}"; + pname = "trojita"; version = "0.7"; src = fetchurl { - url = "mirror://sourceforge/trojita/trojita/${name}.tar.xz"; + url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz"; sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0"; }; diff --git a/nixpkgs/pkgs/applications/networking/ndppd/default.nix b/nixpkgs/pkgs/applications/networking/ndppd/default.nix index 6d7a8bd6c430..776255e7a12c 100644 --- a/nixpkgs/pkgs/applications/networking/ndppd/default.nix +++ b/nixpkgs/pkgs/applications/networking/ndppd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gzip }: stdenv.mkDerivation rec { - name = "ndppd-${version}"; + pname = "ndppd"; version = "0.2.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/netperf/default.nix b/nixpkgs/pkgs/applications/networking/netperf/default.nix index b89173820ee8..b3001c960574 100644 --- a/nixpkgs/pkgs/applications/networking/netperf/default.nix +++ b/nixpkgs/pkgs/applications/networking/netperf/default.nix @@ -1,7 +1,7 @@ { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netperf-${version}"; + pname = "netperf"; version = "20180613"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix index e88936dc072b..34ebf4364ce7 100644 --- a/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix @@ -10,7 +10,8 @@ assert spellChecking -> gtkspell3 != null; let version = "0.145"; in stdenv.mkDerivation { - name = "pan-${version}"; + pname = "pan"; + inherit version; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/networking/newsreaders/quiterss/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/quiterss/default.nix index 898b7706bd61..002f142a53ed 100644 --- a/nixpkgs/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/nixpkgs/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "quiterss-${version}"; + pname = "quiterss"; version = "0.18.12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/nload/default.nix b/nixpkgs/pkgs/applications/networking/nload/default.nix index 2c16fabc5c41..16cc0e3d50a2 100644 --- a/nixpkgs/pkgs/applications/networking/nload/default.nix +++ b/nixpkgs/pkgs/applications/networking/nload/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.7.4"; - name = "nload-${version}"; + pname = "nload"; src = fetchurl { - url = "http://www.roland-riegel.de/nload/${name}.tar.gz"; + url = "http://www.roland-riegel.de/nload/${pname}-${version}.tar.gz"; sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61"; }; diff --git a/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix index 8795f32e829d..58e1fffdbdad 100644 --- a/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix +++ b/nixpkgs/pkgs/applications/networking/nntp-proxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: stdenv.mkDerivation rec { - name = "nntp-proxy-${version}"; + pname = "nntp-proxy"; version = "2014-01-06"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/omping/default.nix b/nixpkgs/pkgs/applications/networking/omping/default.nix index 1e127c1b1ec2..dc52d767438b 100644 --- a/nixpkgs/pkgs/applications/networking/omping/default.nix +++ b/nixpkgs/pkgs/applications/networking/omping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { - name = "omping-${version}"; + pname = "omping"; version = "0.0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/ostinato/default.nix b/nixpkgs/pkgs/applications/networking/ostinato/default.nix index 962f10a99c01..3f48601d96f5 100644 --- a/nixpkgs/pkgs/applications/networking/ostinato/default.nix +++ b/nixpkgs/pkgs/applications/networking/ostinato/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ostinato-${version}"; + pname = "ostinato"; version = "0.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/owamp/default.nix b/nixpkgs/pkgs/applications/networking/owamp/default.nix index 9ed532acfe1a..4dad5f4d6bdf 100644 --- a/nixpkgs/pkgs/applications/networking/owamp/default.nix +++ b/nixpkgs/pkgs/applications/networking/owamp/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, mandoc }: stdenv.mkDerivation rec { - name = "owamp-${version}"; + pname = "owamp"; version = "3.5.6"; buildInputs = [ autoconf automake mandoc ]; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index 8ced53c972b5..7907365a6a39 100644 --- a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: stdenv.mkDerivation rec { - name = "owncloud-client-${version}"; + pname = "owncloud-client"; version = "2.5.4.11654"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix index f58f7e04e00b..6e3b8a7293e0 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "deluge-${version}"; + pname = "deluge"; version = "1.3.15"; src = fetchurl { - url = "http://download.deluge-torrent.org/source/${name}.tar.bz2"; + url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2"; sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; }; diff --git a/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index db30da82bdb2..77aee30d38b2 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -2,7 +2,7 @@ , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { - name = "eiskaltdcpp-${version}"; + pname = "eiskaltdcpp"; version = "2.2.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix index d674c70e4c2f..244352884883 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix @@ -18,7 +18,8 @@ let version = "build01475"; freenet-jars = stdenv.mkDerivation { - name = "freenet-jars-${version}"; + pname = "freenet-jars"; + inherit version; src = fetchFromGitHub { owner = "freenet"; diff --git a/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 1d98bf776755..5488baddef4a 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "6.7.4"; - name = "frostwire-${version}"; + pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; diff --git a/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix index c66c3ca05a4e..6dd2fc343550 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "ktorrent-${version}"; + pname = "ktorrent"; version = "${libktorrent.mainVersion}.0"; src = fetchurl { - url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${name}.tar.xz"; + url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw"; }; diff --git a/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix index 7f229be1b543..b28074a2fd6e 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: stdenv.mkDerivation rec { - name = "ncdc-${version}"; + pname = "ncdc"; version = "1.22.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 7ffd79edba43..a579ae15181d 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -9,7 +9,7 @@ assert guiSupport -> (dbus != null); with lib; mkDerivation rec { - name = "qbittorrent-${version}"; + pname = "qbittorrent"; version = "4.1.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix b/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix index 2d523cc07dd9..f10714031ff0 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix @@ -3,7 +3,7 @@ , qtmultimedia, qtx11extras, qttools }: stdenv.mkDerivation rec { - name = "retroshare-${version}"; + pname = "retroshare"; version = "0.6.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix index 104131e47752..bcfe8f01e4a4 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { - name = "soulseekqt-${version}"; + pname = "soulseekqt"; inherit version; src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix index 87b331adf2d3..850fc488bf3c 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }: stdenv.mkDerivation rec { - name = "tixati-${version}"; + pname = "tixati"; version = "2.62"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix index fc803fa2745c..e05ca43eb507 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - name = "transmission-remote-cli-${version}"; + pname = "transmission-remote-cli"; version = "1.7.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 7d2f34c591e9..bcaea5eb6dcd 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "transmission-remote-gtk-${version}"; + pname = "transmission-remote-gtk"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix index 29ec8158099c..65abcf35a352 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix @@ -2,7 +2,7 @@ , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { - name = "tribler-${version}"; + pname = "tribler"; version = "7.1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix b/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix index cce44521a620..647b708e1021 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix @@ -16,7 +16,7 @@ let boostPython = boost.override { enablePython = true; }; in stdenv.mkDerivation rec { - name = "twister-${version}"; + pname = "twister"; version = "0.9.34"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix b/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix index 8725d5263fe3..b1d3c73129aa 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }: stdenv.mkDerivation rec { - name = "vuze-${version}"; + pname = "vuze"; version = "5750"; src = fetchsvn { diff --git a/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/nixpkgs/pkgs/applications/networking/pjsip/default.nix index 8a66c039b5a7..c9df5d3fbe37 100644 --- a/nixpkgs/pkgs/applications/networking/pjsip/default.nix +++ b/nixpkgs/pkgs/applications/networking/pjsip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, libsamplerate, alsaLib }: stdenv.mkDerivation rec { - name = "pjsip-${version}"; + pname = "pjsip"; version = "2.9"; src = fetchurl { @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua - mkdir -p $out/share/${name}/samples - cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples + mkdir -p $out/share/${pname}-${version}/samples + cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) diff --git a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index c685a2705862..bf8e7a16a4f3 100644 --- a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -22,7 +22,8 @@ let }; in mkDerivation rec { - name = "protonmail-bridge-${version}"; + pname = "protonmail-bridge"; + inherit version; src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; diff --git a/nixpkgs/pkgs/applications/networking/ps2client/default.nix b/nixpkgs/pkgs/applications/networking/ps2client/default.nix index 5b292fe7bec5..be4cc5830d54 100644 --- a/nixpkgs/pkgs/applications/networking/ps2client/default.nix +++ b/nixpkgs/pkgs/applications/networking/ps2client/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "unstable-2018-10-18"; - name = "ps2client-${version}"; + pname = "ps2client"; src = fetchFromGitHub { owner = "ps2dev"; diff --git a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index 66edc2032762..5255b492ec66 100644 --- a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -26,11 +26,11 @@ let }; in stdenv.mkDerivation rec { - name = "anydesk-${version}"; + pname = "anydesk"; version = "4.0.1"; src = fetchurl { - url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz"; + url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix index bf5f5df934d1..8d21f64765dc 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -65,7 +65,7 @@ let citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }: stdenv.mkDerivation rec { - name = "citrix-receiver-${version}"; + pname = "citrix-receiver"; version = "${major}.${minor}.${patch}"; inherit homepage; diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix index cf89666a379e..4936b0ce0b50 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -23,7 +23,7 @@ , gtk_engines , alsaLib , zlib -, version ? "19.6.0" +, version ? "19.8.0" }: let @@ -50,6 +50,17 @@ let x86suffix = "60"; homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; }; + + "19.8.0" = { + major = "19"; + minor = "8"; + patch = "0"; + x64hash = "0f8djw8lp5wihb23y09yac1mh09w1qp422h72r6zfx9k1lqfsdbw"; + x86hash = "0afcqirb4q349r3izy88vqkszg6y2wg14iwypk6nrmvwgvcl6jdn"; + x64suffix = "20"; + x86suffix = "20"; + homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; + }; }; # Copied this file largely from the citrix-receiver package @@ -69,12 +80,14 @@ let citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: stdenv.mkDerivation rec { - name = "citrix-workspace-${version}"; + pname = "citrix-workspace"; version = "${major}.${minor}.${patch}"; inherit homepage; prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; + preferLocalBuild = true; + src = requireFile rec { name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; sha256 = if stdenv.is64bit then x64hash else x86hash; diff --git a/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 0653686c650d..5963c6b6c950 100644 --- a/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "freerdp-${version}"; + pname = "freerdp"; version = "2.0.0-rc4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/remote/putty/default.nix b/nixpkgs/pkgs/applications/networking/remote/putty/default.nix index fdd367f97c03..3b7db7075bb5 100644 --- a/nixpkgs/pkgs/applications/networking/remote/putty/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/putty/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { version = "0.71"; - name = "putty-${version}"; + pname = "putty"; src = fetchurl { urls = [ - "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz" - "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz" + "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" + "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg"; }; diff --git a/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix index 5f737cacb465..9c9abe55daa6 100644 --- a/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; version = "1.8.6"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; diff --git a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index 9227cad52496..f9b17b42bdee 100644 --- a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "teamviewer-${version}"; + pname = "teamviewer"; version = "14.5.1691"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix new file mode 100644 index 000000000000..d253e766284f --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitLab +, meson, ninja, pkgconfig, scdoc +, wayland, wayland-protocols, openssh +, mesa, lz4, zstd, ffmpeg_4, libva +}: + +stdenv.mkDerivation rec { + pname = "waypipe-unstable"; + version = "0.6.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mstoeckl"; + repo = "waypipe"; + rev = "v${version}"; + sha256 = "13kp5snkksli0sj5ldkgybcs1s865f0qdak2w8796xvy8dg9jda8"; + }; + + postPatch = '' + substituteInPlace src/waypipe.c \ + --replace "/usr/bin/ssh" "${openssh}/bin/ssh" + ''; + + nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + + buildInputs = [ + wayland wayland-protocols + # Optional dependencies: + mesa lz4 zstd ffmpeg_4 libva + ]; + + enableParallelBuilding = true; + + mesonFlags = [ "-Dwerror=false" ]; # TODO: Report warnings upstream + + meta = with stdenv.lib; { + description = "A network proxy for Wayland clients (applications)"; + longDescription = '' + waypipe is a proxy for Wayland clients. It forwards Wayland messages and + serializes changes to shared memory buffers over a single socket. This + makes application forwarding similar to ssh -X feasible. + ''; + homepage = https://mstoeckl.com/notes/gsoc/blog.html; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix new file mode 100644 index 000000000000..f69d2326217d --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs +, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg +, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash +}: + +let + pname = "x2goserver"; + version = "4.1.0.3"; + + src = fetchurl { + url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz"; + sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"; + }; + + x2go-perl = perlPackages.buildPerlPackage rec { + pname = "X2Go"; + inherit version src; + makeFlags = [ "-f" "Makefile.perl" ]; + patchPhase = '' + substituteInPlace X2Go/Config.pm --replace '/etc/x2go' '/var/lib/x2go/conf' + substituteInPlace X2Go/Server/DB.pm \ + --replace '$x2go_lib_path/libx2go-server-db-sqlite3-wrapper' \ + '/run/wrappers/bin/x2gosqliteWrapper' + substituteInPlace X2Go/Server/DB/SQLite3.pm --replace "user='x2gouser'" "user='x2go'" + ''; + }; + + perlEnv = perl.withPackages (p: with p; [ + x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch + ]); + + binaryDeps = [ + perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep + findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs + xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil + xorg.xkbcomp xorg.setxkbmap + ]; +in +stdenv.mkDerivation rec { + inherit pname version src; + + buildInputs = [ perlEnv bash ]; + + nativeBuildInputs = [ makeWrapper ]; + + prePatch = '' + patchShebangs . + sed -i '/Makefile.PL\|Makefile.perl/d' Makefile + for i in */Makefile; do + substituteInPlace "$i" --replace "-o root -g root " "" + done + substituteInPlace libx2go-server-db-perl/Makefile --replace "chmod 2755" "chmod 755" + for i in x2goserver/sbin/x2godbadmin x2goserver/bin/x2go* + do + substituteInPlace $i --replace '/etc/x2go' '/var/lib/x2go/conf' + done + substituteInPlace x2goserver/sbin/x2gocleansessions \ + --replace '/var/run/x2goserver.pid' '/var/run/x2go/x2goserver.pid' + substituteInPlace x2goserver/sbin/x2godbadmin --replace 'user="x2gouser"' 'user="x2go"' + substituteInPlace x2goserver-xsession/etc/Xsession \ + --replace "SSH_AGENT /bin/bash -c" "SSH_AGENT ${bash}/bin/bash -c" \ + --replace "[ -f /etc/redhat-release ]" "[ -d /etc/nix ] || [ -f /etc/redhat-release ]" + ''; + + makeFlags = [ "PREFIX=/" "NXLIBDIR=${nx-libs}/lib/nx" ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + mv $out/etc/x2go/x2goserver.conf{,.example} + mv $out/etc/x2go/x2goagent.options{,.example} + ln -sf ${nx-libs}/bin/nxagent $out/bin/x2goagent + for i in $out/sbin/x2go* $(find $out/bin -type f) \ + $(ls $out/lib/x2go/x2go* | grep -v x2gocheckport) + do + wrapProgram $i --prefix PATH : ${lib.makeBinPath binaryDeps}:$out + done + # We're patching @INC of the setgid wrapper, because we can't mix + # the perl wrapper (for PERL5LIB) with security.wrappers (for setgid) + sed -ie "s,.\+bin/perl,#!${perl}/bin/perl -I ${perlEnv}/lib/perl5/site_perl," \ + $out/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Remote desktop application, server component"; + homepage = "http://x2go.org/"; + platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.averelld ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix index 442881398f63..5d33f186df7b 100644 --- a/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix @@ -2,7 +2,7 @@ let xorgxrdp = stdenv.mkDerivation rec { - name = "xorgxrdp-${version}"; + pname = "xorgxrdp"; version = "0.2.9"; src = fetchFromGitHub { @@ -35,7 +35,7 @@ let xrdp = stdenv.mkDerivation rec { version = "0.9.9"; - name = "xrdp-${version}"; + pname = "xrdp"; src = fetchFromGitHub { owner = "volth"; diff --git a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix index 1844711066b0..ecce7172defa 100644 --- a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix +++ b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix @@ -8,7 +8,7 @@ let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { - name = "resilio-sync-${version}"; + pname = "resilio-sync"; version = "2.6.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/seafile-client/default.nix b/nixpkgs/pkgs/applications/networking/seafile-client/default.nix index e93410d2669c..16430d31e835 100644 --- a/nixpkgs/pkgs/applications/networking/seafile-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/seafile-client/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; mkDerivation rec { version = "6.2.11"; - name = "seafile-client-${version}"; + pname = "seafile-client"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix index 69ae40b76180..dc578dccd19d 100644 --- a/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix +++ b/nixpkgs/pkgs/applications/networking/sieve-connect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "sieve-connect-${version}"; + pname = "sieve-connect"; version = "0.90"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix index 10c8c4235e54..dbff491fa807 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -3,7 +3,7 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "ettercap-${version}"; + pname = "ettercap"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix index 0c793c41c55a..0005a5d230d7 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }: stdenv.mkDerivation rec { - name = "kismet-${version}"; + pname = "kismet"; version = "2016-07-R1"; src = fetchurl { - url = "https://www.kismetwireless.net/code/${name}.tar.xz"; + url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; }; diff --git a/nixpkgs/pkgs/applications/networking/sniproxy/default.nix b/nixpkgs/pkgs/applications/networking/sniproxy/default.nix index 10bb465b8a1b..301802d322bd 100644 --- a/nixpkgs/pkgs/applications/networking/sniproxy/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }: stdenv.mkDerivation rec { - name = "sniproxy-${version}"; + pname = "sniproxy"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/soapui/default.nix b/nixpkgs/pkgs/applications/networking/soapui/default.nix index 1034acf0b90f..9de525d93245 100644 --- a/nixpkgs/pkgs/applications/networking/soapui/default.nix +++ b/nixpkgs/pkgs/applications/networking/soapui/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, writeText, jdk, maven, makeWrapper }: stdenv.mkDerivation rec { - name = "soapui-${version}"; + pname = "soapui"; version = "5.5.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/spideroak/default.nix b/nixpkgs/pkgs/applications/networking/spideroak/default.nix index d96a810ee05a..11c8af368b95 100644 --- a/nixpkgs/pkgs/applications/networking/spideroak/default.nix +++ b/nixpkgs/pkgs/applications/networking/spideroak/default.nix @@ -14,7 +14,8 @@ let version = "7.5.0"; in stdenv.mkDerivation { - name = "spideroak-${version}"; + pname = "spideroak"; + inherit version; src = fetchurl { name = "SpiderOakONE-${version}-slack_tar_x64.tgz"; diff --git a/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix index 706dd6703248..c70723284fd8 100644 --- a/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ b/nixpkgs/pkgs/applications/networking/ssb/patchwork-classic/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.12.0"; - name = "patchwork-classic-${version}"; + pname = "patchwork-classic"; src = fetchurl { url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; diff --git a/nixpkgs/pkgs/applications/networking/super-productivity/default.nix b/nixpkgs/pkgs/applications/networking/super-productivity/default.nix index 3f87c8558e1f..c5ff090a8076 100644 --- a/nixpkgs/pkgs/applications/networking/super-productivity/default.nix +++ b/nixpkgs/pkgs/applications/networking/super-productivity/default.nix @@ -53,7 +53,8 @@ let throw "super-productivity is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "super-productivity-${version}"; + pname = "super-productivity"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix index e4ba29d3a9f8..669ab4d1e3e5 100644 --- a/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix @@ -3,7 +3,6 @@ , fusepy, sqlalchemy }: buildPythonApplication rec { - name = pname + "-" + version; pname = "acd_cli"; version = "0.3.2"; diff --git a/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix b/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix index fae838a7d5f8..36c4dd46222e 100644 --- a/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix +++ b/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { version = "1.1.24"; - name = "backintime-common-${version}"; + pname = "backintime-common"; src = fetchFromGitHub { owner = "bit-team"; diff --git a/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix b/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix index 26288f9f6e65..fb47d9bc5101 100644 --- a/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (backintime-common) version src installFlags; - name = "backintime-qt4-${version}"; + pname = "backintime-qt4"; buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; diff --git a/nixpkgs/pkgs/applications/networking/sync/casync/default.nix b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix index 8d9b941e26e4..1eb5e44ba24f 100644 --- a/nixpkgs/pkgs/applications/networking/sync/casync/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/casync/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "casync-${version}"; + pname = "casync"; version = "2-152-ge4a3c5e"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/sync/desync/default.nix b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix index 6dcd451533ae..d38f8b53dbbf 100644 --- a/nixpkgs/pkgs/applications/networking/sync/desync/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "desync-${version}"; + pname = "desync"; version = "0.4.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix b/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix index b0315ee3477d..832f7c63f275 100644 --- a/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { - name = "lsyncd-${version}"; + pname = "lsyncd"; version = "2.2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix index 4325c8ea88ae..00edcd411fd5 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { - name = "rclone-browser-${version}"; + pname = "rclone-browser"; version = "1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index ce6765665774..52527f79303f 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.49.0"; + version = "1.49.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "13xzz6nl4863dyn9w1qczap77bbiwzp4znbifa9hg91qys0nj5ga"; + sha256 = "0mjwp1j70dqa8k3zxhcnw85ddhagkpr7c59mv8kradv6mqqzmq9c"; }; modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; diff --git a/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index ad5a35eb251f..bc93b743f8b1 100644 --- a/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation (rec { - name = "unison-${version}"; + pname = "unison"; version = "2.51.2"; src = fetchFromGitHub { owner = "bcpierce00"; diff --git a/nixpkgs/pkgs/applications/networking/syncplay/default.nix b/nixpkgs/pkgs/applications/networking/syncplay/default.nix index 763c740c8175..3e5d3187e9b2 100644 --- a/nixpkgs/pkgs/applications/networking/syncplay/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncplay/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }: buildPythonApplication rec { - name = "syncplay-${version}"; + pname = "syncplay"; version = "1.6.4"; format = "other"; diff --git a/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix b/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix index 328561529ce5..9317ccab4eab 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing-gtk/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { version = "0.9.4"; - name = "syncthing-gtk-${version}"; + pname = "syncthing-gtk"; src = fetchFromGitHub { owner = "syncthing"; diff --git a/nixpkgs/pkgs/applications/networking/tcpkali/default.nix b/nixpkgs/pkgs/applications/networking/tcpkali/default.nix index 8a056e21692b..a71425422383 100644 --- a/nixpkgs/pkgs/applications/networking/tcpkali/default.nix +++ b/nixpkgs/pkgs/applications/networking/tcpkali/default.nix @@ -3,7 +3,8 @@ let version = "1.1.1"; in stdenv.mkDerivation rec { - name = "tcpkali-${version}"; + pname = "tcpkali"; + inherit version; src = fetchFromGitHub { owner = "machinezone"; repo = "tcpkali"; diff --git a/nixpkgs/pkgs/applications/networking/tsung/default.nix b/nixpkgs/pkgs/applications/networking/tsung/default.nix index 050c8502e077..6f5a3f3ec16f 100644 --- a/nixpkgs/pkgs/applications/networking/tsung/default.nix +++ b/nixpkgs/pkgs/applications/networking/tsung/default.nix @@ -5,7 +5,7 @@ gnuplot }: stdenv.mkDerivation rec { - name = "tsung-${version}"; + pname = "tsung"; version = "1.7.0"; src = fetchurl { url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/networking/umurmur/default.nix b/nixpkgs/pkgs/applications/networking/umurmur/default.nix index a1fe790b1190..1a19c8c96b33 100644 --- a/nixpkgs/pkgs/applications/networking/umurmur/default.nix +++ b/nixpkgs/pkgs/applications/networking/umurmur/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, openssl, protobufc, libconfig }: stdenv.mkDerivation rec { - name = "umurmur-${version}"; + pname = "umurmur"; version = "0.2.17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/networking/znc/default.nix b/nixpkgs/pkgs/applications/networking/znc/default.nix index 08fa53a6e388..238864311ef0 100644 --- a/nixpkgs/pkgs/applications/networking/znc/default.nix +++ b/nixpkgs/pkgs/applications/networking/znc/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "znc-${version}"; + pname = "znc"; version = "1.7.4"; src = fetchurl { - url = "https://znc.in/releases/archive/${name}.tar.gz"; + url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi"; }; diff --git a/nixpkgs/pkgs/applications/office/abiword/default.nix b/nixpkgs/pkgs/applications/office/abiword/default.nix index 6808a81bec1d..a2b14443c1a9 100644 --- a/nixpkgs/pkgs/applications/office/abiword/default.nix +++ b/nixpkgs/pkgs/applications/office/abiword/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "abiword-${version}"; + pname = "abiword"; version = "3.0.2"; src = fetchurl { - url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz"; + url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz"; sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; }; diff --git a/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix index 91b12d8a33c3..6ef6e51527e2 100644 --- a/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix +++ b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, jre }: stdenv.mkDerivation rec { - name = "atlassian-cli-${version}"; + pname = "atlassian-cli"; version = "8.5.0"; src = fetchzip { - url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; + url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; sha256 = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz"; extraPostFetch = "chmod go-w $out"; }; diff --git a/nixpkgs/pkgs/applications/office/calligra/default.nix b/nixpkgs/pkgs/applications/office/calligra/default.nix index 4a050eb5d749..4855fbc63c3e 100644 --- a/nixpkgs/pkgs/applications/office/calligra/default.nix +++ b/nixpkgs/pkgs/applications/office/calligra/default.nix @@ -16,10 +16,9 @@ mkDerivation rec { pname = "calligra"; version = "3.1.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; diff --git a/nixpkgs/pkgs/applications/office/cb2bib/default.nix b/nixpkgs/pkgs/applications/office/cb2bib/default.nix index 461d428787b9..0043648146f5 100644 --- a/nixpkgs/pkgs/applications/office/cb2bib/default.nix +++ b/nixpkgs/pkgs/applications/office/cb2bib/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "cb2bib"; version = "2.0.0"; src = fetchurl { - url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; + url = "https://www.molspaces.com/dl/progs/${pname}-${version}.tar.gz"; sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; diff --git a/nixpkgs/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix index e4a89b513e9c..d3ab02fabd3f 100644 --- a/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { - name = "gnucash-${version}"; + pname = "gnucash"; version = "3.6"; src = fetchurl { - url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; + url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi"; }; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { rm $out/bin/gnucash-valgrind wrapProgram "$out/bin/gnucash" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \ --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --prefix PERL5LIB ":" "$PERL5LIB" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" diff --git a/nixpkgs/pkgs/applications/office/grisbi/default.nix b/nixpkgs/pkgs/applications/office/grisbi/default.nix index 338cdc170656..752ad70cd094 100644 --- a/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -2,11 +2,11 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "grisbi-${version}"; + pname = "grisbi"; version = "1.2.1"; src = fetchurl { - url = "mirror://sourceforge/grisbi/${name}.tar.bz2"; + url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; sha1 = "1159c5491967fa7afd251783013579ffb45b891b"; }; diff --git a/nixpkgs/pkgs/applications/office/ib/controller/default.nix b/nixpkgs/pkgs/applications/office/ib/controller/default.nix index b39617e02db2..372414c1a76d 100644 --- a/nixpkgs/pkgs/applications/office/ib/controller/default.nix +++ b/nixpkgs/pkgs/applications/office/ib/controller/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.14.0"; - name = "ib-controller-${version}"; + pname = "ib-controller"; src = fetchurl { url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/office/ib/tws/default.nix b/nixpkgs/pkgs/applications/office/ib/tws/default.nix index 59ecb5a5c3b7..a88f1af02c65 100644 --- a/nixpkgs/pkgs/applications/office/ib/tws/default.nix +++ b/nixpkgs/pkgs/applications/office/ib/tws/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "9542"; - name = "ib-tws-${version}"; + pname = "ib-tws"; src = requireFile rec { name = "ibtws_${version}.jar"; diff --git a/nixpkgs/pkgs/applications/office/impressive/default.nix b/nixpkgs/pkgs/applications/office/impressive/default.nix index 8946bbab9316..5065a1cb9bc9 100644 --- a/nixpkgs/pkgs/applications/office/impressive/default.nix +++ b/nixpkgs/pkgs/applications/office/impressive/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation { # This project was formerly known as KeyJNote. # See http://keyj.emphy.de/apple-lawsuit/ for details. - name = "impressive-${version}"; + pname = "impressive"; + inherit version; src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/office/jabref/default.nix b/nixpkgs/pkgs/applications/office/jabref/default.nix index ebd5a14ad047..b249186c2f17 100644 --- a/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.8.1"; - name = "jabref-${version}"; + pname = "jabref"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar"; diff --git a/nixpkgs/pkgs/applications/office/kexi/default.nix b/nixpkgs/pkgs/applications/office/kexi/default.nix index e28a2d0852b6..adad5c8680fc 100644 --- a/nixpkgs/pkgs/applications/office/kexi/default.nix +++ b/nixpkgs/pkgs/applications/office/kexi/default.nix @@ -10,10 +10,9 @@ mkDerivation rec { pname = "kexi"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1zy1q7q9rfdaws3rwf3my22ywkn6g747s3ixfcg9r80mm2g3z0bs"; }; diff --git a/nixpkgs/pkgs/applications/office/kmymoney/default.nix b/nixpkgs/pkgs/applications/office/kmymoney/default.nix index 363c484fa28d..0cb23abea66a 100644 --- a/nixpkgs/pkgs/applications/office/kmymoney/default.nix +++ b/nixpkgs/pkgs/applications/office/kmymoney/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "kmymoney-${version}"; + pname = "kmymoney"; version = "5.0.5"; src = fetchurl { - url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977"; }; diff --git a/nixpkgs/pkgs/applications/office/ledger/default.nix b/nixpkgs/pkgs/applications/office/ledger/default.nix index 276134efd73d..99e09a8f36f2 100644 --- a/nixpkgs/pkgs/applications/office/ledger/default.nix +++ b/nixpkgs/pkgs/applications/office/ledger/default.nix @@ -2,7 +2,7 @@ , texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { - name = "ledger-${version}"; + pname = "ledger"; version = "3.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index fe33d72a2167..b5cfefd78209 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -60,7 +60,8 @@ let }; in stdenv.mkDerivation rec { - name = "libreoffice-${version}"; + pname = "libreoffice"; + inherit version; inherit (primary-src) src; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/still.nix b/nixpkgs/pkgs/applications/office/libreoffice/still.nix index 969325b00006..9f04cd83c10d 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/still.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/still.nix @@ -60,7 +60,8 @@ let }; in stdenv.mkDerivation rec { - name = "libreoffice-${version}"; + pname = "libreoffice"; + inherit version; inherit (primary-src) src; diff --git a/nixpkgs/pkgs/applications/office/marp/default.nix b/nixpkgs/pkgs/applications/office/marp/default.nix index cdda46d4837f..7c054ba52047 100644 --- a/nixpkgs/pkgs/applications/office/marp/default.nix +++ b/nixpkgs/pkgs/applications/office/marp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: stdenv.mkDerivation rec { - name = "marp-${version}"; + pname = "marp"; version = "0.0.14"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/office/mendeley/default.nix b/nixpkgs/pkgs/applications/office/mendeley/default.nix index 3c4434f0098c..655a10d3a942 100644 --- a/nixpkgs/pkgs/applications/office/mendeley/default.nix +++ b/nixpkgs/pkgs/applications/office/mendeley/default.nix @@ -91,7 +91,8 @@ let in stdenv.mkDerivation { - name = "mendeley-${version}"; + pname = "mendeley"; + inherit version; src = fetchurl { url = url; diff --git a/nixpkgs/pkgs/applications/office/mmex/default.nix b/nixpkgs/pkgs/applications/office/mmex/default.nix index 3ddca8fe7620..99824cd19ec0 100644 --- a/nixpkgs/pkgs/applications/office/mmex/default.nix +++ b/nixpkgs/pkgs/applications/office/mmex/default.nix @@ -5,7 +5,8 @@ let version = "1.3.3"; in stdenv.mkDerivation { - name = "money-manager-ex-${version}"; + pname = "money-manager-ex"; + inherit version; src = fetchgit { url = "https://github.com/moneymanagerex/moneymanagerex.git"; diff --git a/nixpkgs/pkgs/applications/office/moneyplex/default.nix b/nixpkgs/pkgs/applications/office/moneyplex/default.nix index 3e666b0f6272..6b4a3869af9f 100644 --- a/nixpkgs/pkgs/applications/office/moneyplex/default.nix +++ b/nixpkgs/pkgs/applications/office/moneyplex/default.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation rec { - name = "moneyplex-${version}"; + pname = "moneyplex"; version = "16.0.22424"; src = fetchurl (if stdenv.hostPlatform.system == "i686-linux" then src_i686 diff --git a/nixpkgs/pkgs/applications/office/mytetra/default.nix b/nixpkgs/pkgs/applications/office/mytetra/default.nix index afe8ba2f9178..dd7f0ace26c9 100644 --- a/nixpkgs/pkgs/applications/office/mytetra/default.nix +++ b/nixpkgs/pkgs/applications/office/mytetra/default.nix @@ -3,7 +3,8 @@ let version = "1.44.55"; in mkDerivation rec { - name = "mytetra-${version}"; + pname = "mytetra"; + inherit version; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; diff --git a/nixpkgs/pkgs/applications/office/osmo/default.nix b/nixpkgs/pkgs/applications/office/osmo/default.nix index 20f8b428f0db..b1311428c61d 100644 --- a/nixpkgs/pkgs/applications/office/osmo/default.nix +++ b/nixpkgs/pkgs/applications/office/osmo/default.nix @@ -2,11 +2,11 @@ , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "osmo-${version}"; + pname = "osmo"; version = "0.4.2"; src = fetchurl { - url = "mirror://sourceforge/osmo-pim/${name}.tar.gz"; + url = "mirror://sourceforge/osmo-pim/${pname}-${version}.tar.gz"; sha256 = "1gjd4w9jckfpqr9n0bw0w25h3qhfyzw1xvilh3hqdadfinwyal2v"; }; diff --git a/nixpkgs/pkgs/applications/office/paperless/default.nix b/nixpkgs/pkgs/applications/office/paperless/default.nix index f1dd10e9420f..af2fd82ddb03 100644 --- a/nixpkgs/pkgs/applications/office/paperless/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless/default.nix @@ -33,7 +33,7 @@ let paperless = stdenv.mkDerivation rec { - name = "paperless-${version}"; + pname = "paperless"; version = "2.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/office/pinpoint/default.nix b/nixpkgs/pkgs/applications/office/pinpoint/default.nix index 7e6da96db808..14756c3557f4 100644 --- a/nixpkgs/pkgs/applications/office/pinpoint/default.nix +++ b/nixpkgs/pkgs/applications/office/pinpoint/default.nix @@ -2,10 +2,10 @@ , gdk-pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { - name = "pinpoint-${version}"; + pname = "pinpoint"; version = "0.1.8"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/office/planner/default.nix b/nixpkgs/pkgs/applications/office/planner/default.nix index d8765d2fa61a..41cc3d940164 100644 --- a/nixpkgs/pkgs/applications/office/planner/default.nix +++ b/nixpkgs/pkgs/applications/office/planner/default.nix @@ -13,7 +13,8 @@ let version = "unstable-2019-02-13"; in stdenv.mkDerivation { - name = "planner-${version}"; + pname = "planner"; + inherit version; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/nixpkgs/pkgs/applications/office/skrooge/default.nix b/nixpkgs/pkgs/applications/office/skrooge/default.nix index ecd38627ac5f..42fddb972c9f 100644 --- a/nixpkgs/pkgs/applications/office/skrooge/default.nix +++ b/nixpkgs/pkgs/applications/office/skrooge/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { - name = "skrooge-${version}"; + pname = "skrooge"; version = "2.20.0"; src = fetchurl { - url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; + url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w"; }; diff --git a/nixpkgs/pkgs/applications/office/timetable/default.nix b/nixpkgs/pkgs/applications/office/timetable/default.nix index bbf252d28923..fa2d59392180 100644 --- a/nixpkgs/pkgs/applications/office/timetable/default.nix +++ b/nixpkgs/pkgs/applications/office/timetable/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "timetable"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0"; + sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix b/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix index 77a602954438..edb2c778a0a5 100644 --- a/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix +++ b/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix @@ -2,7 +2,8 @@ let version = "2.11.0"; in stdenv.mkDerivation { - name = "todo.txt-cli-${version}"; + pname = "todo.txt-cli"; + inherit version; src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/office/todoman/default.nix b/nixpkgs/pkgs/applications/office/todoman/default.nix index a69fb7a1c6c7..450ee34262b9 100644 --- a/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -6,7 +6,6 @@ in buildPythonApplication rec { pname = "todoman"; version = "3.5.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/applications/office/treesheets/default.nix b/nixpkgs/pkgs/applications/office/treesheets/default.nix index 951b61e43ef4..000fa7ff1015 100644 --- a/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, wxGTK, makeWrapper }: stdenv.mkDerivation rec { - name = "treesheets-${version}"; + pname = "treesheets"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix index c1e2fdcc7dfa..877dfba88c06 100644 --- a/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation rec { - name = "trilium-${version}"; + pname = "trilium"; version = "0.33.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/office/tudu/default.nix b/nixpkgs/pkgs/applications/office/tudu/default.nix index 89a3d1287964..a4734f454605 100644 --- a/nixpkgs/pkgs/applications/office/tudu/default.nix +++ b/nixpkgs/pkgs/applications/office/tudu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "tudu-${version}"; + pname = "tudu"; version = "0.10.3"; src = fetchurl { - url = "https://code.meskio.net/tudu/${name}.tar.gz"; + url = "https://code.meskio.net/tudu/${pname}-${version}.tar.gz"; sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y"; }; diff --git a/nixpkgs/pkgs/applications/office/wordgrinder/default.nix b/nixpkgs/pkgs/applications/office/wordgrinder/default.nix index 4271e3d17aa2..3e4ca0ae975f 100644 --- a/nixpkgs/pkgs/applications/office/wordgrinder/default.nix +++ b/nixpkgs/pkgs/applications/office/wordgrinder/default.nix @@ -2,7 +2,7 @@ , lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { - name = "wordgrinder-${version}"; + pname = "wordgrinder"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index 4c83d67f7cda..1f21ec60ae2b 100644 --- a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -8,10 +8,11 @@ let version = "10.1.0.5672"; in stdenv.mkDerivation rec{ - name = "wpsoffice-${version}"; + pname = "wpsoffice"; + inherit version; src = fetchurl { - name = "${name}.tar.xz"; + name = "${pname}-${version}.tar.xz"; url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz"; sha256 = if bits == "x86_64" then "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else diff --git a/nixpkgs/pkgs/applications/office/zanshin/default.nix b/nixpkgs/pkgs/applications/office/zanshin/default.nix index f8785616c5e6..6f4f9c43b0ff 100644 --- a/nixpkgs/pkgs/applications/office/zanshin/default.nix +++ b/nixpkgs/pkgs/applications/office/zanshin/default.nix @@ -10,7 +10,6 @@ mkDerivation rec { pname = "zanshin"; version = "2017-11-25"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "KDE"; diff --git a/nixpkgs/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix index f4c5e604ec49..5221add8ff68 100644 --- a/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -33,7 +33,7 @@ }: stdenv.mkDerivation rec { - name = "zotero-${version}"; + pname = "zotero"; version = "5.0.73"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/radio/airspy/default.nix b/nixpkgs/pkgs/applications/radio/airspy/default.nix index 2042f1047b22..0a313c35a182 100644 --- a/nixpkgs/pkgs/applications/radio/airspy/default.nix +++ b/nixpkgs/pkgs/applications/radio/airspy/default.nix @@ -6,7 +6,8 @@ let version = "1.0.9"; in stdenv.mkDerivation { - name = "airspy-${version}"; + pname = "airspy"; + inherit version; src = fetchFromGitHub { owner = "airspy"; diff --git a/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix b/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix index 07bf0a542fa3..14badd6c55c5 100644 --- a/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/cubicsdr/default.nix @@ -2,7 +2,7 @@ pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }: stdenv.mkDerivation rec { - name = "cubicsdr-${version}"; + pname = "cubicsdr"; version = "0.2.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix index 7125e37f7f95..f718854224ce 100644 --- a/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix +++ b/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix @@ -2,7 +2,7 @@ , libusb1, systemd }: stdenv.mkDerivation rec { - name = "dmrconfig-${version}"; + pname = "dmrconfig"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/fllog/default.nix b/nixpkgs/pkgs/applications/radio/fllog/default.nix index 713755d8a654..49149a2d82a6 100644 --- a/nixpkgs/pkgs/applications/radio/fllog/default.nix +++ b/nixpkgs/pkgs/applications/radio/fllog/default.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { version = "1.2.6"; pname = "fllog"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg"; }; diff --git a/nixpkgs/pkgs/applications/radio/flwrap/default.nix b/nixpkgs/pkgs/applications/radio/flwrap/default.nix index b96f3c2b3278..6bdab0a925d3 100644 --- a/nixpkgs/pkgs/applications/radio/flwrap/default.nix +++ b/nixpkgs/pkgs/applications/radio/flwrap/default.nix @@ -8,10 +8,9 @@ stdenv.mkDerivation rec { version = "1.3.5"; pname = "flwrap"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg"; }; diff --git a/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix index 747015d80eeb..ba37b7ecad22 100644 --- a/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix @@ -19,7 +19,7 @@ }: stdenv.mkDerivation rec { - name = "gnss-sdr-${version}"; + pname = "gnss-sdr"; version = "0.0.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix index 7c6db61b5291..6b23858aee48 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/ais.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-ais-${version}"; + pname = "gr-ais"; version = "2015-12-20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index f9a50313c472..016540c1e67a 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -25,7 +25,7 @@ }: stdenv.mkDerivation rec { - name = "gnuradio-${version}"; + pname = "gnuradio"; version = "3.7.13.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix index 119b7f7600f9..80583c0ff3bb 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/gsm.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-gsm-${version}"; + pname = "gr-gsm"; version = "2016-08-25"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix index af3cabac9ef7..d56994e46ff5 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix @@ -8,7 +8,8 @@ let version = "2.0.0"; in stdenv.mkDerivation rec { - name = "gr-limesdr-${version}"; + pname = "gr-limesdr"; + inherit version; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix index c3c8721be258..d357db913447 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/nacl.nix @@ -6,7 +6,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-nacl-${version}"; + pname = "gr-nacl"; version = "2017-04-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix index df2a88033c46..b8cc60544c99 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -13,7 +13,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-osmosdr-${version}"; + pname = "gr-osmosdr"; version = "2018-08-15"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix index b56e0d226871..e4a55fe50987 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/rds.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { - name = "gr-rds-${version}"; + pname = "gr-rds"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/nixpkgs/pkgs/applications/radio/gqrx/default.nix index cd5f8b0db9e6..03acf9e11350 100644 --- a/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -8,7 +8,7 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { - name = "gqrx-${version}"; + pname = "gqrx"; version = "2.11.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/hackrf/default.nix b/nixpkgs/pkgs/applications/radio/hackrf/default.nix index 81a66bf503c0..09b4c84c1314 100644 --- a/nixpkgs/pkgs/applications/radio/hackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/hackrf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }: stdenv.mkDerivation rec { - name = "hackrf-${version}"; + pname = "hackrf"; version = "2018.01.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/radio/limesuite/default.nix b/nixpkgs/pkgs/applications/radio/limesuite/default.nix index 3ff73c4ef2ab..4e69b11efbf7 100644 --- a/nixpkgs/pkgs/applications/radio/limesuite/default.nix +++ b/nixpkgs/pkgs/applications/radio/limesuite/default.nix @@ -7,7 +7,8 @@ let version = "19.04.0"; in stdenv.mkDerivation { - name = "limesuite-${version}"; + pname = "limesuite"; + inherit version; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/nixpkgs/pkgs/applications/radio/minimodem/default.nix b/nixpkgs/pkgs/applications/radio/minimodem/default.nix index 8d179e8eed11..55cd14cf70da 100644 --- a/nixpkgs/pkgs/applications/radio/minimodem/default.nix +++ b/nixpkgs/pkgs/applications/radio/minimodem/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { version = "0.24-1"; pname = "minimodem"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "kamalmostafa"; diff --git a/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index 13755b88c658..f624359c1632 100644 --- a/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix +++ b/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix @@ -3,7 +3,8 @@ let version = "1.1.8"; in stdenv.mkDerivation { - name = "multimon-ng-${version}"; + pname = "multimon-ng"; + inherit version; src = fetchFromGitHub { owner = "EliasOenal"; diff --git a/nixpkgs/pkgs/applications/radio/qradiolink/default.nix b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix index 40a168675f67..a1c1f625bea1 100644 --- a/nixpkgs/pkgs/applications/radio/qradiolink/default.nix +++ b/nixpkgs/pkgs/applications/radio/qradiolink/default.nix @@ -8,7 +8,8 @@ let version = "0.5.0"; in stdenv.mkDerivation { - name = "qradiolink-${version}"; + pname = "qradiolink"; + inherit version; src = fetchFromGitHub { owner = "kantooon"; diff --git a/nixpkgs/pkgs/applications/radio/qsstv/default.nix b/nixpkgs/pkgs/applications/radio/qsstv/default.nix index c8401cdbf49e..db1bfbb3f89e 100644 --- a/nixpkgs/pkgs/applications/radio/qsstv/default.nix +++ b/nixpkgs/pkgs/applications/radio/qsstv/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "9.2.6"; - name = "qsstv-${version}"; + pname = "qsstv"; src = fetchurl { url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix index a4d5b2cad1e9..4e9badaa6c51 100644 --- a/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "rtl-sdr-${version}"; + pname = "rtl-sdr"; version = "0.6.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/radio/rtl_433/default.nix b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix index 88dc64471ec7..a06ac2d7a038 100644 --- a/nixpkgs/pkgs/applications/radio/rtl_433/default.nix +++ b/nixpkgs/pkgs/applications/radio/rtl_433/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "18.12"; - name = "rtl_433-${version}"; + pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; diff --git a/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix index 1d8056ca1e81..eacbe66e5e5a 100644 --- a/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyairspy/default.nix @@ -6,7 +6,8 @@ let version = "0.1.2"; in stdenv.mkDerivation { - name = "soapyairspy-${version}"; + pname = "soapyairspy"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix index 5472254b19dc..0bb05a204da7 100644 --- a/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapybladerf/default.nix @@ -6,7 +6,8 @@ let version = "0.4.1"; in stdenv.mkDerivation { - name = "soapybladerf-${version}"; + pname = "soapybladerf"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix index 2c5dd058ced3..5ab4c3363f48 100644 --- a/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix @@ -6,7 +6,8 @@ let version = "0.3.3"; in stdenv.mkDerivation { - name = "soapyhackrf-${version}"; + pname = "soapyhackrf"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/nixpkgs/pkgs/applications/radio/soapyremote/default.nix b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix index a0057978ea33..2f73403a168b 100644 --- a/nixpkgs/pkgs/applications/radio/soapyremote/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyremote/default.nix @@ -4,7 +4,8 @@ let version = "0.5.1"; in stdenv.mkDerivation { - name = "soapyremote-${version}"; + pname = "soapyremote"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix index d85fe347cd74..8bf473cb36a3 100644 --- a/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -6,7 +6,8 @@ let version = "0.3.0"; in stdenv.mkDerivation { - name = "soapyrtlsdr-${version}"; + pname = "soapyrtlsdr"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index 6754e8f2a55c..5e4a78cfbd22 100644 --- a/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -13,7 +13,8 @@ let extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; in stdenv.mkDerivation { - name = "soapysdr-${version}"; + pname = "soapysdr"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix index 6ed88e0431e3..9e910584158d 100644 --- a/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix +++ b/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix @@ -6,7 +6,8 @@ let version = "0.3.6"; in stdenv.mkDerivation { - name = "soapyuhd-${version}"; + pname = "soapyuhd"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/nixpkgs/pkgs/applications/radio/uhd/default.nix b/nixpkgs/pkgs/applications/radio/uhd/default.nix index fd0bd8d5d75f..b3ff0f51f118 100644 --- a/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -21,7 +21,8 @@ let }; in stdenv.mkDerivation { - name = "uhd-${version}"; + pname = "uhd"; + inherit version; src = fetchFromGitHub { owner = "EttusResearch"; diff --git a/nixpkgs/pkgs/applications/radio/unixcw/default.nix b/nixpkgs/pkgs/applications/radio/unixcw/default.nix index 2aeba5fb5f4a..fe31fd133e79 100644 --- a/nixpkgs/pkgs/applications/radio/unixcw/default.nix +++ b/nixpkgs/pkgs/applications/radio/unixcw/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: stdenv.mkDerivation rec { - name = "unixcw-${version}"; + pname = "unixcw"; version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz"; diff --git a/nixpkgs/pkgs/applications/radio/welle-io/default.nix b/nixpkgs/pkgs/applications/radio/welle-io/default.nix index acf0226c0db5..c6b09595c202 100644 --- a/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "welle-io-${version}"; + pname = "welle-io"; + inherit version; src = fetchFromGitHub { owner = "AlbrechtL"; diff --git a/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 3150d41ca9f6..32d89866b5ae 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper, unzip }: stdenv.mkDerivation rec { - name = "astrolabe-generator-${version}"; + pname = "astrolabe-generator"; version = "3.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index 9f65c63f7a6f..968d8769caa3 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { srcVersion = "jul19a"; version = "20190701_a"; - name = "gildas-${version}"; + pname = "gildas"; src = fetchurl { # For each new release, the upstream developers of Gildas move the diff --git a/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix index 9bacf6d90417..ff273ab8e95b 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix @@ -6,7 +6,8 @@ let version = "2.2.1"; in stdenv.mkDerivation { - name = "gpredict-${version}"; + pname = "gpredict"; + inherit version; src = fetchurl { url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/science/astronomy/openspace/default.nix b/nixpkgs/pkgs/applications/science/astronomy/openspace/default.nix index dc7c7c920a17..cfdd320d201c 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/openspace/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/openspace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; - name = "openspace-${version}"; + pname = "openspace"; src = fetchFromGitHub { owner = "OpenSpace"; diff --git a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index e3c66199f11c..ecca9141d9fb 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "stellarium-${version}"; + pname = "stellarium"; version = "0.19.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix b/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix index fef4ca1907fd..e9fc06079981 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, imake, gccmakedep, libXt, libXext }: stdenv.mkDerivation rec { - name = "xearth-${version}"; + pname = "xearth"; version = "1.1"; src = fetchurl { - url = "http://xearth.org/${name}.tar.gz"; + url = "http://xearth.org/${pname}-${version}.tar.gz"; sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c"; }; diff --git a/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix index 539d7c224463..d8ffbb74e6b0 100644 --- a/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "bcftools"; version = "1.9"; src = fetchurl { - url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg"; }; diff --git a/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix index 2cdd7fda38ef..b5bc3b622b91 100644 --- a/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}: stdenv.mkDerivation rec { - name = "bedtools-${version}"; + pname = "bedtools"; version = "2.28.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/biology/bftools/default.nix b/nixpkgs/pkgs/applications/science/biology/bftools/default.nix index 24a6e052df9e..158291049347 100644 --- a/nixpkgs/pkgs/applications/science/biology/bftools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bftools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeWrapper, fetchzip, jre }: stdenv.mkDerivation rec { - name = "bftools-${version}"; + pname = "bftools"; version = "5.9.2"; src = fetchzip { diff --git a/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix b/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix index 21e2f56bdf97..962428d67cf9 100644 --- a/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "bowtie2"; version = "2.3.5.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; diff --git a/nixpkgs/pkgs/applications/science/biology/bwa/default.nix b/nixpkgs/pkgs/applications/science/biology/bwa/default.nix index d1dbacf053fb..5e39320bf835 100644 --- a/nixpkgs/pkgs/applications/science/biology/bwa/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bwa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "bwa-${version}"; + pname = "bwa"; version = "0.7.17"; src = fetchurl { - url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2"; + url = "mirror://sourceforge/bio-bwa/${pname}-${version}.tar.bz2"; sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy"; }; diff --git a/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix b/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix index 3464e134ee85..00acc25028c0 100644 --- a/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/clustal-omega/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "clustal-omega-${version}"; + pname = "clustal-omega"; src = fetchurl { - url = "http://www.clustal.org/omega/${name}.tar.gz"; + url = "http://www.clustal.org/omega/${pname}-${version}.tar.gz"; sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6"; }; diff --git a/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix index 0e2b5d8b25fe..63d51de9930f 100644 --- a/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/dcm2niix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.0.20190410"; - name = "dcm2niix-${version}"; + pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; diff --git a/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix b/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix index 1a15dcf6197d..e1e84c9423bb 100644 --- a/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, bzip2, lzma }: stdenv.mkDerivation rec { - name = "freebayes-${version}"; + pname = "freebayes"; version = "2017-08-23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix b/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix index 9d41fed06911..824856301145 100644 --- a/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/hisat2/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, which, python, perl}: stdenv.mkDerivation rec { - name = "hisat2-${version}"; + pname = "hisat2"; version = "2.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix b/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix index e43d48db55f3..3adbaf0079ef 100644 --- a/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "hmmer-${version}"; + pname = "hmmer"; src = fetchurl { - url = "http://eddylab.org/software/hmmer/${name}.tar.gz"; + url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; sha256 = "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5"; }; diff --git a/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/nixpkgs/pkgs/applications/science/biology/igv/default.nix index 95dc2b612e22..412b55f59163 100644 --- a/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - name = "igv-${version}"; + pname = "igv"; version = "2.4.19"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/biology/itsx/default.nix b/nixpkgs/pkgs/applications/science/biology/itsx/default.nix index 0c8c7313bf2a..1ba8cdf22ba0 100644 --- a/nixpkgs/pkgs/applications/science/biology/itsx/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/itsx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.1"; - name = "itsx-${version}"; + pname = "itsx"; src = fetchurl { url = "http://microbiology.se/sw/ITSx_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix b/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix index d80ffea9a780..de93ae5d7829 100644 --- a/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/kallisto/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, cmake, hdf5, zlib }: +{ stdenv, fetchFromGitHub, autoconf, cmake, hdf5, zlib }: stdenv.mkDerivation rec { - name = "kallisto-${version}"; - version = "0.43.1"; + pname = "kallisto"; + version = "0.46.0"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "04697pf7jvy7vw126s1rn09q4iab9223jvb1nb0jn7ilwkq7pgwz"; + sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9"; }; - nativeBuildInputs = [ cmake ]; - + nativeBuildInputs = [ autoconf cmake ]; + buildInputs = [ hdf5 zlib ]; + # Parallel build fails in some cases: https://github.com/pachterlab/kallisto/issues/160 + enableParallelBuilding = false; + meta = with stdenv.lib; { - description = "kallisto is a program for quantifying abundances of transcripts from RNA-Seq data"; - homepage = https://pachterlab.github.io/kallisto; + description = "Kallisto is a program for quantifying abundances of transcripts from RNA-Seq data"; + homepage = "https://pachterlab.github.io/kallisto"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.arcadio ]; + maintainers = with maintainers; [ arcadio ]; }; } diff --git a/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix b/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix index dbbf8d39a93c..d485666f3931 100644 --- a/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "messer-slim-${version}"; + pname = "messer-slim"; src = fetchurl { url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix b/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix index 84c65feb0937..bff2bcf428b5 100644 --- a/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "minimap2"; version = "2.17"; diff --git a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index 1bdb31616e4d..717b8c3ab2f3 100644 --- a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "mosdepth-${version}"; + pname = "mosdepth"; version = "0.2.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/biology/neuron/default.nix b/nixpkgs/pkgs/applications/science/biology/neuron/default.nix index 875e98499f53..4e6d3494c721 100644 --- a/nixpkgs/pkgs/applications/science/biology/neuron/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/neuron/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "neuron-${version}"; + pname = "neuron"; version = "7.5"; nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; diff --git a/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix b/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix index 9f1cb8db43d5..6379f2c32826 100644 --- a/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/niftyreg/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "niftyreg"; version = "1.3.9"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/nifty_reg-${version}/nifty_reg-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix b/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix index e7221855503c..689d3e42c979 100644 --- a/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/niftyseg/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "niftyseg"; version = "1.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/KCL-BMEIS/NiftySeg/archive/v${version}.tar.gz"; sha256 = "11q6yldsxp3k6gfp94c0xhcan2y3finzv8lzizmrc79yps3wjkn0"; diff --git a/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/nixpkgs/pkgs/applications/science/biology/octopus/default.nix index 0a2074a06e97..9d81e08d7293 100644 --- a/nixpkgs/pkgs/applications/science/biology/octopus/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "octopus"; version = "0.6.3-beta"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "luntergroup"; diff --git a/nixpkgs/pkgs/applications/science/biology/paml/default.nix b/nixpkgs/pkgs/applications/science/biology/paml/default.nix index 68efc2030e53..161188f7ef16 100644 --- a/nixpkgs/pkgs/applications/science/biology/paml/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/paml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.9i"; - name = "paml-${version}"; + pname = "paml"; src = fetchurl { url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw"; diff --git a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index e6a5ab741d94..2a57febe8f5d 100644 --- a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre, makeWrapper}: stdenv.mkDerivation rec { - name = "picard-tools-${version}"; + pname = "picard-tools"; version = "2.20.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/biology/platypus/default.nix b/nixpkgs/pkgs/applications/science/biology/platypus/default.nix index 323ca90f0a2a..fc6cfbb158c3 100644 --- a/nixpkgs/pkgs/applications/science/biology/platypus/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/platypus/default.nix @@ -3,7 +3,7 @@ let python = python27.withPackages (ps: with ps; [ cython ]); in stdenv.mkDerivation rec { - name = "platypus-unstable-${version}"; + pname = "platypus-unstable"; version = "2018-07-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix b/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix index 2efb59f536f6..52f8f70b7796 100644 --- a/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, openblas, darwin}: stdenv.mkDerivation rec { - name = "plink-ng-${version}"; + pname = "plink-ng"; version = "1.90b3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/biology/poretools/default.nix b/nixpkgs/pkgs/applications/science/biology/poretools/default.nix index 3bb9ea06fd46..8a19ae135e87 100755 --- a/nixpkgs/pkgs/applications/science/biology/poretools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/poretools/default.nix @@ -3,7 +3,6 @@ pythonPackages.buildPythonPackage rec { pname = "poretools"; version = "unstable-2016-07-10"; - name = "${pname}-${version}"; src = fetchFromGitHub { repo = pname; diff --git a/nixpkgs/pkgs/applications/science/biology/raxml/default.nix b/nixpkgs/pkgs/applications/science/biology/raxml/default.nix index 140f70323194..d7ee54bfbcf0 100644 --- a/nixpkgs/pkgs/applications/science/biology/raxml/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/raxml/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "RAxML"; version = "8.2.12"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stamatak"; diff --git a/nixpkgs/pkgs/applications/science/biology/samtools/default.nix b/nixpkgs/pkgs/applications/science/biology/samtools/default.nix index c4b4bb522c40..dd1a53472dbc 100644 --- a/nixpkgs/pkgs/applications/science/biology/samtools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/samtools/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "samtools"; version = "1.9"; src = fetchurl { - url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8"; }; diff --git a/nixpkgs/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/nixpkgs/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index a811bc4412f2..72d125ef8b6f 100644 --- a/nixpkgs/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/nixpkgs/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "samtools"; version = "0.1.19"; src = fetchurl { - url = "mirror://sourceforge/samtools/${name}.tar.bz2"; + url = "mirror://sourceforge/samtools/${pname}-${version}.tar.bz2"; sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4"; }; diff --git a/nixpkgs/pkgs/applications/science/biology/seaview/default.nix b/nixpkgs/pkgs/applications/science/biology/seaview/default.nix index 17cf903ae49c..69dece88c276 100644 --- a/nixpkgs/pkgs/applications/science/biology/seaview/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/seaview/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.7"; - name = "seaview-${version}"; + pname = "seaview"; src = fetchurl { url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix b/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix index dc2246903349..d700ee50a9c6 100644 --- a/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre, unzip, makeWrapper}: stdenv.mkDerivation rec { - name = "snpeff-${version}"; + pname = "snpeff"; version = "4.3t"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix b/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix index 4bbd6a320035..1961c71f43bb 100644 --- a/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, zlib, ncurses}: stdenv.mkDerivation rec { - name = "somatic-sniper-${version}"; + pname = "somatic-sniper"; version = "1.0.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/biology/strelka/default.nix b/nixpkgs/pkgs/applications/science/biology/strelka/default.nix index e7f5eab8bfaf..84c90d895566 100644 --- a/nixpkgs/pkgs/applications/science/biology/strelka/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/strelka/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, zlib, python2}: stdenv.mkDerivation rec { - name = "strelka-${version}"; + pname = "strelka"; version = "2.9.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/biology/trimal/default.nix b/nixpkgs/pkgs/applications/science/biology/trimal/default.nix new file mode 100755 index 000000000000..d4e8fee7bc36 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/trimal/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "trimal"; + version = "1.4.1"; + + src = fetchFromGitHub { + repo = pname; + owner = "scapella"; + rev = "v${version}"; + sha256 = "0isc7s3514di4z953xq53ncjkbi650sh4q9yyw5aag1n9hqnh7k0"; + }; + + postUnpack = '' + sourceRoot=''${sourceRoot}/source + echo Source root reset to ''${sourceRoot} + ''; + + installPhase = '' + mkdir -p $out/bin + cp -a trimal readal statal $out/bin + ''; + + meta = with stdenv.lib; { + description = "A tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment"; + license = licenses.gpl3; + platforms = platforms.linux; + homepage = http://trimal.cgenomics.org; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/biology/varscan/default.nix b/nixpkgs/pkgs/applications/science/biology/varscan/default.nix index f685031e87e4..697a444193b1 100644 --- a/nixpkgs/pkgs/applications/science/biology/varscan/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/varscan/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre, makeWrapper}: stdenv.mkDerivation rec { - name = "varscan-${version}"; + pname = "varscan"; version = "2.4.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix b/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix index a6f52ae97b59..f6c9ad029c13 100755 --- a/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "vcftools"; version = "0.1.16"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix b/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix index 92f997900d53..12007c940b3d 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -4,7 +4,8 @@ with stdenv.lib; let version = "2.48"; in stdenv.mkDerivation { - name = "gwyddion-${version}"; + pname = "gwyddion"; + inherit version; src = fetchurl { url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz"; sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index 948aed03fe5e..391ed54dfcb4 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -3,7 +3,6 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "marvin"; version = "19.1.0"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix index 46a1d96d8d0f..87dae3b14d9e 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.2"; - name = "molden-${version}"; + pname = "molden"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix index bc6301e1fd42..487558a23c19 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -11,7 +11,8 @@ let python = python3.withPackages (ps : with ps; [ six pyparsing ]); in stdenv.mkDerivation { - name = "openmolcas-${version}"; + pname = "openmolcas"; + inherit version; src = fetchFromGitLab { owner = "Molcas"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 5e1c77e24751..ea80e9fd5ca7 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "6.4.1"; - name = "quantum-espresso-${version}"; + pname = "quantum-espresso"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix index eb17a68b8aae..a27355afdc8e 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1-b3"; - name = "siesta-${version}"; + pname = "siesta"; src = fetchurl { url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/electronics/adms/default.nix b/nixpkgs/pkgs/applications/science/electronics/adms/default.nix index 236225959f7a..8b95e73b8913 100644 --- a/nixpkgs/pkgs/applications/science/electronics/adms/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/adms/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2.3.6"; - name = "adms-${version}"; + pname = "adms"; src = fetchFromGitHub { owner = "Qucs"; diff --git a/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix index 63bc0911d251..b351c892c2cf 100644 --- a/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "alliance-${version}"; + pname = "alliance"; version = "5.1.1"; src = fetchurl { - url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${name}.tar.bz2"; + url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2"; sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1"; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix index 8f81a03044be..ff41a498ae71 100644 --- a/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: stdenv.mkDerivation rec { - name = "caneda-${version}"; + pname = "caneda"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix index 55e8a7b4ffe9..d188365db1dc 100644 --- a/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix @@ -4,7 +4,7 @@ libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl }: stdenv.mkDerivation rec { - name = "dsview-${version}"; + pname = "dsview"; version = "0.99"; diff --git a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index c42b70c041af..8aa8275510c9 100644 --- a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -6,7 +6,7 @@ systemd, alsaLib, dsview stdenv.mkDerivation rec { inherit (dsview) version src; - name = "libsigrok4dsl-${version}"; + pname = "libsigrok4dsl"; postUnpack = '' export sourceRoot=$sourceRoot/libsigrok4DSL diff --git a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index 214f77663434..12d375cf88aa 100644 --- a/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/nixpkgs/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -5,7 +5,7 @@ glib, check, python3, dsview stdenv.mkDerivation rec { inherit (dsview) version src; - name = "libsigrokdecode4dsl-${version}"; + pname = "libsigrokdecode4dsl"; postUnpack = '' export sourceRoot=$sourceRoot/libsigrokdecode4DSL diff --git a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index ba1b9e174bea..3168fc19d055 100644 --- a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -12,7 +12,7 @@ let ]; in stdenv.mkDerivation rec { - name = "eagle-${version}"; + pname = "eagle"; version = "9.4.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix index 69b111562ab2..a9528b05a311 100644 --- a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { - name = "eagle-${version}"; + pname = "eagle"; version = "7.7.0"; src = diff --git a/nixpkgs/pkgs/applications/science/electronics/fped/default.nix b/nixpkgs/pkgs/applications/science/electronics/fped/default.nix index e6e7219ff871..a3b2945ac3d9 100644 --- a/nixpkgs/pkgs/applications/science/electronics/fped/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/fped/default.nix @@ -5,7 +5,7 @@ with lib; stdenv.mkDerivation rec { - name = "fped-${version}"; + pname = "fped"; version = "unstable-2017-05-11"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix index ab5088543102..127e9c05624d 100644 --- a/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "fritzing-${version}"; + pname = "fritzing"; version = "0.9.3b"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/electronics/geda/default.nix b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix index 93fe7b6ba77a..71101d7cd74a 100644 --- a/nixpkgs/pkgs/applications/science/electronics/geda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation rec { - name = "geda-${version}"; + pname = "geda"; version = "1.8.2-20130925"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix b/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix index c0821c8a9ab9..3f61a13eab8c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation rec { - name = "gerbv-${version}"; + pname = "gerbv"; version = "2015-10-08"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index 4830e2a032a9..8dffe580cc65 100644 --- a/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-${version}"; + pname = "gtkwave"; version = "3.3.101"; src = fetchurl { - url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; + url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz"; sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz"; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 6608661364a0..6f0d8e51448f 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -26,7 +26,7 @@ let } // attrs); in stdenv.mkDerivation rec { - name = "kicad-${version}"; + pname = "kicad"; series = "5.0"; version = "5.1.2"; diff --git a/nixpkgs/pkgs/applications/science/electronics/kicad/unstable.nix b/nixpkgs/pkgs/applications/science/electronics/kicad/unstable.nix index a9a4c32a0b45..7475170d6a72 100644 --- a/nixpkgs/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/nixpkgs/pkgs/applications/science/electronics/kicad/unstable.nix @@ -11,7 +11,7 @@ assert ngspiceSupport -> libngspice != null; with lib; stdenv.mkDerivation rec { - name = "kicad-unstable-${version}"; + pname = "kicad-unstable"; version = "2018-06-12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index 277574ce2f17..110552d1d645 100644 --- a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qttools, qmake }: stdenv.mkDerivation rec { - name = "librepcb-${version}"; + pname = "librepcb"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix b/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix index 194804a21a67..78240a40baca 100644 --- a/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix @@ -2,7 +2,7 @@ , readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }: stdenv.mkDerivation rec { - name = "ngspice-${version}"; + pname = "ngspice"; version = "30"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix index b9bbcd695f17..7514aed9f243 100644 --- a/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/pcb/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pcb-${version}"; + pname = "pcb"; version = "20140316"; src = fetchurl { - url = "http://ftp.geda-project.org/pcb/pcb-20140316/${name}.tar.gz"; + url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz"; sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix b/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix index 1a5fbf90d10b..1bfe6df5ff53 100644 --- a/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.0.19"; - name = "qucs-${version}"; + pname = "qucs"; src = fetchFromGitHub { owner = "Qucs"; diff --git a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index b531563c5c1c..9a9899192505 100644 --- a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, flex, bison }: stdenv.mkDerivation rec { - name = "verilator-${version}"; + pname = "verilator"; version = "4.016"; src = fetchurl { - url = "https://www.veripool.org/ftp/${name}.tgz"; + url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij"; }; diff --git a/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix b/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix index e233b91bbc91..e8ae4d01a6d6 100644 --- a/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix +++ b/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix @@ -2,13 +2,13 @@ , intltool, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "drgeo-${version}"; + pname = "drgeo"; version = "1.1.0"; hardeningDisable = [ "format" ]; src = fetchurl { - url = "mirror://sourceforge/ofset/${name}.tar.gz"; + url = "mirror://sourceforge/ofset/${pname}-${version}.tar.gz"; sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc"; }; patches = [ ./struct.patch ]; diff --git a/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix b/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix index b655cc48c731..7be0103304a4 100644 --- a/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix +++ b/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix @@ -2,7 +2,8 @@ let version = "1.5.0"; in stdenv.mkDerivation { - name = "tetgen-${version}"; + pname = "tetgen"; + inherit version; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/logic/abc/default.nix b/nixpkgs/pkgs/applications/science/logic/abc/default.nix index 6e7a3cfc88ac..fd50fc825a06 100644 --- a/nixpkgs/pkgs/applications/science/logic/abc/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/abc/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, readline, cmake }: stdenv.mkDerivation rec { - name = "abc-verifier-${version}"; + pname = "abc-verifier"; version = "2018-07-08"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/abella/default.nix b/nixpkgs/pkgs/applications/science/logic/abella/default.nix index bc23454edfc7..7078fd454a0a 100644 --- a/nixpkgs/pkgs/applications/science/logic/abella/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/abella/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, rsync, ocamlPackages }: stdenv.mkDerivation rec { - name = "abella-${version}"; + pname = "abella"; version = "2.0.6"; src = fetchurl { - url = "http://abella-prover.org/distributions/${name}.tar.gz"; + url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz"; sha256 = "164q9gngckg6q69k13lwx2pq3cnc9ckw1qi8dnpxqfjgwfqr7xyi"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/aiger/default.nix b/nixpkgs/pkgs/applications/science/logic/aiger/default.nix index 03524fc6b222..10d94e2bb8c7 100644 --- a/nixpkgs/pkgs/applications/science/logic/aiger/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/aiger/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, picosat }: stdenv.mkDerivation rec { - name = "aiger-${version}"; + pname = "aiger"; version = "1.9.9"; src = fetchurl { - url = "http://fmv.jku.at/aiger/${name}.tar.gz"; + url = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz"; sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index 234b74749977..f83480cfbafc 100644 --- a/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, which, dune, ocamlPackages }: stdenv.mkDerivation rec { - name = "alt-ergo-${version}"; + pname = "alt-ergo"; version = "2.3.0"; src = fetchurl { - url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; - name = "${name}.tar.gz"; + url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/avy/default.nix b/nixpkgs/pkgs/applications/science/logic/avy/default.nix index 6c2d2f0a062f..668fd9fea72d 100644 --- a/nixpkgs/pkgs/applications/science/logic/avy/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/avy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, zlib, boost }: stdenv.mkDerivation rec { - name = "avy-${version}"; + pname = "avy"; version = "2017.10.16"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/science/logic/boolector/default.nix b/nixpkgs/pkgs/applications/science/logic/boolector/default.nix index 8e0ad22bba18..f1f74bcb5810 100644 --- a/nixpkgs/pkgs/applications/science/logic/boolector/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/boolector/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boolector-${version}"; + pname = "boolector"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix b/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix index ed3d9e638121..9d6c866faea3 100644 --- a/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "btor2tools-${version}"; + pname = "btor2tools"; version = "pre55_8c150b39"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix index ae57724e4f88..e2f48b340292 100644 --- a/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix +++ b/nixpkgs/pkgs/applications/science/logic/clprover/clprover.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "clprover-${version}"; + pname = "clprover"; version = "1.0.3"; src = fetchzip { diff --git a/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 10fe722d7e9a..dfe1277d5ac9 100644 --- a/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -39,7 +39,8 @@ let substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; self = stdenv.mkDerivation { - name = "coq-${version}"; + pname = "coq"; + inherit version; passthru = { inherit coq-version; diff --git a/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix b/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix index d76462ca9380..bebf81b030d6 100644 --- a/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "coq2html-${version}"; + pname = "coq2html"; + inherit version; src = fetchgit { url = "https://github.com/xavierleroy/coq2html"; diff --git a/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix b/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix index c9516a135c06..b4c4cb7c047d 100644 --- a/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python3, xxd, boost }: stdenv.mkDerivation rec { - name = "cryptominisat-${version}"; + pname = "cryptominisat"; version = "5.6.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix b/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix index 09801f54e7ee..6877060d36d6 100644 --- a/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "cryptoverif-${version}"; + pname = "cryptoverif"; version = "2.01pl1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/cubicle/default.nix b/nixpkgs/pkgs/applications/science/logic/cubicle/default.nix index 91eaaeeb0e40..cd41e1ca64b9 100644 --- a/nixpkgs/pkgs/applications/science/logic/cubicle/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cubicle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "cubicle-${version}"; + pname = "cubicle"; version = "1.1.2"; src = fetchurl { url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix b/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix index 703ce6fd5086..dfb04ad90e92 100644 --- a/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, gmp, perl }: stdenv.mkDerivation rec { - name = "cvc3-${version}"; + pname = "cvc3"; version = "2.4.1"; src = fetchurl { - url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz"; + url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix b/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix index cddcbef7a035..c0c7a53ebd44 100644 --- a/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "cvc4-${version}"; + pname = "cvc4"; version = "1.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/eprover/default.nix b/nixpkgs/pkgs/applications/science/logic/eprover/default.nix index dab509706a82..1f6fced22335 100644 --- a/nixpkgs/pkgs/applications/science/logic/eprover/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/eprover/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which }: stdenv.mkDerivation rec { - name = "eprover-${version}"; + pname = "eprover"; version = "2.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/glucose/default.nix b/nixpkgs/pkgs/applications/science/logic/glucose/default.nix index bc8d372ce42c..0a8fad484da7 100644 --- a/nixpkgs/pkgs/applications/science/logic/glucose/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/glucose/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "glucose-${version}"; + pname = "glucose"; version = "4.1"; src = fetchurl { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { makeFlags = [ "r" ]; installPhase = '' install -Dm0755 glucose_release $out/bin/glucose - mkdir -p "$out/share/doc/${name}/" - install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/" + mkdir -p "$out/share/doc/${pname}-${version}/" + install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/science/logic/glucose/syrup.nix b/nixpkgs/pkgs/applications/science/logic/glucose/syrup.nix index 30af3216737c..816f8504a52e 100644 --- a/nixpkgs/pkgs/applications/science/logic/glucose/syrup.nix +++ b/nixpkgs/pkgs/applications/science/logic/glucose/syrup.nix @@ -1,6 +1,6 @@ { stdenv, zlib, glucose }: stdenv.mkDerivation rec { - name = "glucose-syrup-${version}"; + pname = "glucose-syrup"; version = glucose.version; src = glucose.src; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { makeFlags = [ "r" ]; installPhase = '' install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup - mkdir -p "$out/share/doc/${name}/" - install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/" + mkdir -p "$out/share/doc/${pname}-${version}/" + install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/science/logic/iprover/default.nix b/nixpkgs/pkgs/applications/science/logic/iprover/default.nix index 46b29e3dd271..85fe52239ad9 100644 --- a/nixpkgs/pkgs/applications/science/logic/iprover/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/iprover/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, eprover, zlib }: stdenv.mkDerivation rec { - name = "iprover-${version}"; + pname = "iprover"; version = "2018_Jul_24_11h"; src = fetchurl { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp iproveropt "$out/bin" - mkdir -p "$out/share/${name}" - cp *.p "$out/share/${name}" + mkdir -p "$out/share/${pname}-${version}" + cp *.p "$out/share/${pname}-${version}" echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover ''; diff --git a/nixpkgs/pkgs/applications/science/logic/jonprl/default.nix b/nixpkgs/pkgs/applications/science/logic/jonprl/default.nix index a95d1201cbd6..61ca78d85ed1 100644 --- a/nixpkgs/pkgs/applications/science/logic/jonprl/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/jonprl/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, smlnj, which }: stdenv.mkDerivation rec { - name = "jonprl-${version}"; + pname = "jonprl"; version = "0.1.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/science/logic/lci/default.nix b/nixpkgs/pkgs/applications/science/logic/lci/default.nix index d7f047b84e0f..4775384a3ddc 100644 --- a/nixpkgs/pkgs/applications/science/logic/lci/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lci/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, readline}: stdenv.mkDerivation rec { version = "0.6"; - name = "lci-${version}"; + pname = "lci"; src = fetchurl { - url = "mirror://sourceforge/lci/${name}.tar.gz"; + url = "mirror://sourceforge/lci/${pname}-${version}.tar.gz"; sha256="204f1ca5e2f56247d71ab320246811c220ed511bf08c9cb7f305cf180a93948e"; }; buildInputs = [readline]; diff --git a/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 407244ef1830..9bf54a5f0940 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gmp }: stdenv.mkDerivation rec { - name = "lean-${version}"; + pname = "lean"; version = "3.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/lean2/default.nix b/nixpkgs/pkgs/applications/science/logic/lean2/default.nix index 4e1415d3961d..22177798647b 100644 --- a/nixpkgs/pkgs/applications/science/logic/lean2/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lean2/default.nix @@ -2,7 +2,7 @@ , gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { - name = "lean2-${version}"; + pname = "lean2"; version = "2017-07-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/leo2/default.nix b/nixpkgs/pkgs/applications/science/logic/leo2/default.nix index be337a1c258e..b50848a18205 100644 --- a/nixpkgs/pkgs/applications/science/logic/leo2/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/leo2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: stdenv.mkDerivation rec { - name = "leo2-${version}"; + pname = "leo2"; version = "1.6.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix b/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix index 000587a22e67..dbd34f1da6e6 100644 --- a/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/lingeling/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "lingeling-${version}"; + pname = "lingeling"; # This is the version used in satcomp2018, which was # relicensed, and also known as version 'bcj' version = "pre1_03b4860d"; diff --git a/nixpkgs/pkgs/applications/science/logic/logisim/default.nix b/nixpkgs/pkgs/applications/science/logic/logisim/default.nix index db784237ea91..d6a1207b5d60 100644 --- a/nixpkgs/pkgs/applications/science/logic/logisim/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/logisim/default.nix @@ -3,7 +3,8 @@ let version = "2.7.1"; in stdenv.mkDerivation { - name = "logisim-${version}"; + pname = "logisim"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; diff --git a/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix b/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix index c77e0327fb6b..02e9844115ef 100644 --- a/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ltl2ba-${version}"; + pname = "ltl2ba"; version = "1.2"; src = fetchurl { - url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz"; + url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz"; sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix b/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix index dc32e84279a8..93212c5b8546 100644 --- a/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "201707"; build_nr = "1"; - name = "mcrl2-${version}"; + pname = "mcrl2"; src = fetchurl { url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix b/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix index 1601a74e1899..7e46dbeb0743 100644 --- a/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl, mlton }: stdenv.mkDerivation rec { - name = "metis-prover-${version}"; + pname = "metis-prover"; version = "2.3.20160713"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/minisat/default.nix b/nixpkgs/pkgs/applications/science/logic/minisat/default.nix index 4b2116680d50..34051a1da404 100644 --- a/nixpkgs/pkgs/applications/science/logic/minisat/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/minisat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "minisat-${version}"; + pname = "minisat"; version = "2.2.0"; src = fetchurl { - url = "http://minisat.se/downloads/${name}.tar.gz"; + url = "http://minisat.se/downloads/${pname}-${version}.tar.gz"; sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix index f9f021b15f07..9e5ebe008b8f 100644 --- a/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "opensmt-${version}"; + pname = "opensmt"; version = "20101017"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/ott/default.nix b/nixpkgs/pkgs/applications/science/logic/ott/default.nix index d21487ef92fa..40c66dd699d8 100644 --- a/nixpkgs/pkgs/applications/science/logic/ott/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/ott/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, ocaml }: stdenv.mkDerivation rec { - name = "ott-${version}"; + pname = "ott"; version = "0.28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/picosat/default.nix b/nixpkgs/pkgs/applications/science/logic/picosat/default.nix index 638996e853b8..547bd31e8b42 100644 --- a/nixpkgs/pkgs/applications/science/logic/picosat/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/picosat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "picosat-${version}"; + pname = "picosat"; version = "965"; src = fetchurl { - url = "http://fmv.jku.at/picosat/${name}.tar.gz"; + url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz"; sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/poly/default.nix b/nixpkgs/pkgs/applications/science/logic/poly/default.nix index 2f765572f9ad..c833b22e49b6 100644 --- a/nixpkgs/pkgs/applications/science/logic/poly/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/poly/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, gmp, cmake, python}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libpoly"; version = "0.1.7"; diff --git a/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix index 4abfdf9162c0..2b368a0e6730 100644 --- a/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix +++ b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,7 +1,6 @@ { stdenv, fetchzip, cmake }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clingo"; version = "5.3.0"; diff --git a/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix b/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix index 1f6620a2872d..d4feb5c9e285 100644 --- a/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/prooftree/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: stdenv.mkDerivation rec { - name = "prooftree-${version}"; + pname = "prooftree"; version = "0.13"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/nixpkgs/pkgs/applications/science/logic/proverif/default.nix index aca06ffbfb76..931ad2fc4f39 100644 --- a/nixpkgs/pkgs/applications/science/logic/proverif/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/proverif/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "proverif-${version}"; + pname = "proverif"; version = "2.00"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/satallax/default.nix b/nixpkgs/pkgs/applications/science/logic/satallax/default.nix index b9dd90f601f5..7249eb991d38 100644 --- a/nixpkgs/pkgs/applications/science/logic/satallax/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/satallax/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: stdenv.mkDerivation rec { - name = "satallax-${version}"; + pname = "satallax"; version = "2.7"; buildInputs = [ocaml zlib which eprover makeWrapper coq]; src = fetchurl { - url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; + url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix index 32ebdad51d94..3f8305ff4030 100644 --- a/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/saw-tools/default.nix @@ -23,7 +23,7 @@ let }; in stdenv.mkDerivation rec { - name = "saw-tools-${version}"; + pname = "saw-tools"; version = "0.1.1-20150731"; src = saw-bin; diff --git a/nixpkgs/pkgs/applications/science/logic/spass/default.nix b/nixpkgs/pkgs/applications/science/logic/spass/default.nix index 2bb2b911d491..2645aa102d92 100644 --- a/nixpkgs/pkgs/applications/science/logic/spass/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/spass/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "spass-${version}"; + pname = "spass"; version = "${baseVersion}.${minorVersion}"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/statverif/default.nix b/nixpkgs/pkgs/applications/science/logic/statverif/default.nix index 9676b991679c..e0efb28819d2 100644 --- a/nixpkgs/pkgs/applications/science/logic/statverif/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/statverif/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "statverif-${version}"; + pname = "statverif"; version = "1.86pl4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index 58674a4cacf2..29eb8026366b 100644 --- a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/sby \ --replace "##yosys-sys-path##" \ "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" + substituteInPlace $out/share/yosys/python3/sby_core.py \ + --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' ''; meta = { description = "Tooling for Yosys-based verification flows"; diff --git a/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix b/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix index b1eb171b20b1..b1c72d7c5ee7 100644 --- a/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "tlaplus-${version}"; + pname = "tlaplus"; version = "1.5.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix b/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix index 7d35f5f91df3..7c8389688d95 100644 --- a/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "tlaps-${version}"; + pname = "tlaps"; version = "1.4.3"; src = fetchurl { url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index 7d39aae6e3ce..91666e85d923 100644 --- a/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "tla-toolbox-${version}"; + pname = "tla-toolbox"; + inherit version; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm"; diff --git a/nixpkgs/pkgs/applications/science/logic/tptp/default.nix b/nixpkgs/pkgs/applications/science/logic/tptp/default.nix index 7f68a8e647e9..4c63f8e72a36 100644 --- a/nixpkgs/pkgs/applications/science/logic/tptp/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/tptp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, yap, tcsh, perl, patchelf }: stdenv.mkDerivation rec { - name = "TPTP-${version}"; + pname = "TPTP"; version = "7.2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/twelf/default.nix b/nixpkgs/pkgs/applications/science/logic/twelf/default.nix index 74f8875fcebe..161da6e4b235 100644 --- a/nixpkgs/pkgs/applications/science/logic/twelf/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/twelf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, smlnj, rsync }: stdenv.mkDerivation rec { - name = "twelf-${version}"; + pname = "twelf"; version = "1.7.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/verifast/default.nix b/nixpkgs/pkgs/applications/science/logic/verifast/default.nix index 360f75cc6f07..3e3e26708618 100644 --- a/nixpkgs/pkgs/applications/science/logic/verifast/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/verifast/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { - name = "verifast-${version}"; + pname = "verifast"; version = "18.02"; src = fetchurl { - url = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz"; + url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/verit/default.nix b/nixpkgs/pkgs/applications/science/logic/verit/default.nix index ca3673d7bf97..a04ab46c669b 100644 --- a/nixpkgs/pkgs/applications/science/logic/verit/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/verit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: stdenv.mkDerivation rec { - name = "veriT-${version}"; + pname = "veriT"; version = "2016"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/nixpkgs/pkgs/applications/science/logic/why3/default.nix index bd538dc6c757..3cb14d7da21e 100644 --- a/nixpkgs/pkgs/applications/science/logic/why3/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/why3/default.nix @@ -2,7 +2,7 @@ , ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation rec { - name = "why3-${version}"; + pname = "why3"; version = "1.2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix index 313fe5a9f1dd..2f972c92b521 100644 --- a/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "workcraft-${version}"; + pname = "workcraft"; version = "3.1.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/logic/yices/default.nix b/nixpkgs/pkgs/applications/science/logic/yices/default.nix index 40a4c391e1d5..76ed934fb39e 100644 --- a/nixpkgs/pkgs/applications/science/logic/yices/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/yices/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }: stdenv.mkDerivation rec { - name = "yices-${version}"; + pname = "yices"; version = "2.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix index c0536b36cfe3..7bcc915daec9 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -15,7 +15,7 @@ else assert licenseAccepted; let maps = callPackage ./maps.nix {}; in stdenv.mkDerivation rec { version = "4.7.1"; - name = "sc2-headless-${version}"; + pname = "sc2-headless"; src = fetchurl { url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip"; diff --git a/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix index 8de78092bd84..be15bba979ff 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix @@ -16,7 +16,6 @@ assert opencvSupport -> opencv != null; stdenv.mkDerivation rec { pname = "shogun"; version = "6.0.0"; - name = pname + "-" + version; src = fetchFromGitHub { owner = pname + "-toolbox"; diff --git a/nixpkgs/pkgs/applications/science/math/LiE/default.nix b/nixpkgs/pkgs/applications/science/math/LiE/default.nix index e0b0bc11f05f..6909cfd8ef65 100644 --- a/nixpkgs/pkgs/applications/science/math/LiE/default.nix +++ b/nixpkgs/pkgs/applications/science/math/LiE/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.2"; # The current version of LiE is 2.2.2, which is more or less unchanged # since about the year 2000. Minor bugfixes do get applied now and then. - name = "lie-${version}"; + pname = "lie"; meta = { description = "A Computer algebra package for Lie group computations"; diff --git a/nixpkgs/pkgs/applications/science/math/bcal/default.nix b/nixpkgs/pkgs/applications/science/math/bcal/default.nix index 61eb1fd3ce4e..74adcab4e705 100644 --- a/nixpkgs/pkgs/applications/science/math/bcal/default.nix +++ b/nixpkgs/pkgs/applications/science/math/bcal/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bcal-${version}"; + pname = "bcal"; version = "1.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/math/bliss/default.nix b/nixpkgs/pkgs/applications/science/math/bliss/default.nix index 1b7a97360079..37504fceb141 100644 --- a/nixpkgs/pkgs/applications/science/math/bliss/default.nix +++ b/nixpkgs/pkgs/applications/science/math/bliss/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, doxygen }: stdenv.mkDerivation rec { - name = "bliss-${version}"; + pname = "bliss"; version = "0.73"; src = fetchurl { - url = "http://www.tcs.hut.fi/Software/bliss/${name}.zip"; + url = "http://www.tcs.hut.fi/Software/bliss/${pname}-${version}.zip"; sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84"; }; diff --git a/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/nixpkgs/pkgs/applications/science/math/caffe/default.nix index e8171bcb256a..5068abbf3076 100644 --- a/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -36,7 +36,7 @@ let in stdenv.mkDerivation rec { - name = "caffe-${version}"; + pname = "caffe"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/math/calc/default.nix b/nixpkgs/pkgs/applications/science/math/calc/default.nix index 348c1e750867..0d149eca3b63 100644 --- a/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -2,13 +2,13 @@ , enableReadline ? true, readline, ncurses }: stdenv.mkDerivation rec { - name = "calc-${version}"; + pname = "calc"; version = "2.12.7.2"; src = fetchurl { urls = [ - "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2" - "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2" + "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" + "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp"; }; diff --git a/nixpkgs/pkgs/applications/science/math/clp/default.nix b/nixpkgs/pkgs/applications/science/math/clp/default.nix index 0beee1eb2915..0eb57c756927 100644 --- a/nixpkgs/pkgs/applications/science/math/clp/default.nix +++ b/nixpkgs/pkgs/applications/science/math/clp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.17.2"; - name = "clp-${version}"; + pname = "clp"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz"; diff --git a/nixpkgs/pkgs/applications/science/math/cntk/default.nix b/nixpkgs/pkgs/applications/science/math/cntk/default.nix index 465c7318c0e3..c20a6954c3cb 100644 --- a/nixpkgs/pkgs/applications/science/math/cntk/default.nix +++ b/nixpkgs/pkgs/applications/science/math/cntk/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - name = "CNTK-${version}"; + pname = "CNTK"; version = "2.7"; # Submodules diff --git a/nixpkgs/pkgs/applications/science/math/colpack/default.nix b/nixpkgs/pkgs/applications/science/math/colpack/default.nix index 94e0a44226d4..13a75ce4db2d 100644 --- a/nixpkgs/pkgs/applications/science/math/colpack/default.nix +++ b/nixpkgs/pkgs/applications/science/math/colpack/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "ColPack"; version = "1.0.10"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "CSCsw"; diff --git a/nixpkgs/pkgs/applications/science/math/cplex/default.nix b/nixpkgs/pkgs/applications/science/math/cplex/default.nix index a14839d3eccc..ec13f5252f13 100644 --- a/nixpkgs/pkgs/applications/science/math/cplex/default.nix +++ b/nixpkgs/pkgs/applications/science/math/cplex/default.nix @@ -8,7 +8,7 @@ # different for every user. stdenv.mkDerivation rec { - name = "cplex-${version}"; + pname = "cplex"; version = "128"; src = diff --git a/nixpkgs/pkgs/applications/science/math/form/default.nix b/nixpkgs/pkgs/applications/science/math/form/default.nix index 23ab2184266a..eb42315f015b 100644 --- a/nixpkgs/pkgs/applications/science/math/form/default.nix +++ b/nixpkgs/pkgs/applications/science/math/form/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.2.1"; - name = "form-${version}"; + pname = "form"; # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/math/geogebra/default.nix b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix index 3232d08aa339..8f38a24f40d1 100644 --- a/nixpkgs/pkgs/applications/science/math/geogebra/default.nix +++ b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }: stdenv.mkDerivation rec { - name = "geogebra-${version}"; + pname = "geogebra"; version = "5-0-535-0"; preferLocalBuild = true; diff --git a/nixpkgs/pkgs/applications/science/math/getdp/default.nix b/nixpkgs/pkgs/applications/science/math/getdp/default.nix index 74e4b052fdb5..3ccd89cf2c13 100644 --- a/nixpkgs/pkgs/applications/science/math/getdp/default.nix +++ b/nixpkgs/pkgs/applications/science/math/getdp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }: stdenv.mkDerivation rec { - name = "getdp-${version}"; + pname = "getdp"; version = "3.0.4"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; diff --git a/nixpkgs/pkgs/applications/science/math/gfan/default.nix b/nixpkgs/pkgs/applications/science/math/gfan/default.nix index d2d1ddb65846..33b003b2b562 100644 --- a/nixpkgs/pkgs/applications/science/math/gfan/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gfan/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, gmp, mpir, cddlib}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "gfan"; version = "0.6.2"; diff --git a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix index ee9bdcc6f1b0..4ac7c411c2dc 100644 --- a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix @@ -3,7 +3,7 @@ let majorVersion = "8.1"; in stdenv.mkDerivation rec { - name = "gurobi-${version}"; + pname = "gurobi"; version = "${majorVersion}.0"; src = with stdenv.lib; fetchurl { diff --git a/nixpkgs/pkgs/applications/science/math/hmetis/default.nix b/nixpkgs/pkgs/applications/science/math/hmetis/default.nix index 9eab9ca39992..45a13d028894 100644 --- a/nixpkgs/pkgs/applications/science/math/hmetis/default.nix +++ b/nixpkgs/pkgs/applications/science/math/hmetis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ghostscript }: stdenv.mkDerivation rec { - name = "hmetis-${version}"; + pname = "hmetis"; version = "1.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix b/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix index 0cf834c8cdea..f39c6a04d190 100644 --- a/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix +++ b/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "lp_solve-${version}"; + pname = "lp_solve"; version = "5.5.2.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix b/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix index 9e02b08c8ad0..eecb37dd743f 100644 --- a/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.2"; pname = "lrcalc"; - name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "asbuch"; diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/10.nix b/nixpkgs/pkgs/applications/science/math/mathematica/10.nix index c6802c3719e9..4204b1399137 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/10.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/10.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { version = "10.0.2"; - name = "mathematica-${version}"; + pname = "mathematica"; src = requireFile rec { name = "Mathematica_${version}_LINUX.sh"; diff --git a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix index e2e4ba63b07e..bd4725ce73c6 100644 --- a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix +++ b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix @@ -7,7 +7,7 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { - name = "mxnet-${version}"; + pname = "mxnet"; version = "1.4.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/nixpkgs/pkgs/applications/science/math/nauty/default.nix index 226e13c004d7..c86354234e3f 100644 --- a/nixpkgs/pkgs/applications/science/math/nauty/default.nix +++ b/nixpkgs/pkgs/applications/science/math/nauty/default.nix @@ -3,7 +3,7 @@ , fetchurl }: stdenv.mkDerivation rec { - name = "nauty-${version}"; + pname = "nauty"; version = "26r11"; src = fetchurl { url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/math/pari/default.nix b/nixpkgs/pkgs/applications/science/math/pari/default.nix index 72827112c50c..89ae354e7c76 100644 --- a/nixpkgs/pkgs/applications/science/math/pari/default.nix +++ b/nixpkgs/pkgs/applications/science/math/pari/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , gmp , readline , libX11 @@ -13,25 +12,13 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.11.1"; + version = "2.11.2"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"; - sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94"; + sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa"; }; - patches = [ - # Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream) - # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117 - # https://trac.sagemath.org/ticket/27335 - (fetchpatch { - name = "fix-off-by-one-error.patch"; - # only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985 - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5"; - sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6"; - }) - ]; - buildInputs = [ gmp readline diff --git a/nixpkgs/pkgs/applications/science/math/pari/gp2c.nix b/nixpkgs/pkgs/applications/science/math/pari/gp2c.nix index 86bd2e843678..e743c8ae95b6 100644 --- a/nixpkgs/pkgs/applications/science/math/pari/gp2c.nix +++ b/nixpkgs/pkgs/applications/science/math/pari/gp2c.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { - name = "gp2c-${version}"; + pname = "gp2c"; version = "0.0.11pl2"; src = fetchurl { - url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g"; }; diff --git a/nixpkgs/pkgs/applications/science/math/pcalc/default.nix b/nixpkgs/pkgs/applications/science/math/pcalc/default.nix index 3e7d9898a656..167ab9275faf 100644 --- a/nixpkgs/pkgs/applications/science/math/pcalc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/pcalc/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pcalc-${version}"; + pname = "pcalc"; version = "20141224"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/science/math/polymake/default.nix b/nixpkgs/pkgs/applications/science/math/polymake/default.nix index 4fba231f094d..fdc4de7b0286 100644 --- a/nixpkgs/pkgs/applications/science/math/polymake/default.nix +++ b/nixpkgs/pkgs/applications/science/math/polymake/default.nix @@ -7,7 +7,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "polymake"; version = "3.2.rc4"; diff --git a/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix b/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix index 2dd4778234df..71d16fb626cd 100644 --- a/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix +++ b/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, gmp }: stdenv.mkDerivation rec { - name = "ratpoints-${version}"; + pname = "ratpoints"; version = "2.1.3.p4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/math/ripser/default.nix b/nixpkgs/pkgs/applications/science/math/ripser/default.nix index 5e0b7fc300ba..a42a5b710ce0 100644 --- a/nixpkgs/pkgs/applications/science/math/ripser/default.nix +++ b/nixpkgs/pkgs/applications/science/math/ripser/default.nix @@ -17,7 +17,8 @@ let version = "1.0"; in stdenv.mkDerivation { - name = "ripser-${version}"; + pname = "ripser"; + inherit version; src = fetchFromGitHub { owner = "Ripser"; diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix index 0cd5b5d976a1..856d604d7518 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix @@ -25,7 +25,7 @@ let in stdenv.mkDerivation rec { version = src.version; - name = "sage-tests-${version}"; + pname = "sage-tests"; inherit src; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix index e4b1aeae016a..524085e8c012 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-with-env.nix @@ -87,7 +87,7 @@ let in stdenv.mkDerivation rec { version = src.version; - name = "sage-with-env-${version}"; + pname = "sage-with-env"; src = sage-env.lib.src; inherit buildInputs; diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage.nix b/nixpkgs/pkgs/applications/science/math/sage/sage.nix index f6dc21d00184..4fa8ae6270ba 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = src.version; - name = "sage-${version}"; + pname = "sage"; src = sage-with-env.env.lib.src; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix b/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix index 91c880673a12..bf618fe64f45 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sagedoc.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = src.version; - name = "sagedoc-${version}"; + pname = "sagedoc"; src = sage-with-env.env.lib.src; diff --git a/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix index 1040d6d4ba15..6eac84aaa865 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { format = "other"; version = src.version; - name = "sagelib-${version}"; + pname = "sagelib"; src = sage-src; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/math/scilab/default.nix b/nixpkgs/pkgs/applications/science/math/scilab/default.nix index 01fb58403cad..432280a18fb2 100644 --- a/nixpkgs/pkgs/applications/science/math/scilab/default.nix +++ b/nixpkgs/pkgs/applications/science/math/scilab/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { version = "4.1.2"; - name = "scilab-${version}"; + pname = "scilab"; src = fetchurl { - url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz"; + url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz"; sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; diff --git a/nixpkgs/pkgs/applications/science/math/scotch/default.nix b/nixpkgs/pkgs/applications/science/math/scotch/default.nix index 8fa020ba07c9..610f1ef05c0f 100644 --- a/nixpkgs/pkgs/applications/science/math/scotch/default.nix +++ b/nixpkgs/pkgs/applications/science/math/scotch/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.0.4"; - name = "scotch-${version}"; + pname = "scotch"; src_name = "scotch_${version}"; buildInputs = [ bison openmpi flex zlib ]; diff --git a/nixpkgs/pkgs/applications/science/math/singular/default.nix b/nixpkgs/pkgs/applications/science/math/singular/default.nix index 24063216db04..ccb139203acb 100644 --- a/nixpkgs/pkgs/applications/science/math/singular/default.nix +++ b/nixpkgs/pkgs/applications/science/math/singular/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "singular-${version}"; + pname = "singular"; version = "4.1.1p2"; src = let diff --git a/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix b/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix index d36b135531c2..67561658eb25 100644 --- a/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix +++ b/nixpkgs/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchgit, cmake, qtbase, qttools }: mkDerivation rec { - name = "speedcrunch-${version}"; + pname = "speedcrunch"; version = "0.12.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix b/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix index bc971606cd08..18daabb9e7e2 100644 --- a/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix +++ b/nixpkgs/pkgs/applications/science/math/symmetrica/default.nix @@ -3,7 +3,7 @@ , fetchpatch }: stdenv.mkDerivation rec { - name = "symmetrica-${version}"; + pname = "symmetrica"; version = "2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/math/weka/default.nix b/nixpkgs/pkgs/applications/science/math/weka/default.nix index 3bfb22dad936..90278a744f15 100644 --- a/nixpkgs/pkgs/applications/science/math/weka/default.nix +++ b/nixpkgs/pkgs/applications/science/math/weka/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { - name = "weka-${version}"; + pname = "weka"; version = "3.9.2"; src = fetchurl { - url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip"; + url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip"; sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; diff --git a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 13ccd70c83f9..406d74c4cd34 100644 --- a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -3,7 +3,7 @@ , maxima, wxGTK, gnome3 }: stdenv.mkDerivation rec { - name = "wxmaxima-${version}"; + pname = "wxmaxima"; version = "19.03.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/math/yacas/default.nix b/nixpkgs/pkgs/applications/science/math/yacas/default.nix index c02ef73df119..bae0d9a18c67 100644 --- a/nixpkgs/pkgs/applications/science/math/yacas/default.nix +++ b/nixpkgs/pkgs/applications/science/math/yacas/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "yacas-${version}"; + pname = "yacas"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/science/misc/boinc/default.nix b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix index d1da5a74e858..c806b558da0e 100644 --- a/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -9,10 +9,10 @@ in stdenv.mkDerivation rec { version = "${majorVersion}.${minorVersion}"; - name = "boinc-${version}"; + pname = "boinc"; src = fetchFromGitHub { - name = "${name}-src"; + name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; diff --git a/nixpkgs/pkgs/applications/science/misc/colmap/default.nix b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix new file mode 100644 index 000000000000..672569ed1002 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/misc/colmap/default.nix @@ -0,0 +1,37 @@ +{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen, + freeimage, glog, libGLU, glew, qtbase, + cudaSupport ? false, cudatoolkit ? null }: + +assert !cudaSupport || cudatoolkit != null; + +let boost_static = boost.override { enableStatic = true; }; +in +mkDerivation rec { + version = "3.5"; + pname = "colmap"; + src = fetchFromGitHub { + owner = "colmap"; + repo = "colmap"; + rev = version; + sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; + }; + + buildInputs = [ + boost_static ceres-solver eigen + freeimage glog libGLU glew qtbase + ] ++ lib.optional cudaSupport cudatoolkit; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline"; + longDescription = '' + COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline + with a graphical and command-line interface. + ''; + homepage = https://colmap.github.io/index.html; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ lebastr ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index 2262e342fc95..2e19012af874 100644 --- a/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "cytoscape-${version}"; + pname = "cytoscape"; version = "3.7.1"; src = fetchurl { - url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k"; }; diff --git a/nixpkgs/pkgs/applications/science/misc/gephi/default.nix b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix index b81f188a91bf..17b2fe27f297 100644 --- a/nixpkgs/pkgs/applications/science/misc/gephi/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/gephi/default.nix @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation rec { - name = "gephi-${version}"; + pname = "gephi"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/applications/science/misc/gplates/default.nix b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix index 8b6c7497e547..b394639fd0cc 100644 --- a/nixpkgs/pkgs/applications/science/misc/gplates/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix @@ -2,11 +2,11 @@ , proj, boost, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { - name = "gplates-${version}"; + pname = "gplates"; version = "2.0.0"; src = fetchurl { - url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2"; + url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2"; sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw"; }; diff --git a/nixpkgs/pkgs/applications/science/misc/megam/default.nix b/nixpkgs/pkgs/applications/science/misc/megam/default.nix index 8cd119c7b7b0..59f5afb2f437 100644 --- a/nixpkgs/pkgs/applications/science/misc/megam/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/megam/default.nix @@ -2,7 +2,8 @@ let version = "0.92"; in stdenv.mkDerivation rec { - name = "megam-${version}"; + pname = "megam"; + inherit version; src = fetchurl { url = "http://hal3.name/megam/megam_src.tgz"; diff --git a/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix b/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix index 76f958cc3a81..b412c4ef81a7 100644 --- a/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "netlogo-${version}"; + pname = "netlogo"; version = "6.0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix b/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix index 4139c88ffb02..121e953f43af 100644 --- a/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/openmvg/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "openmvg-${version}"; + pname = "openmvg"; src = fetchgit { url = "https://www.github.com/openmvg/openmvg.git"; diff --git a/nixpkgs/pkgs/applications/science/misc/root/5.nix b/nixpkgs/pkgs/applications/science/misc/root/5.nix index 0199373b082c..2145d7e71d33 100644 --- a/nixpkgs/pkgs/applications/science/misc/root/5.nix +++ b/nixpkgs/pkgs/applications/science/misc/root/5.nix @@ -3,7 +3,7 @@ , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { - name = "root-${version}"; + pname = "root"; version = "5.34.36"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/misc/root/default.nix b/nixpkgs/pkgs/applications/science/misc/root/default.nix index 2ec1ded68a26..690dc920d5c8 100644 --- a/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -3,7 +3,7 @@ , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { - name = "root-${version}"; + pname = "root"; version = "6.12.06"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/misc/tulip/default.nix b/nixpkgs/pkgs/applications/science/misc/tulip/default.nix index 1f644ad0f20f..509cdeaee611 100644 --- a/nixpkgs/pkgs/applications/science/misc/tulip/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/tulip/default.nix @@ -3,10 +3,11 @@ let version = "5.2.1"; in stdenv.mkDerivation rec { - name = "tulip-${version}"; + pname = "tulip"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/auber/${name}_src.tar.gz"; + url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; }; diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index 1986f3b75ec1..c7692dde13aa 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.10"; - name = "DL_POLY_Classic-${version}"; + pname = "DL_POLY_Classic"; src = fetchurl { url = "https://ccpforge.cse.rl.ac.uk/gf/download/frsrelease/574/8924/dl_class_1.10.tar.gz"; diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix index f4491053e4c8..83f8b88ba318 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { # LAMMPS has weird versioning converted to ISO 8601 format version = "stable_22Aug2018"; - name = "lammps-${version}"; + pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; diff --git a/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix b/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix index ad86ff61471c..b22b9d412fdc 100644 --- a/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/quantomatic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "quantomatic-${version}"; + pname = "quantomatic"; version = "0.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix b/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix index d43a05f1c616..dd092a2ce9a9 100644 --- a/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { - name = "sacrifice-${version}"; + pname = "sacrifice"; version = "1.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index 1d61c612563f..045a77cea27f 100644 --- a/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { - name = "sherpa-${version}"; + pname = "sherpa"; version = "2.2.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix index ae5307f155bd..2af93961e02b 100644 --- a/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }: stdenv.mkDerivation rec { - name = "xfitter-${version}"; + pname = "xfitter"; version = "2.0.0"; src = fetchurl { - name = "${name}.tgz"; - url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${name}.tgz"; + name = "${pname}-${version}.tgz"; + url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz"; sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515"; }; diff --git a/nixpkgs/pkgs/applications/science/programming/plm/default.nix b/nixpkgs/pkgs/applications/science/programming/plm/default.nix index c454ad377686..ebfb6471c632 100644 --- a/nixpkgs/pkgs/applications/science/programming/plm/default.nix +++ b/nixpkgs/pkgs/applications/science/programming/plm/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { major = "2"; minor = "5"; version = "${major}-${minor}"; - name = "plm-${version}"; + pname = "plm"; src = fetchurl { url = "http://webloria.loria.fr/~quinson/Teaching/PLM/plm-${major}_${minor}.jar"; sha256 = "0m17cxa3nxi2cbswqvlfzp0mlfi3wrkw8ry2xhkxy6aqzm2mlgcc"; - name = "${name}.jar"; + name = "${pname}-${version}.jar"; }; buildInputs = [ makeWrapper jre gcc valgrind ]; diff --git a/nixpkgs/pkgs/applications/science/programming/scyther/cli.nix b/nixpkgs/pkgs/applications/science/programming/scyther/cli.nix index 152b71217743..6623f5def4cb 100644 --- a/nixpkgs/pkgs/applications/science/programming/scyther/cli.nix +++ b/nixpkgs/pkgs/applications/science/programming/scyther/cli.nix @@ -1,7 +1,8 @@ { stdenv, glibc, flex, bison, cmake , version, src, meta }: stdenv.mkDerivation { - name = "scyther-cli-${version}"; + pname = "scyther-cli"; + inherit version; inherit src meta; diff --git a/nixpkgs/pkgs/applications/science/programming/scyther/default.nix b/nixpkgs/pkgs/applications/science/programming/scyther/default.nix index e0993a580193..b4daae1afc04 100644 --- a/nixpkgs/pkgs/applications/science/programming/scyther/default.nix +++ b/nixpkgs/pkgs/applications/science/programming/scyther/default.nix @@ -25,7 +25,8 @@ let }; gui = stdenv.mkDerivation { - name = "scyther-gui-${version}"; + pname = "scyther-gui"; + inherit version; inherit src meta; buildInputs = [ python27Packages.wrapPython diff --git a/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix b/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix index 98ccd92c4ee5..a3ebda463b91 100644 --- a/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { inherit version; - name = "gazebo-${version}"; + pname = "gazebo"; src = fetchurl { - url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2"; + url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pname}-${version}.tar.bz2"; sha256 = src-sha256; }; diff --git a/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index eae5d3766d6d..1863757adbcf 100644 --- a/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "qgroundcontrol-${version}"; + pname = "qgroundcontrol"; version = "3.3.0"; qtInputs = [ diff --git a/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix b/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix index 507481cddab2..d14c0bb0fe81 100644 --- a/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/yarp/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "yarp-${version}"; + pname = "yarp"; version = "2.3.70.2"; src = fetchFromGitHub { owner = "robotology"; diff --git a/nixpkgs/pkgs/applications/search/grepcidr/default.nix b/nixpkgs/pkgs/applications/search/grepcidr/default.nix index 69fc0e76932c..06b2aee03920 100644 --- a/nixpkgs/pkgs/applications/search/grepcidr/default.nix +++ b/nixpkgs/pkgs/applications/search/grepcidr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "grepcidr-${version}"; + pname = "grepcidr"; version = "2.0"; src = fetchurl { - url = "http://www.pc-tools.net/files/unix/${name}.tar.gz"; + url = "http://www.pc-tools.net/files/unix/${pname}-${version}.tar.gz"; sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231"; }; diff --git a/nixpkgs/pkgs/applications/search/grepm/default.nix b/nixpkgs/pkgs/applications/search/grepm/default.nix index 99c149b79d9d..f3fc1e24401d 100644 --- a/nixpkgs/pkgs/applications/search/grepm/default.nix +++ b/nixpkgs/pkgs/applications/search/grepm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perlPackages, mutt }: stdenv.mkDerivation rec { - name = "grepm-${version}"; + pname = "grepm"; version = "0.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/bitkeeper/default.nix b/nixpkgs/pkgs/applications/version-management/bitkeeper/default.nix index 26397380d57f..e092a604142c 100644 --- a/nixpkgs/pkgs/applications/version-management/bitkeeper/default.nix +++ b/nixpkgs/pkgs/applications/version-management/bitkeeper/default.nix @@ -3,7 +3,7 @@ , libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { - name = "bitkeeper-${version}"; + pname = "bitkeeper"; version = "7.3.1ce"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/blackbox/default.nix b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix index 5bcc3f991a1c..8c28a6789624 100644 --- a/nixpkgs/pkgs/applications/version-management/blackbox/default.nix +++ b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "1.20181219"; pname = "blackbox"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stackexchange"; diff --git a/nixpkgs/pkgs/applications/version-management/bugseverywhere/default.nix b/nixpkgs/pkgs/applications/version-management/bugseverywhere/default.nix index 6301acdf1342..7d1de378f53d 100644 --- a/nixpkgs/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/nixpkgs/pkgs/applications/version-management/bugseverywhere/default.nix @@ -7,7 +7,7 @@ # pythonPackages.buildPythonApplication rec { version = "1.1.1"; - name = "bugseverywhere-${version}"; + pname = "bugseverywhere"; src = fetchurl { url = diff --git a/nixpkgs/pkgs/applications/version-management/cvsps/default.nix b/nixpkgs/pkgs/applications/version-management/cvsps/default.nix index aa3bcb273949..71130a2e2830 100644 --- a/nixpkgs/pkgs/applications/version-management/cvsps/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvsps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, cvs, zlib }: stdenv.mkDerivation rec { - name = "cvsps-${version}"; + pname = "cvsps"; version = "2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/diffuse/default.nix b/nixpkgs/pkgs/applications/version-management/diffuse/default.nix index fa6d4fe1890d..fc591dd710ee 100644 --- a/nixpkgs/pkgs/applications/version-management/diffuse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/diffuse/default.nix @@ -4,10 +4,10 @@ let inherit (python27Packages) pygtk python; in stdenv.mkDerivation rec { version = "0.4.8"; - name = "diffuse-${version}"; + pname = "diffuse"; src = fetchurl { - url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2"; sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1"; }; diff --git a/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/nixpkgs/pkgs/applications/version-management/fossil/default.nix index d4b60a4f5386..cc0298811333 100644 --- a/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "fossil-${version}"; + pname = "fossil"; version = "2.9"; src = fetchurl { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { [ "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw"; }; diff --git a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix index 0475a8ae76ca..350eea240ec8 100644 --- a/nixpkgs/pkgs/applications/version-management/gerrit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gerrit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gerrit-${version}"; + pname = "gerrit"; version = "2.14.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 6b25ef8518c9..203926550628 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "cgit-${version}"; + pname = "cgit"; version = "1.2.1"; src = fetchurl { - url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz"; sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; }; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 1af1870928ba..0e28258915f2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: stdenv.mkDerivation rec { - name = "darcs-to-git-${version}"; + pname = "darcs-to-git"; version = "2015-06-04"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 599c6bb4308e..1bbbbe22d9a8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -1,7 +1,7 @@ {stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}: stdenv.mkDerivation rec { - name = "diff-so-fancy-${version}"; + pname = "diff-so-fancy"; version = "1.2.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 52494d4ab7ed..b73825737dff 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "ghq-${version}"; - version = "0.10.2"; + pname = "ghq"; + version = "0.12.6"; goPackagePath = "github.com/motemen/ghq"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "1i7zmgv7760nrw8sayag90b8vvmbsiifgiqki5s3gs3ldnvlki5w"; + sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/deps.nix index be99aee64a5e..dde1b19b4c3b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/deps.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/deps.nix @@ -1,12 +1,12 @@ # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "github.com/blang/semver"; + goPackagePath = "github.com/Songmu/gitconfig"; fetch = { type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + url = "https://github.com/Songmu/gitconfig"; + rev = "v0.0.2"; + sha256 = "0w1xd1mzxzwh755l6lgpn6psjp959kvx89l39zhc8lag9jh7rc44"; }; } { @@ -19,24 +19,6 @@ }; } { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { goPackagePath = "github.com/golangplus/bytes"; fetch = { type = "git"; @@ -64,15 +46,6 @@ }; } { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { goPackagePath = "github.com/motemen/go-colorine"; fetch = { type = "git"; @@ -82,24 +55,6 @@ }; } { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.6.0"; - sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.5.0"; - sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; - }; - } - { goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; @@ -122,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "4829fb13d2c6"; - sha256 = "05nwpw41d7xsdln5rj381n8j9dsbq5ng1wp52bxslqc4x0l5s9fj"; + rev = "3ec191127204"; + sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3"; }; } { @@ -131,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -154,30 +109,21 @@ }; } { - goPackagePath = "gopkg.in/check.v1"; + goPackagePath = "golang.org/x/xerrors"; fetch = { type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + url = "https://go.googlesource.com/xerrors"; + rev = "3ee3066db522"; + sha256 = "12xyaa116bq9zy25fwk7zzi83v8aab9lm91pqg0c3jrfkjdbr255"; }; } { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; + goPackagePath = "gopkg.in/check.v1"; fetch = { type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } { @@ -185,8 +131,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index ba64a065d281..3118eaab19b4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }: buildPythonApplication rec { - name = "git-annex-metadata-gui-${version}"; + pname = "git-annex-metadata-gui"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 4d0f33730e45..55a9dd18f720 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "git-annex-remote-b2-${version}"; + pname = "git-annex-remote-b2"; version = "20151212-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index c368dcd487e8..5d4d9b86d83f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rclone, makeWrapper }: stdenv.mkDerivation rec { - name = "git-annex-remote-rclone-${version}"; + pname = "git-annex-remote-rclone"; version = "0.6"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 185ed38b5db0..daa0af43879d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-appraise-unstable-${version}"; + pname = "git-appraise-unstable"; version = "2018-02-26"; rev = "2414523905939525559e4b2498c5597f86193b61"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 0baf09918d44..edc5f9d7bfb0 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-bug-${version}"; + pname = "git-bug"; version = "0.5.0"; rev = "8d7a2c076a38c89085fd3191a2998efb659650c2"; goPackagePath = "github.com/MichaelMure/git-bug"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index c14a027b4abe..e502c73adfd4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -3,7 +3,7 @@ , pythonPackages }: stdenv.mkDerivation rec { - name = "git-bz-${version}"; + pname = "git-bz"; version = "3.2015-09-08"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 316b664c0705..6945e24ee46b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -4,7 +4,7 @@ let inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; in buildPythonApplication rec { - name = "git-cola-${version}"; + pname = "git-cola"; version = "3.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index c036a0ffe4b1..09c9169e434e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "git-extras-${version}"; + pname = "git-extras"; version = "4.7.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index ded9bcc2ffdf..193133d6d3e6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gitMinimal, python2Packages }: stdenv.mkDerivation rec { - name = "git-hub-${version}"; + pname = "git-hub"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 10e786222710..76b29135f66c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { - name = "git-imerge-${version}"; + pname = "git-imerge"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index f8d871bdcf30..a7abd1eeaf46 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "git-octopus-${version}"; + pname = "git-octopus"; version = "1.4"; installFlags = [ "prefix=$(out)" ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix index dc3fbbed1995..1cc3f365ea88 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -1,7 +1,7 @@ {stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { - name = "git-open-${version}"; + pname = "git-open"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index d72df8028759..9fb9d4de6e3d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "git-radar-${version}"; + pname = "git-radar"; version = "0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index d1dce0469793..ff0f702269c2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "git-remote-gcrypt-${version}"; + pname = "git-remote-gcrypt"; version = "1.2"; rev = version; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 03435ec834ab..c0de46264d05 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, git, gnused }: stdenv.mkDerivation rec { - name = "git-reparent-${version}"; + pname = "git-reparent"; version = "unstable-2017-09-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 211685c8edb4..c1a40b12cdea 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, git, coreutils }: stdenv.mkDerivation rec { - name = "git-secrets-${version}"; + pname = "git-secrets"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index 6a52983e83ce..e8eaf885c71f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "git-stree-${version}"; + pname = "git-stree"; version = "0.4.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 7ba7d8ec2434..7fa15c668099 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "git-sync-${version}"; + pname = "git-sync"; version = "20151024"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix index 1150f008299c..e55799c27521 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, git }: stdenv.mkDerivation rec { - name = "git-test-${version}"; + pname = "git-test"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 83e65bc17171..3a4fcc099340 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,18 +21,19 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.22.0"; + version = "2.22.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in stdenv.mkDerivation { - name = "git-${version}"; + pname = "git"; + inherit version; src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm"; + sha256 = "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 26f9f8c756ee..57af13f597a7 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -5,7 +5,6 @@ with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; version = "1.12.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "petervanderdoes"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix index b7828418db07..e6b746233fe1 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -3,7 +3,8 @@ let version = "0.3.1"; in buildGoPackage { - name = "grv-${version}"; + pname = "grv"; + inherit version; buildInputs = [ ncurses readline curl libgit2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 34c367b20a43..3c7784e85062 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -4,7 +4,8 @@ let version = "1.0.16"; in stdenv.mkDerivation { - name = "svn-all-fast-export-${version}"; + pname = "svn-all-fast-export"; + inherit version; src = fetchFromGitHub { owner = "svn-all-fast-export"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index d00fdd0c29e0..821ecf3e3d8f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -4,7 +4,8 @@ let version = "2.4.0"; in stdenv.mkDerivation { - name = "svn2git-${version}"; + pname = "svn2git"; + inherit version; src = fetchurl { url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix index 52f5551e204f..59354598d008 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -5,12 +5,11 @@ stdenv.mkDerivation rec { pname = "tig"; version = "2.4.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; - rev = name; + rev = "${pname}-${version}"; sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd"; }; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index cea588f76ca2..3b8affb57edf 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { - name = "transcrypt-${version}"; + pname = "transcrypt"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix index fd999dc17d4d..ec03c5bed5b1 100644 --- a/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "git-crecord-${version}"; + pname = "git-crecord"; version = "20161216.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix index 3cde046a2adf..e3190667259e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-lfs-${version}"; + pname = "git-lfs"; version = "1.5.6"; rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 92ba57382501..d9b5e1704976 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-lfs-${version}"; + pname = "git-lfs"; version = "2.7.2"; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 2c427bb18242..b26548ebe991 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "git-repo-${version}"; - version = "1.13.4"; + pname = "git-repo"; + version = "1.13.5.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0p55mx1ry0r3bb8nja09cfpiv1jjxf98r41vrqba1b5hm8hbzfhj"; + sha256 = "13rp0fq76a6qlw60pnipkgfng25i0ygyk66y30jv7hy8ip4aa92n"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix b/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix index 9c5ab20d364f..7a92679583b6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix @@ -2,7 +2,6 @@ buildGoPackage rec { pname = "git-sizer"; - name = "${pname}-${version}"; version = "1.0.0"; goPackagePath = "github.com/github/git-sizer"; diff --git a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index f766ddbd42c9..fa93ff41a4ae 100644 --- a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -12,7 +12,7 @@ let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; in stdenv.mkDerivation rec { - name = "gitkraken-${version}"; + pname = "gitkraken"; version = "6.1.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 184c6dc7f730..873d9f390905 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -18,7 +18,7 @@ let }; in buildGoPackage rec { version = "1.53.2"; - name = "gitaly-${version}"; + pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index faeed38c918b..cd4784b36c8e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "9.3.0"; - name = "gitlab-shell-${version}"; + pname = "gitlab-shell"; src = fetchFromGitLab { owner = "gitlab-org"; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 23cf3483f7a9..12f354bc2fb9 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - name = "gitlab-workhorse-${version}"; + pname = "gitlab-workhorse"; version = "8.7.0"; diff --git a/nixpkgs/pkgs/applications/version-management/gitolite/default.nix b/nixpkgs/pkgs/applications/version-management/gitolite/default.nix index 42c091007884..7c157191ab97 100644 --- a/nixpkgs/pkgs/applications/version-management/gitolite/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitolite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, git, nettools, perl }: stdenv.mkDerivation rec { - name = "gitolite-${version}"; + pname = "gitolite"; version = "3.6.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/gitstats/default.nix b/nixpkgs/pkgs/applications/version-management/gitstats/default.nix index 64b6e2107f6a..5d29c8fcb6c3 100644 --- a/nixpkgs/pkgs/applications/version-management/gitstats/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitstats/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }: stdenv.mkDerivation rec { - name = "gitstats-${version}"; + pname = "gitstats"; version = "2016-01-08"; # upstream does not make releases src = fetchzip { url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip"; sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59"; - name = name + "-src"; + name = "${pname}-${version}" + "-src"; }; buildInputs = [ perl python ]; diff --git a/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/nixpkgs/pkgs/applications/version-management/gogs/default.nix index 0587bc9af767..c2153ebea893 100644 --- a/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; buildGoPackage rec { - name = "gogs-${version}"; + pname = "gogs"; version = "0.11.86"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/version-management/gource/default.nix b/nixpkgs/pkgs/applications/version-management/gource/default.nix index 0d2c4d742672..0a24cfbb3a0d 100644 --- a/nixpkgs/pkgs/applications/version-management/gource/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gource/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.49"; - name = "gource-${version}"; + pname = "gource"; src = fetchurl { - url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9"; }; diff --git a/nixpkgs/pkgs/applications/version-management/guitone/default.nix b/nixpkgs/pkgs/applications/version-management/guitone/default.nix index 33d2eb89ad08..0aa8afa93619 100644 --- a/nixpkgs/pkgs/applications/version-management/guitone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/guitone/default.nix @@ -2,7 +2,8 @@ let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { - name = "guitone-${version}"; + pname = "guitone"; + inherit version; #src = fetchurl { # url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz"; diff --git a/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix b/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix index 3c052a26cdee..bee1c82e11b6 100644 --- a/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix +++ b/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix @@ -9,12 +9,12 @@ let graphviz_2_0 = import ./graphviz-2.0.nix { }; in stdenv.mkDerivation rec { version = "1.0.2"; - name = "monotone-viz-${version}"; + pname = "monotone-viz"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { - url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz"; + url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; }; diff --git a/nixpkgs/pkgs/applications/version-management/monotone/default.nix b/nixpkgs/pkgs/applications/version-management/monotone/default.nix index 010d4d2f86ad..7081e1a08996 100644 --- a/nixpkgs/pkgs/applications/version-management/monotone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/monotone/default.nix @@ -11,7 +11,8 @@ in assert perlVersion != ""; stdenv.mkDerivation rec { - name = "monotone-${version}"; + pname = "monotone"; + inherit version; src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { openssl gmp bzip2 ]; postInstall = '' - mkdir -p $out/share/${name} - cp -rv contrib/ $out/share/${name}/contrib + mkdir -p $out/share/${pname}-${version} + cp -rv contrib/ $out/share/${pname}-${version}/contrib mkdir -p $out/${perl.libPrefix}/${perlVersion} cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion} ''; diff --git a/nixpkgs/pkgs/applications/version-management/mr/default.nix b/nixpkgs/pkgs/applications/version-management/mr/default.nix index 8150203814d0..23278e9e748c 100644 --- a/nixpkgs/pkgs/applications/version-management/mr/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - name = "mr-${version}"; + pname = "mr"; version = "1.20180726"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix index 1a6eda6a04e9..8b2b15a00780 100644 --- a/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix +++ b/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,6 @@ with python2Packages; buildPythonApplication rec { - name = "${pname}-${version}"; version = "0.3.1"; pname = "nbstripout"; diff --git a/nixpkgs/pkgs/applications/version-management/nitpick/default.nix b/nixpkgs/pkgs/applications/version-management/nitpick/default.nix index 8fb1095dc581..db9afdc0a74f 100644 --- a/nixpkgs/pkgs/applications/version-management/nitpick/default.nix +++ b/nixpkgs/pkgs/applications/version-management/nitpick/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "nitpick"; version = "1.1"; - name = "${pname}-${version}"; format = "other"; disabled = !isPy27; diff --git a/nixpkgs/pkgs/applications/version-management/p4v/default.nix b/nixpkgs/pkgs/applications/version-management/p4v/default.nix index 314c379c4e6d..0020c8c2189e 100644 --- a/nixpkgs/pkgs/applications/version-management/p4v/default.nix +++ b/nixpkgs/pkgs/applications/version-management/p4v/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "p4v-${version}"; + pname = "p4v"; version = "2017.3.1601999"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix b/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix index e799d5fac43b..60486e201165 100644 --- a/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix +++ b/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: stdenv.mkDerivation rec { - name = "rapidsvn-${version}"; + pname = "rapidsvn"; version = "0.12.1"; src = fetchurl { - url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz"; + url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz"; sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix index 1fbc22f87761..a3ba418a1463 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix @@ -11,10 +11,11 @@ let }; in stdenv.mkDerivation rec { - name = "redmine-${version}"; + pname = "redmine"; + inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a"; }; diff --git a/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/default.nix index ba1980c3d142..0b1f64b58a17 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -11,10 +11,11 @@ let }; in stdenv.mkDerivation rec { - name = "redmine-${version}"; + pname = "redmine"; + inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r"; }; diff --git a/nixpkgs/pkgs/applications/version-management/src/default.nix b/nixpkgs/pkgs/applications/version-management/src/default.nix index 049f2756a551..a3fcd209efc0 100644 --- a/nixpkgs/pkgs/applications/version-management/src/default.nix +++ b/nixpkgs/pkgs/applications/version-management/src/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, rcs, git, makeWrapper }: stdenv.mkDerivation rec { - name = "src-${version}"; + pname = "src"; version = "1.26"; src = fetchurl { - url = "http://www.catb.org/~esr/src/${name}.tar.gz"; + url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz"; sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23"; }; diff --git a/nixpkgs/pkgs/applications/version-management/srcml/default.nix b/nixpkgs/pkgs/applications/version-management/srcml/default.nix index 8753d4f6f571..693af89d9785 100644 --- a/nixpkgs/pkgs/applications/version-management/srcml/default.nix +++ b/nixpkgs/pkgs/applications/version-management/srcml/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.9.5_beta"; - name = "srcml-${version}"; + pname = "srcml"; src = fetchurl { url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz"; diff --git a/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix b/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix index c2bf0a4183c1..2ad6b6f2f62c 100644 --- a/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, autoconf, sqlite }: stdenv.mkDerivation rec { - name = "vcprompt-${version}"; + pname = "vcprompt"; version = "1.2.1"; src = fetchhg { diff --git a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix index 4089e68d85dc..577f2f014168 100644 --- a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.20170915"; # date of commit we're pulling - name = "vcsh-${version}"; + pname = "vcsh"; src = fetchFromGitHub { owner = "RichiH"; diff --git a/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/nixpkgs/pkgs/applications/version-management/yadm/default.nix index 6baeb5279c26..aed5cb807dc7 100644 --- a/nixpkgs/pkgs/applications/version-management/yadm/default.nix +++ b/nixpkgs/pkgs/applications/version-management/yadm/default.nix @@ -2,7 +2,8 @@ let version = "1.12.0"; in stdenv.mkDerivation { - name = "yadm-${version}"; + pname = "yadm"; + inherit version; src = fetchFromGitHub { owner = "TheLocehiliosan"; diff --git a/nixpkgs/pkgs/applications/video/aegisub/default.nix b/nixpkgs/pkgs/applications/video/aegisub/default.nix index 3df616824801..2734035b6de9 100644 --- a/nixpkgs/pkgs/applications/video/aegisub/default.nix +++ b/nixpkgs/pkgs/applications/video/aegisub/default.nix @@ -21,11 +21,11 @@ assert portaudioSupport -> (portaudio != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "aegisub-${version}"; + pname = "aegisub"; version = "3.2.2"; src = fetchurl { - url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz"; + url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz"; sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"; }; diff --git a/nixpkgs/pkgs/applications/video/avidemux/default.nix b/nixpkgs/pkgs/applications/video/avidemux/default.nix index 4cbd506c177d..c28d900dd9f1 100644 --- a/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -24,7 +24,7 @@ assert default != "qt5" -> default == "cli"; assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { - name = "avidemux-${version}"; + pname = "avidemux"; version = "2.7.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/video/avxsynth/default.nix b/nixpkgs/pkgs/applications/video/avxsynth/default.nix index a76608bdd900..3d5980863296 100644 --- a/nixpkgs/pkgs/applications/video/avxsynth/default.nix +++ b/nixpkgs/pkgs/applications/video/avxsynth/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "avxsynth-${version}"; + pname = "avxsynth"; version = "2015-04-07"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/bino3d/default.nix b/nixpkgs/pkgs/applications/video/bino3d/default.nix index d98b39796608..64b9613363c3 100644 --- a/nixpkgs/pkgs/applications/video/bino3d/default.nix +++ b/nixpkgs/pkgs/applications/video/bino3d/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: stdenv.mkDerivation rec { - name = "bino-${version}"; + pname = "bino"; version = "1.6.7"; src = fetchurl { - url = "https://bino3d.org/releases/${name}.tar.xz"; + url = "https://bino3d.org/releases/${pname}-${version}.tar.xz"; sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; }; diff --git a/nixpkgs/pkgs/applications/video/bombono/default.nix b/nixpkgs/pkgs/applications/video/bombono/default.nix index 4b97db56e978..1cba1d0e9491 100644 --- a/nixpkgs/pkgs/applications/video/bombono/default.nix +++ b/nixpkgs/pkgs/applications/video/bombono/default.nix @@ -8,7 +8,7 @@ fetchpatch { url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; }; in stdenv.mkDerivation rec { - name = "bombono-${version}"; + pname = "bombono"; version = "1.2.4"; src = fetchFromGitHub { owner = "muravjov"; diff --git a/nixpkgs/pkgs/applications/video/bomi/default.nix b/nixpkgs/pkgs/applications/video/bomi/default.nix index bbac10140344..9ff65483f261 100644 --- a/nixpkgs/pkgs/applications/video/bomi/default.nix +++ b/nixpkgs/pkgs/applications/video/bomi/default.nix @@ -30,7 +30,7 @@ assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; stdenv.mkDerivation rec { - name = "bomi-${version}"; + pname = "bomi"; version = "0.9.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/byzanz/default.nix b/nixpkgs/pkgs/applications/video/byzanz/default.nix index ea8cb5aa3ffa..0f1b185ed220 100644 --- a/nixpkgs/pkgs/applications/video/byzanz/default.nix +++ b/nixpkgs/pkgs/applications/video/byzanz/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.3.alpha"; - name = "byzanz-${version}"; + pname = "byzanz"; src = fetchgit { url = git://github.com/GNOME/byzanz; diff --git a/nixpkgs/pkgs/applications/video/clickshare-csc1/default.nix b/nixpkgs/pkgs/applications/video/clickshare-csc1/default.nix index 34c80e1050b4..53d257dd9d07 100644 --- a/nixpkgs/pkgs/applications/video/clickshare-csc1/default.nix +++ b/nixpkgs/pkgs/applications/video/clickshare-csc1/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { - name = "clickshare-csc1-${version}"; + pname = "clickshare-csc1"; version = "01.07.00.033"; src = fetchurl { name = "clickshare-csc1-${version}.zip"; diff --git a/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/nixpkgs/pkgs/applications/video/clipgrab/default.nix index 989000297a33..1872750deb00 100644 --- a/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -4,13 +4,13 @@ }: mkDerivation rec { - name = "clipgrab-${version}"; + pname = "clipgrab"; version = "3.8.4"; src = fetchurl { sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! - url = "https://download.clipgrab.org/${name}.tar.gz"; + url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; diff --git a/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix b/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix index 344c47eb934a..61894bd22f8e 100644 --- a/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix +++ b/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix @@ -28,11 +28,11 @@ let ''; in stdenv.mkDerivation rec { - name = "dvd-slideshow-${version}"; + pname = "dvd-slideshow"; version = "0.8.4-2"; src = fetchurl { - url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz"; + url = "mirror://sourceforge/dvd-slideshow/files/${pname}-${version}.tar.gz"; sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5"; }; diff --git a/nixpkgs/pkgs/applications/video/dvdbackup/default.nix b/nixpkgs/pkgs/applications/video/dvdbackup/default.nix index 4712dfac7573..54be20d5faff 100644 --- a/nixpkgs/pkgs/applications/video/dvdbackup/default.nix +++ b/nixpkgs/pkgs/applications/video/dvdbackup/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.2"; - name = "dvdbackup-${version}"; + pname = "dvdbackup"; src = fetchurl { - url = "mirror://sourceforge/dvdbackup/${name}.tar.xz"; + url = "mirror://sourceforge/dvdbackup/${pname}-${version}.tar.xz"; sha256 = "1rl3h7waqja8blmbpmwy01q9fgr5r0c32b8dy3pbf59bp3xmd37g"; }; diff --git a/nixpkgs/pkgs/applications/video/dvdstyler/default.nix b/nixpkgs/pkgs/applications/video/dvdstyler/default.nix index 24aeedd6760f..495501e0c187 100644 --- a/nixpkgs/pkgs/applications/video/dvdstyler/default.nix +++ b/nixpkgs/pkgs/applications/video/dvdstyler/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dvdstyler-${version}"; + pname = "dvdstyler"; srcName = "DVDStyler-${version}"; version = "3.1.2"; diff --git a/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix b/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix index fd8cc8d86306..3e26b4d68c22 100644 --- a/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix +++ b/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix @@ -2,7 +2,7 @@ , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-mplayer-${version}"; + pname = "gnome-mplayer"; version = "1.0.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/gpac/default.nix b/nixpkgs/pkgs/applications/video/gpac/default.nix index 1c625de0dbc0..f81f394ed0b8 100644 --- a/nixpkgs/pkgs/applications/video/gpac/default.nix +++ b/nixpkgs/pkgs/applications/video/gpac/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.0"; - name = "gpac-${version}"; + pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; diff --git a/nixpkgs/pkgs/applications/video/k9copy/default.nix b/nixpkgs/pkgs/applications/video/k9copy/default.nix index 02a0f275f570..037331cad9e0 100644 --- a/nixpkgs/pkgs/applications/video/k9copy/default.nix +++ b/nixpkgs/pkgs/applications/video/k9copy/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { version = "3.0.3"; - name = "k9copy-${version}"; + pname = "k9copy"; src = fetchurl { - url = "mirror://sourceforge/k9copy-reloaded/${name}.tar.gz"; + url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz"; sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg"; }; diff --git a/nixpkgs/pkgs/applications/video/key-mon/default.nix b/nixpkgs/pkgs/applications/video/key-mon/default.nix index bc6cd015b865..7dc350da6475 100644 --- a/nixpkgs/pkgs/applications/video/key-mon/default.nix +++ b/nixpkgs/pkgs/applications/video/key-mon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gnome2, librsvg, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "key-mon-${version}"; + pname = "key-mon"; version = "1.17"; namePrefix = ""; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz"; sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; }; diff --git a/nixpkgs/pkgs/applications/video/kmplayer/default.nix b/nixpkgs/pkgs/applications/video/kmplayer/default.nix index 44313f9499f5..33ff1821640b 100644 --- a/nixpkgs/pkgs/applications/video/kmplayer/default.nix +++ b/nixpkgs/pkgs/applications/video/kmplayer/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { majorMinorVersion = "0.12"; patchVersion = "0b"; version = "${majorMinorVersion}.${patchVersion}"; - name = "kmplayer-${version}"; + pname = "kmplayer"; src = fetchurl { url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/video/lightworks/default.nix b/nixpkgs/pkgs/applications/video/lightworks/default.nix index b4d4312c0fac..0dc97410f547 100644 --- a/nixpkgs/pkgs/applications/video/lightworks/default.nix +++ b/nixpkgs/pkgs/applications/video/lightworks/default.nix @@ -20,7 +20,7 @@ let lightworks = stdenv.mkDerivation rec { version = "14.0.0"; - name = "lightworks-${version}"; + pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -28,7 +28,7 @@ let url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb"; sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033"; } - else throw "${name} is not supported on ${stdenv.hostPlatform.system}"; + else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; buildInputs = [ dpkg makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix b/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix index 717853af745c..0a422bb7f50c 100644 --- a/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix +++ b/nixpkgs/pkgs/applications/video/linuxstopmotion/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.8"; - name = "linuxstopmotion-${version}"; + pname = "linuxstopmotion"; src = fetchgit { url = "git://git.code.sf.net/p/linuxstopmotion/code"; diff --git a/nixpkgs/pkgs/applications/video/mapmap/default.nix b/nixpkgs/pkgs/applications/video/mapmap/default.nix index 4dd2e019d1d3..c302ae1730fe 100644 --- a/nixpkgs/pkgs/applications/video/mapmap/default.nix +++ b/nixpkgs/pkgs/applications/video/mapmap/default.nix @@ -13,7 +13,7 @@ with stdenv; mkDerivation rec { version = "0.6.1"; - name = "mapmap-${version}"; + pname = "mapmap"; src = fetchFromGitHub { owner = "mapmapteam"; diff --git a/nixpkgs/pkgs/applications/video/mediathekview/default.nix b/nixpkgs/pkgs/applications/video/mediathekview/default.nix index cceed556f978..a5de209854b3 100644 --- a/nixpkgs/pkgs/applications/video/mediathekview/default.nix +++ b/nixpkgs/pkgs/applications/video/mediathekview/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "13.2.1"; - name = "mediathekview-${version}"; + pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz"; sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a"; diff --git a/nixpkgs/pkgs/applications/video/minitube/default.nix b/nixpkgs/pkgs/applications/video/minitube/default.nix index 5ee437a19be5..a9876da234f7 100644 --- a/nixpkgs/pkgs/applications/video/minitube/default.nix +++ b/nixpkgs/pkgs/applications/video/minitube/default.nix @@ -6,7 +6,7 @@ , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: stdenv.mkDerivation rec { - name = "minitube-${version}"; + pname = "minitube"; version = "2.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix index 70dc156d6802..14db747d2ce7 100644 --- a/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix +++ b/nixpkgs/pkgs/applications/video/mjpg-streamer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libjpeg }: stdenv.mkDerivation rec { - name = "mjpg-streamer-${version}"; + pname = "mjpg-streamer"; version = "unstable-2019-05-24"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/motion/default.nix b/nixpkgs/pkgs/applications/video/motion/default.nix index e3dcf6b3d3b3..684390d3c5c7 100644 --- a/nixpkgs/pkgs/applications/video/motion/default.nix +++ b/nixpkgs/pkgs/applications/video/motion/default.nix @@ -2,7 +2,7 @@ , ffmpeg, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { - name = "motion-${version}"; + pname = "motion"; version = "4.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/mpc-qt/default.nix b/nixpkgs/pkgs/applications/video/mpc-qt/default.nix index 81b48e25b96b..efa495a45afe 100644 --- a/nixpkgs/pkgs/applications/video/mpc-qt/default.nix +++ b/nixpkgs/pkgs/applications/video/mpc-qt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: stdenv.mkDerivation rec { - name = "mpc-qt-${version}"; + pname = "mpc-qt"; version = "18.08"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/mpv/default.nix b/nixpkgs/pkgs/applications/video/mpv/default.nix index 6c21a6b2012b..bb0b92eee030 100644 --- a/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -95,7 +95,7 @@ let luaEnv = lua.withPackages(ps: with ps; [ luasocket ]); in stdenv.mkDerivation rec { - name = "mpv-${version}"; + pname = "mpv"; version = "0.29.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/mythtv/default.nix b/nixpkgs/pkgs/applications/video/mythtv/default.nix index 74167a67bd2b..d5c46491cf41 100644 --- a/nixpkgs/pkgs/applications/video/mythtv/default.nix +++ b/nixpkgs/pkgs/applications/video/mythtv/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "mythtv-${version}"; + pname = "mythtv"; version = "29.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/natron/default.nix b/nixpkgs/pkgs/applications/video/natron/default.nix index 6299cd7e5937..4617d1d17dc0 100644 --- a/nixpkgs/pkgs/applications/video/natron/default.nix +++ b/nixpkgs/pkgs/applications/video/natron/default.nix @@ -12,7 +12,7 @@ let }; seexpr = stdenv.mkDerivation rec { version = "1.0.1"; - name = "seexpr-${version}"; + pname = "seexpr"; src = fetchurl { url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz"; sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp"; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 983bdff106ed..cdcdea3dd26d 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -36,7 +36,7 @@ let optional = stdenv.lib.optional; in mkDerivation rec { - name = "obs-studio-${version}"; + pname = "obs-studio"; version = "23.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix index 14f40ad8901f..52aa57bf1986 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "obs-linuxbrowser-${version}"; + pname = "obs-linuxbrowser"; version = "0.6.1"; src = fetchFromGitHub { owner = "bazukas"; diff --git a/nixpkgs/pkgs/applications/video/olive-editor/default.nix b/nixpkgs/pkgs/applications/video/olive-editor/default.nix index 15db28b05e46..efa06f4794ef 100644 --- a/nixpkgs/pkgs/applications/video/olive-editor/default.nix +++ b/nixpkgs/pkgs/applications/video/olive-editor/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, +{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, qtbase, qtmultimedia, frei0r, opencolorio, hicolor-icon-theme, ffmpeg-full, CoreFoundation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "olive-editor"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "olive-editor"; repo = "olive"; rev = version; - sha256 = "191nk4c35gys4iypykcidn6h27c3sbjfy117q7h9h1qilz2wm94z"; + sha256 = "15q4qwf5rc3adssywl72jrhkpqk55ihpd5h5wf07baw0s47vv5kq"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/pitivi/default.nix b/nixpkgs/pkgs/applications/video/pitivi/default.nix index 1c124df30238..bef9537b8067 100644 --- a/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -12,7 +12,7 @@ let # don't bother exposing the package to all of nixpkgs. gst-transcoder = stdenv.mkDerivation rec { version = "1.14.1"; - name = "gst-transcoder-${version}"; + pname = "gst-transcoder"; src = fetchFromGitHub { owner = "pitivi"; repo = "gst-transcoder"; diff --git a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index 4bd4d5fdaadd..a4f9d6222aa6 100644 --- a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -9,41 +9,41 @@ let # plex-media-player is updated, the versions for these files are changed, # so the build IDs (and SHAs) below will need to be updated! depSrcs = rec { - webClientBuildId = "129-669a5eed7ae231"; - webClientDesktopBuildId = "3.100.1-d7ae231"; - webClientTvBuildId = "3.105.0-669a5ee"; + webClientBuildId = "141-4af71961b12c68"; + webClientDesktopBuildId = "3.104.2-1b12c68"; + webClientTvBuildId = "4.3.0-4af7196"; webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0gd7x0rf7sf696zd24y6pji9iam851vjjqbpm4xkqwpadwrwzhwk"; + sha256 = "0fpkd1s49dbiqqlijxbillqd71a78p8y2sc23mwp0lvcmxrg265p"; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "136hk7p6gxxmhq1d09jfjljkv76b5h2p16s5jwf28xixkp0ab2jg"; + sha256 = "0sb0j44lwqz9zbm98nba4x6c1jxdzvs36ynwfg527avkxxna0f8f"; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0yvjqar72jq58jllsp51b8ybiv6kad8w51bfzss87m1cv3qdbzpa"; + sha256 = "0dxa0ka0igfsryzda4r5clwdl47ah78nmlmgj9d5pgsvyvzjp87z"; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "0kkw9dd0kr5n4ip1pwfs2dkfjwrph88i0dlw64dca9i885gyjvhd"; + sha256 = "086w1bavk2aqsyhv9zi5fynk31zf61sl91r6gjrdrz656wfk5bxa"; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "0yssii01nx6ixg3mikqjn8hz34dalma0rfr8spj115xwr7aq8ixk"; + sha256 = "12vbgsfnj0j2y5jd73dpi08hqsr9888sma41nvd4ydsd7qblm455"; }; }; in mkDerivation rec { - name = "plex-media-player-${version}"; - version = "2.36.0.988"; - vsnHash = "0150ae52"; + pname = "plex-media-player"; + version = "2.40.0.1007"; + vsnHash = "5482132c"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "104arb0afv3jz0bvj8ij5s7av289ms9n91b4y4077la2wd6r1bq0"; + sha256 = "0ibdh5g8x32iy74q97jfsmxd08wnyrzs3gfiwjfgc10vaa1qdhli"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/nixpkgs/pkgs/applications/video/qstopmotion/default.nix b/nixpkgs/pkgs/applications/video/qstopmotion/default.nix index ea4816ad6d07..327a2034265e 100644 --- a/nixpkgs/pkgs/applications/video/qstopmotion/default.nix +++ b/nixpkgs/pkgs/applications/video/qstopmotion/default.nix @@ -5,10 +5,9 @@ stdenv.mkDerivation rec { pname = "qstopmotion"; version = "2.4.1"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz"; + url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz"; sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; diff --git a/nixpkgs/pkgs/applications/video/quvi/library.nix b/nixpkgs/pkgs/applications/video/quvi/library.nix index c3204cc9c0ce..8f9e3131d8aa 100644 --- a/nixpkgs/pkgs/applications/video/quvi/library.nix +++ b/nixpkgs/pkgs/applications/video/quvi/library.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { - name = "libquvi-${version}"; + pname = "libquvi"; version="0.9.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/video/quvi/scripts.nix b/nixpkgs/pkgs/applications/video/quvi/scripts.nix index 603534be4c8b..e54fc0eae4ba 100644 --- a/nixpkgs/pkgs/applications/video/quvi/scripts.nix +++ b/nixpkgs/pkgs/applications/video/quvi/scripts.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig}: stdenv.mkDerivation rec { - name = "quvi-scripts-${version}"; + pname = "quvi-scripts"; version="0.9.20131130"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/video/quvi/tool.nix b/nixpkgs/pkgs/applications/video/quvi/tool.nix index 333f4e6ab4de..972e08bb61be 100644 --- a/nixpkgs/pkgs/applications/video/quvi/tool.nix +++ b/nixpkgs/pkgs/applications/video/quvi/tool.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: stdenv.mkDerivation rec { - name = "quvi-${version}"; + pname = "quvi"; version="0.9.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/video/recordmydesktop/default.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/default.nix index 8797ad8f953b..e4d6e14d098d 100644 --- a/nixpkgs/pkgs/applications/video/recordmydesktop/default.nix +++ b/nixpkgs/pkgs/applications/video/recordmydesktop/default.nix @@ -2,7 +2,7 @@ , libICE, libSM, libX11, libXext, libXfixes, libXdamage }: stdenv.mkDerivation rec { - name = "recordmydesktop-${version}"; + pname = "recordmydesktop"; version = "0.3.8.1-svn${rev}"; rev = "602"; diff --git a/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix index 984b623cee7e..d59b02d4b0ae 100644 --- a/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/nixpkgs/pkgs/applications/video/recordmydesktop/gtk.nix @@ -5,7 +5,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; in stdenv.mkDerivation rec { - name = "gtk-recordmydesktop-${version}"; + pname = "gtk-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; src = fetchsvn { diff --git a/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix b/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix index 560801351515..0864edfcf38e 100644 --- a/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix +++ b/nixpkgs/pkgs/applications/video/recordmydesktop/qt.nix @@ -5,7 +5,7 @@ let binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; in stdenv.mkDerivation rec { - name = "qt-recordmydesktop-${version}"; + pname = "qt-recordmydesktop"; version = "0.3.8-svn${recordmydesktop.rev}"; src = fetchsvn { diff --git a/nixpkgs/pkgs/applications/video/shotcut/default.nix b/nixpkgs/pkgs/applications/video/shotcut/default.nix index 2f0b54edc8fb..176c4be4946d 100644 --- a/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; mkDerivation rec { - name = "shotcut-${version}"; + pname = "shotcut"; version = "19.08.16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix b/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix index b456d8ee9a66..29ad928e27cd 100644 --- a/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/nixpkgs/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras +{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras , libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja }: -stdenv.mkDerivation rec { - name = "simplescreenrecorder-${version}"; +mkDerivation rec { + pname = "simplescreenrecorder"; version = "0.3.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/video/smtube/default.nix b/nixpkgs/pkgs/applications/video/smtube/default.nix index 59e541892eef..352569e5ab39 100644 --- a/nixpkgs/pkgs/applications/video/smtube/default.nix +++ b/nixpkgs/pkgs/applications/video/smtube/default.nix @@ -2,10 +2,10 @@ mkDerivation rec { version = "19.6.0"; - name = "smtube-${version}"; + pname = "smtube"; src = fetchurl { - url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2"; sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm"; }; diff --git a/nixpkgs/pkgs/applications/video/streamlink/default.nix b/nixpkgs/pkgs/applications/video/streamlink/default.nix index 79f092a882c7..a5efddc9f1a8 100644 --- a/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { version = "1.1.1"; - name = "streamlink-${version}"; + pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; diff --git a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix index ea51471d9aa4..03fc1f5399af 100644 --- a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix +++ b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "subtitleeditor-${version}"; + pname = "subtitleeditor"; + inherit version; src = fetchFromGitHub { owner = "kitone"; diff --git a/nixpkgs/pkgs/applications/video/tivodecode/default.nix b/nixpkgs/pkgs/applications/video/tivodecode/default.nix index 83ca41e201c9..bc6561a0bbd0 100644 --- a/nixpkgs/pkgs/applications/video/tivodecode/default.nix +++ b/nixpkgs/pkgs/applications/video/tivodecode/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation { - name = "tivodecode-${version}"; + pname = "tivodecode"; + inherit version; src = fetchurl { url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/video/vlc/default.nix b/nixpkgs/pkgs/applications/video/vlc/default.nix index dda70d797e5e..a38076ca42b6 100644 --- a/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null); stdenv.mkDerivation rec { - name = "vlc-${version}"; + pname = "vlc"; version = "3.0.8"; src = fetchurl { - url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; + url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6"; }; diff --git a/nixpkgs/pkgs/applications/video/w_scan/default.nix b/nixpkgs/pkgs/applications/video/w_scan/default.nix index 2bf74da3d0f2..3c4f607c6aff 100644 --- a/nixpkgs/pkgs/applications/video/w_scan/default.nix +++ b/nixpkgs/pkgs/applications/video/w_scan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "w_scan-${version}"; + pname = "w_scan"; version = "20170107"; src = fetchurl { - url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2"; + url = "http://wirbel.htpc-forum.de/w_scan/${pname}-${version}.tar.bz2"; sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q"; }; diff --git a/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix index 0c28b4d57372..8258f8583090 100644 --- a/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix @@ -38,7 +38,7 @@ udev ]); in stdenv.mkDerivation rec { - name = "webtorrent-desktop-${version}"; + pname = "webtorrent-desktop"; version = "0.20.0"; src = diff --git a/nixpkgs/pkgs/applications/video/wxcam/default.nix b/nixpkgs/pkgs/applications/video/wxcam/default.nix index 64fcf0ba04a5..176d9a87aed0 100644 --- a/nixpkgs/pkgs/applications/video/wxcam/default.nix +++ b/nixpkgs/pkgs/applications/video/wxcam/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { - name = "wxcam-${version}"; + pname = "wxcam"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${pname}-${version}.tar.gz"; sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859"; }; diff --git a/nixpkgs/pkgs/applications/video/xscast/default.nix b/nixpkgs/pkgs/applications/video/xscast/default.nix index ae048f1bdac4..ba72763cdaf2 100644 --- a/nixpkgs/pkgs/applications/video/xscast/default.nix +++ b/nixpkgs/pkgs/applications/video/xscast/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: stdenv.mkDerivation rec { - name = "xscast-unstable-${version}"; + pname = "xscast-unstable"; version = "2016-07-26"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix index 15d98dc9be50..6e61ef098f35 100644 --- a/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix @@ -6,7 +6,7 @@ assert sdlSupport -> (SDL != null); stdenv.mkDerivation rec { - name = "8086tiny-${version}"; + pname = "8086tiny"; version = "1.25"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix index e7cd5b7bde68..02fb256b38ce 100644 --- a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "aqemu-${version}"; + pname = "aqemu"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/bochs/default.nix b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix index f9d7128330fb..72db4f1e5aa5 100644 --- a/nixpkgs/pkgs/applications/virtualization/bochs/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix @@ -18,11 +18,11 @@ assert curlSupport -> (curl != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "bochs-${version}"; + pname = "bochs"; version = "2.6.9"; src = fetchurl { - url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz"; sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf"; }; diff --git a/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix b/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix index 13060a50290b..9cdaec1c698a 100644 --- a/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, iasl, flex, bison }: stdenv.mkDerivation rec { - name = "cbfstool-${version}"; + pname = "cbfstool"; version = "4.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index d21bc8cc32b5..b770c6ed0a59 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "containerd-${version}"; + pname = "containerd"; version = "1.2.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix index 0af9abc852ef..ed4db853c389 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "distribution-${version}"; + pname = "distribution"; version = "2.6.2"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix index 946014e5cc9a..351353ceb96e 100644 --- a/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, p7zip }: stdenv.mkDerivation rec { - name = "win-virtio-${version}"; + pname = "win-virtio"; version = "0.1.141-1"; phases = [ "buildPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix index cce5a674f7cd..6f35257b50fd 100644 --- a/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, cmake, libelf, libpcap }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dynamips"; version = "0.2.21"; diff --git a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index ab971fe64c98..691c74301e39 100644 --- a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "amazon-ecs-agent"; version = "1.18.0"; diff --git a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix index 58f4dd48cc8b..0f53a5c4f14d 100644 --- a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "looking-glass-client-${version}"; + pname = "looking-glass-client"; version = "B1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix index 197b3045cf27..b58a5108ebad 100644 --- a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -25,7 +25,7 @@ with lib; let }; nvidia-container-runtime-hook = buildGoPackage rec { - name = "nvidia-container-runtime-hook-${version}"; + pname = "nvidia-container-runtime-hook"; version = "1.4.0"; goPackagePath = "nvidia-container-runtime-hook"; @@ -46,7 +46,7 @@ with lib; let }); in stdenv.mkDerivation rec { - name = "nvidia-docker-${version}"; + pname = "nvidia-docker"; version = "2.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index 46b8e3ba43c3..71c02ab4de50 100644 --- a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -12,7 +12,7 @@ with lib; let }; in stdenv.mkDerivation rec { - name = "libnvidia-container-${version}"; + pname = "libnvidia-container"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 200542f4de84..ee241abda7f8 100644 --- a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -5,7 +5,7 @@ withX ? true }: stdenv.mkDerivation rec { - name = "open-vm-tools-${version}"; + pname = "open-vm-tools"; version = "10.3.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index f7ea6df8493b..ff768cb7878c 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "podman-${version}"; + pname = "podman"; version = "1.5.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix index 8777f7cc2db2..d8a2878e3f79 100644 --- a/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - name = "remotebox-${version}"; + pname = "remotebox"; version = "2.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/virtualization/rkt/default.nix b/nixpkgs/pkgs/applications/virtualization/rkt/default.nix index 0f53ede188ce..fd0bd92faa60 100644 --- a/nixpkgs/pkgs/applications/virtualization/rkt/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/rkt/default.nix @@ -13,8 +13,8 @@ let in stdenv.mkDerivation rec { version = "1.30.0"; - name = "rkt-${version}"; - BUILDDIR="build-${name}"; + pname = "rkt"; + BUILDDIR="build-${pname}-${version}"; src = fetchFromGitHub { owner = "coreos"; diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 10c7d17209c3..6357f9fadff9 100644 --- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { - name = "runc-${version}"; + pname = "runc"; version = "1.0.0-rc8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/seabios/default.nix b/nixpkgs/pkgs/applications/virtualization/seabios/default.nix index 5aa73528e9d7..32528627a3c8 100644 --- a/nixpkgs/pkgs/applications/virtualization/seabios/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/seabios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "seabios-${version}"; + pname = "seabios"; version = "1.11.0"; src = fetchurl { - url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz"; + url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz"; sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2"; }; diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index e146086b5549..60825063cabc 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -14,7 +14,7 @@ with lib; buildGoPackage rec { - name = "singularity-${version}"; + pname = "singularity"; version = "3.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/tini/default.nix b/nixpkgs/pkgs/applications/virtualization/tini/default.nix index 25c19cd79c7f..39508412333c 100644 --- a/nixpkgs/pkgs/applications/virtualization/tini/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/tini/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.18.0"; - name = "tini-${version}"; + pname = "tini"; src = fetchFromGitHub { owner = "krallin"; diff --git a/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix b/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix index a8f113307251..224f77ed32d4 100644 --- a/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, openssl, curl, SDL }: stdenv.mkDerivation rec { - name = "tinyemu-${version}"; + pname = "tinyemu"; version = "2018-09-23"; src = fetchurl { - url = "https://bellard.org/tinyemu/${name}.tar.gz"; + url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; }; buildInputs = [ openssl curl SDL ]; diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix index c1dbad94250a..5a98e71c9166 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - name = "virt-manager-qt-${version}"; + pname = "virt-manager-qt"; version = "0.70.91"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix index 493307d0d078..382ebba3c57e 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ocamlPackages, autoreconfHook }: stdenv.mkDerivation rec { - name = "virt-top-${version}"; + pname = "virt-top"; version = "2017-11-18-unstable"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix index eb5d53c2b89f..3d0589032009 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,10 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl -, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl -, libapparmor, gst_all_1 +{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook +, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null -, xenSupport ? false, xen ? null }: assert spiceSupport -> @@ -22,13 +19,9 @@ stdenv.mkDerivation rec { sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; buildInputs = [ - glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info - libvirt yajl gsettings-desktop-schemas libvirt-glib - libcap_ng numactl libapparmor - ] ++ optionals xenSupport [ - xen + glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm ]; @@ -36,6 +29,9 @@ stdenv.mkDerivation rec { # Required for USB redirection PolicyKit rules file propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + strictDeps = true; + enableParallelBuilding = true; + meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; diff --git a/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix index 8a339ac83224..7ea83b015592 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "virt-what-${version}"; + pname = "virt-what"; version = "1.19"; src = fetchurl { - url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz"; + url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk"; }; diff --git a/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix b/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix index 8222fb50a8f9..6931e492e99c 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix @@ -5,7 +5,8 @@ with stdenv.lib; let version = "0.600.4"; in stdenv.mkDerivation rec { - name = "virtinst-${version}"; + pname = "virtinst"; + inherit version; src = fetchurl { url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 1a6ba5ac5273..20930b865370 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -24,7 +24,8 @@ let main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; version = "6.0.8"; in stdenv.mkDerivation { - name = "virtualbox-${version}"; + pname = "virtualbox"; + inherit version; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix index 3d6efcfc8443..464fe46b499c 100644 --- a/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, glibc }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "vpcs"; version = "0.8"; src = fetchurl { - name = "${name}.tar.bz2"; - url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz"; + name = "${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz"; sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw"; }; diff --git a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index 59d642108374..ea8a24e57a34 100644 --- a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: stdenv.mkDerivation rec { - name = "x11docker-${version}"; + pname = "x11docker"; version = "6.0.0"; src = fetchFromGitHub { owner = "mviereck"; diff --git a/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix index d3990a70bcac..26b55b364f17 100644 --- a/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; + pname = "xhyve"; version = "20190124"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/window-managers/2bwm/default.nix b/nixpkgs/pkgs/applications/window-managers/2bwm/default.nix index 116180f5ec36..4b61fe3d7e6c 100644 --- a/nixpkgs/pkgs/applications/window-managers/2bwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/2bwm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.2"; - name = "2bwm-${version}"; + pname = "2bwm"; src = fetchFromGitHub { owner = "venam"; diff --git a/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix b/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix index 46a86da1d66b..5fcbff26b154 100644 --- a/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { - name = "afterstep-${version}"; + pname = "afterstep"; version = "2.2.12"; sourceName = "AfterStep-${version}"; diff --git a/nixpkgs/pkgs/applications/window-managers/awesome/default.nix b/nixpkgs/pkgs/applications/window-managers/awesome/default.nix index 5c897926432e..2551ea80550e 100644 --- a/nixpkgs/pkgs/applications/window-managers/awesome/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/awesome/default.nix @@ -13,7 +13,7 @@ assert gtk3Support -> gtk3 != null; with luaPackages; stdenv.mkDerivation rec { - name = "awesome-${version}"; + pname = "awesome"; version = "4.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/bevelbar/default.nix b/nixpkgs/pkgs/applications/window-managers/bevelbar/default.nix index 582f9cb61f8e..40cebb572af3 100644 --- a/nixpkgs/pkgs/applications/window-managers/bevelbar/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/bevelbar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: stdenv.mkDerivation rec { - name = "bevelbar-${version}"; + pname = "bevelbar"; version = "16.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix b/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix index b81f66254377..e863a382470f 100644 --- a/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/bspwm/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bspwm-${version}"; + pname = "bspwm"; version = "0.9.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/btops/default.nix b/nixpkgs/pkgs/applications/window-managers/btops/default.nix index f55c55110a29..cf90b1fad63b 100644 --- a/nixpkgs/pkgs/applications/window-managers/btops/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/btops/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "btops-${version}"; + pname = "btops"; version = "0.1.0"; goPackagePath = "github.com/cmschuetz/btops"; diff --git a/nixpkgs/pkgs/applications/window-managers/cage/default.nix b/nixpkgs/pkgs/applications/window-managers/cage/default.nix new file mode 100644 index 000000000000..be45d68dc5df --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/cage/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkgconfig, makeWrapper +, wlroots, wayland, wayland-protocols, pixman, libxkbcommon +, systemd, mesa, libX11 +, xwayland ? null +}: + +stdenv.mkDerivation rec { + pname = "cage"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Hjdskes"; + repo = pname; + rev = "v${version}"; + sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ]; + + buildInputs = [ + wlroots wayland wayland-protocols pixman libxkbcommon + # TODO: Not specified but required: + systemd mesa libX11 + ]; + + enableParallelBuilding = true; + + mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ]; + + postFixup = stdenv.lib.optionalString (xwayland != null) '' + wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" + ''; + + meta = with stdenv.lib; { + description = "A Wayland kiosk"; + homepage = https://www.hjdskes.nl/projects/cage/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix b/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix index 0c13691a36ac..cf45dfa86407 100644 --- a/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/fbpanel/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "fbpanel-${version}"; + pname = "fbpanel"; version = "6.1"; src = fetchurl { - url = "mirror://sourceforge/fbpanel/${name}.tbz2"; + url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2"; sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = diff --git a/nixpkgs/pkgs/applications/window-managers/fluxbox/default.nix b/nixpkgs/pkgs/applications/window-managers/fluxbox/default.nix index c92b70153a72..404044fa3fa1 100644 --- a/nixpkgs/pkgs/applications/window-managers/fluxbox/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/fluxbox/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fluxbox-${version}"; + pname = "fluxbox"; version = "1.3.7"; src = fetchurl { - url = "mirror://sourceforge/fluxbox/${name}.tar.xz"; + url = "mirror://sourceforge/fluxbox/${pname}-${version}.tar.xz"; sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix b/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix index 20a95f36cee3..27657c10a7e3 100644 --- a/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix @@ -10,10 +10,9 @@ assert gestures -> libstroke != null; stdenv.mkDerivation rec { pname = "fvwm"; version = "2.6.8"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix b/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix index 83fe3ef163a3..c62edd6d71a1 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "i3blocks-gaps-${version}"; + pname = "i3blocks-gaps"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix index bd088db8a366..2246d77173a0 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "i3blocks-${version}"; + pname = "i3blocks"; version = "unstable-2019-02-07"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/nixpkgs/pkgs/applications/window-managers/i3/default.nix index d72e56d2489a..31a96ba1788b 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ , xorgserver, xvfb_run }: stdenv.mkDerivation rec { - name = "i3-${version}"; + pname = "i3"; version = "4.17"; src = fetchurl { - url = "https://i3wm.org/downloads/${name}.tar.bz2"; + url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/nixpkgs/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 54f238317068..33aac1cf4b65 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "i3ipc-glib-${version}"; + pname = "i3ipc-glib"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix index fa88a7e26bef..2fb6fb44833d 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.12.c"; - name = "i3lock-color-${version}"; + pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock.nix index 9d02dbafa5de..3e976f8919f8 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,11 @@ xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-${version}"; + pname = "i3lock"; version = "2.12"; src = fetchurl { - url = "https://i3wm.org/i3lock/${name}.tar.bz2"; + url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2"; sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 2f6199122f14..71a4ec3549a7 100644 --- a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "icewm-${version}"; + pname = "icewm"; version = "1.4.2"; buildInputs = diff --git a/nixpkgs/pkgs/applications/window-managers/jwm/default.nix b/nixpkgs/pkgs/applications/window-managers/jwm/default.nix index 6a7c1436b09d..3668b344be50 100644 --- a/nixpkgs/pkgs/applications/window-managers/jwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/jwm/default.nix @@ -4,7 +4,7 @@ librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { - name = "jwm-${version}"; + pname = "jwm"; version = "1685"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 3b764e7095be..7df2847669f5 100644 --- a/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/nixpkgs/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: stdenv.mkDerivation rec { - name = "jwm-settings-manager-${version}"; + pname = "jwm-settings-manager"; version = "2018-10-19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix b/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix index 9abbd891e310..3c537d6c931b 100644 --- a/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/matchbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { - name = "matchbox-${version}"; + pname = "matchbox"; version = "1.2"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix index 722566ea2e9e..026ee2e1287e 100644 --- a/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix @@ -23,7 +23,7 @@ let rev = "v0.6-17-g271e784"; in stdenv.mkDerivation rec { - name = "neocomp-unstable-${version}"; + pname = "neocomp-unstable"; version = "2019-03-12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/openbox/default.nix b/nixpkgs/pkgs/applications/window-managers/openbox/default.nix index 8c6926dd2c69..c8d526b6d288 100644 --- a/nixpkgs/pkgs/applications/window-managers/openbox/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/openbox/default.nix @@ -3,7 +3,7 @@ , imlib2, pango, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { - name = "openbox-${version}"; + pname = "openbox"; version = "3.6.1"; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://openbox.org/dist/openbox/${name}.tar.gz"; + url = "http://openbox.org/dist/openbox/${pname}-${version}.tar.gz"; sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix b/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix index 00ff62520105..d449fc91c0d3 100644 --- a/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "oroborus-${version}"; + pname = "oroborus"; version = "2.0.20"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix b/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix index b2677218e856..38255dce7224 100644 --- a/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { - name = "pekwm-${version}"; + pname = "pekwm"; version = "0.1.17"; src = fetchurl { - url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2"; + url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2"; sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/ratpoison/default.nix b/nixpkgs/pkgs/applications/window-managers/ratpoison/default.nix index 0a1a095e0ced..11a69020ee62 100644 --- a/nixpkgs/pkgs/applications/window-managers/ratpoison/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/ratpoison/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "ratpoison-${version}"; + pname = "ratpoison"; version = "1.4.9"; src = fetchurl { - url = "mirror://savannah/ratpoison/${name}.tar.xz"; + url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz"; sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix b/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix index d8bb58c21b66..f9bcb28e4557 100644 --- a/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sawfish-${version}"; + pname = "sawfish"; version = "1.12.90"; sourceName = "sawfish_${version}"; diff --git a/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix index 81901be0e60b..7233ff2410bd 100644 --- a/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/spectrwm/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "spectrwm-${version}"; + pname = "spectrwm"; version = "2.7.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix b/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix index 64fa600765b3..f0f724d6cf0e 100644 --- a/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/stalonetray/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, xorgproto }: stdenv.mkDerivation rec { - name = "stalonetray-${version}"; + pname = "stalonetray"; version = "0.8.3"; src = fetchurl { - url = "mirror://sourceforge/stalonetray/${name}.tar.bz2"; + url = "mirror://sourceforge/stalonetray/${pname}-${version}.tar.bz2"; sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix index 56d2515ed7b2..a6f2961ed3fc 100644 --- a/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/stumpish/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "stumpish"; version = "0.0.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "stumpwm"; diff --git a/nixpkgs/pkgs/applications/window-managers/sway/bg.nix b/nixpkgs/pkgs/applications/window-managers/sway/bg.nix index 595197a3f6f0..86301492c468 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/bg.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/bg.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swaybg-${version}"; + pname = "swaybg"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/sway/idle.nix b/nixpkgs/pkgs/applications/window-managers/sway/idle.nix index c9daed461c55..bc917e76f974 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/idle.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/idle.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swayidle-${version}"; + pname = "swayidle"; version = "1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/sway/lock.nix b/nixpkgs/pkgs/applications/window-managers/sway/lock.nix index 80d6ed4e0729..fe445a6b7adf 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/lock.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/lock.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swaylock-${version}"; + pname = "swaylock"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix b/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix index 817184d6cb00..2404129b165d 100644 --- a/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "sxhkd-${version}"; + pname = "sxhkd"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/way-cooler/wlc.nix b/nixpkgs/pkgs/applications/window-managers/way-cooler/wlc.nix index 3f2891ffd510..03d0b3023f71 100644 --- a/nixpkgs/pkgs/applications/window-managers/way-cooler/wlc.nix +++ b/nixpkgs/pkgs/applications/window-managers/way-cooler/wlc.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "wlc-${version}"; + pname = "wlc"; version = "0.0.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/nixpkgs/pkgs/applications/window-managers/weston/default.nix index a88281369e8f..99416fcf778a 100644 --- a/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "weston-${version}"; + pname = "weston"; version = "6.0.1"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; }; diff --git a/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix b/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix index caf97c6510de..d0a1de7f6006 100644 --- a/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/windowlab/default.nix @@ -3,7 +3,8 @@ let version = "1.40"; in stdenv.mkDerivation { - name = "windowlab-${version}"; + pname = "windowlab"; + inherit version; src = fetchurl { url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar"; diff --git a/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix b/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix index d83c4493accb..8ad63999289e 100644 --- a/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix @@ -3,7 +3,7 @@ , imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }: stdenv.mkDerivation rec { - name = "windowmaker-${version}"; + pname = "windowmaker"; version = "0.95.8"; srcName = "WindowMaker-${version}"; diff --git a/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix index d615b4fe010c..ad611f8dabe1 100644 --- a/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnumake, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: stdenv.mkDerivation rec { - name = "wmfs-${version}"; + pname = "wmfs"; version = "201902"; diff --git a/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix b/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix index 5a8b68df364a..e0f2243827c5 100644 --- a/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { rev = "2823"; version = "hg-2012-12-09"; - name = "wmii-${version}"; + pname = "wmii"; src = fetchurl { url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip; diff --git a/nixpkgs/pkgs/applications/window-managers/yabar/build.nix b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix index 678ebad75dd2..f7867882d222 100644 --- a/nixpkgs/pkgs/applications/window-managers/yabar/build.nix +++ b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix @@ -5,7 +5,8 @@ }: stdenv.mkDerivation { - name = "yabar-${version}"; + pname = "yabar"; + inherit version; src = fetchFromGitHub { inherit rev sha256; diff --git a/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/nixpkgs/pkgs/build-support/emacs/wrapper.nix index dfdd5b60851d..b242672df10b 100644 --- a/nixpkgs/pkgs/build-support/emacs/wrapper.nix +++ b/nixpkgs/pkgs/build-support/emacs/wrapper.nix @@ -18,10 +18,10 @@ the correct version of Emacs. `emacsWithPackages` inherits the package set which contains it, so the correct way to override the provided package set is to override the set which contains `emacsWithPackages`. For example, to override -`emacsPackagesNg.emacsWithPackages`, +`emacsPackages.emacsWithPackages`, ``` let customEmacsPackages = - emacsPackagesNg.overrideScope' (self: super: { + emacsPackages.overrideScope' (self: super: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit diff --git a/nixpkgs/pkgs/build-support/templaterpm/default.nix b/nixpkgs/pkgs/build-support/templaterpm/default.nix index aca4e340e267..d93001884982 100644 --- a/nixpkgs/pkgs/build-support/templaterpm/default.nix +++ b/nixpkgs/pkgs/build-support/templaterpm/default.nix @@ -1,7 +1,7 @@ {stdenv, makeWrapper, python, toposort, rpm}: stdenv.mkDerivation rec { - name = "nix-template-rpm-${version}"; + pname = "nix-template-rpm"; version = "0.1"; buildInputs = [ makeWrapper python toposort rpm ]; diff --git a/nixpkgs/pkgs/build-support/writers/default.nix b/nixpkgs/pkgs/build-support/writers/default.nix index ae7b42449fb3..8dbe0dbdbd03 100644 --- a/nixpkgs/pkgs/build-support/writers/default.nix +++ b/nixpkgs/pkgs/build-support/writers/default.nix @@ -10,12 +10,12 @@ rec { # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world" makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content: assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); - assert lib.or (types.path.check content) (types.string.check content); + assert lib.or (types.path.check content) (types.str.check content); let name = last (builtins.split "/" nameOrPath); in - pkgs.runCommand name (if (types.string.check content) then { + pkgs.runCommand name (if (types.str.check content) then { inherit content interpreter; passAsFile = [ "content" ]; } else { @@ -42,11 +42,11 @@ rec { # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } makeBinWriter = { compileScript }: nameOrPath: content: assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); - assert lib.or (types.path.check content) (types.string.check content); + assert lib.or (types.path.check content) (types.str.check content); let name = last (builtins.split "/" nameOrPath); in - pkgs.runCommand name (if (types.string.check content) then { + pkgs.runCommand name (if (types.str.check content) then { inherit content; passAsFile = [ "content" ]; } else { diff --git a/nixpkgs/pkgs/data/documentation/bgnet/default.nix b/nixpkgs/pkgs/data/documentation/bgnet/default.nix index 51ebe704beac..a53ead29c1e8 100644 --- a/nixpkgs/pkgs/data/documentation/bgnet/default.nix +++ b/nixpkgs/pkgs/data/documentation/bgnet/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, python, zip, fop }: stdenv.mkDerivation rec { - name = "bgnet-${version}"; + pname = "bgnet"; version = "3.0.21"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/nixpkgs/pkgs/data/documentation/man-pages/default.nix index c4ce27501721..8b0696408e63 100644 --- a/nixpkgs/pkgs/data/documentation/man-pages/default.nix +++ b/nixpkgs/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-${version}"; + pname = "man-pages"; version = "5.02"; src = fetchurl { - url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; + url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2"; }; diff --git a/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix b/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix index 08690b7cecfc..b2a6eaa15352 100644 --- a/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix +++ b/nixpkgs/pkgs/data/documentation/mustache-spec/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mustache-spec-${version}"; + pname = "mustache-spec"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/documentation/stdman/default.nix b/nixpkgs/pkgs/data/documentation/stdman/default.nix index 25df45258a6f..81fa0ea945d3 100644 --- a/nixpkgs/pkgs/data/documentation/stdman/default.nix +++ b/nixpkgs/pkgs/data/documentation/stdman/default.nix @@ -1,7 +1,7 @@ { stdenv, curl, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "stdman-${version}"; + pname = "stdman"; version = "2018.03.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/documentation/zeal/default.nix b/nixpkgs/pkgs/data/documentation/zeal/default.nix index 9bca390f96e2..2566b162d659 100644 --- a/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -3,7 +3,7 @@ , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: mkDerivation rec { - name = "zeal-${version}"; + pname = "zeal"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix b/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix index e563d201ff3d..38a2d8fe56ca 100644 --- a/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/dejavu-fonts/default.nix @@ -24,7 +24,8 @@ let }; full-ttf = stdenv.mkDerivation { - name = "dejavu-fonts-full-${version}"; + pname = "dejavu-fonts-full"; + inherit version; nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF]; src = fetchFromGitHub { @@ -44,14 +45,16 @@ let }; minimal = stdenv.mkDerivation { - name = "dejavu-fonts-minimal-${version}"; + pname = "dejavu-fonts-minimal"; + inherit version; buildCommand = '' install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf ''; inherit meta; }; in stdenv.mkDerivation { - name = "dejavu-fonts-${version}"; + pname = "dejavu-fonts"; + inherit version; buildCommand = '' install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf diff --git a/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix b/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix index 27306a0ef05c..061bbb445fb2 100644 --- a/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix +++ b/nixpkgs/pkgs/data/fonts/dina-pcf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.92"; - name = "dina-font-pcf-${version}"; + pname = "dina-font-pcf"; src = fetchurl { url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; diff --git a/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix b/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix index 4837425d19a7..81a1b5649b36 100644 --- a/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/dosemu-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "dosemu-fonts-${version}"; + pname = "dosemu-fonts"; version = "1.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/fonts/emojione/default.nix b/nixpkgs/pkgs/data/fonts/emojione/default.nix index 3e71352f8025..171ec10c8f16 100644 --- a/nixpkgs/pkgs/data/fonts/emojione/default.nix +++ b/nixpkgs/pkgs/data/fonts/emojione/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { - name = "emojione-${version}"; + pname = "emojione"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/fonts/gohufont/default.nix b/nixpkgs/pkgs/data/fonts/gohufont/default.nix index 59ac4ec850b1..1f861afcf83f 100644 --- a/nixpkgs/pkgs/data/fonts/gohufont/default.nix +++ b/nixpkgs/pkgs/data/fonts/gohufont/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gohufont-${version}"; + pname = "gohufont"; version = "2.1"; src = fetchurl { - url = "http://font.gohu.org/${name}.tar.gz"; + url = "http://font.gohu.org/${pname}-${version}.tar.gz"; sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm"; }; diff --git a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index d743d2ccbd42..707beb41231d 100644 --- a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "google-fonts-${version}"; + pname = "google-fonts"; version = "2019-07-14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix index 7eded5deab48..94c43b11285e 100644 --- a/nixpkgs/pkgs/data/fonts/inconsolata/default.nix +++ b/nixpkgs/pkgs/data/fonts/inconsolata/default.nix @@ -1,7 +1,7 @@ { stdenv, google-fonts }: stdenv.mkDerivation rec { - name = "inconsolata-${version}"; + pname = "inconsolata"; inherit (google-fonts) src version; diff --git a/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix b/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix index 8b5570081757..aec48b120860 100644 --- a/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix +++ b/nixpkgs/pkgs/data/fonts/inconsolata/lgc.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, fontforge}: stdenv.mkDerivation rec { - name = "inconsolata-lgc-${version}"; + pname = "inconsolata-lgc"; version = "1.3"; src = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; - install -m444 -Dt $out/share/doc/${name} LICENSE README + install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix index 4910ef21f9ab..d079ae59b0d6 100644 --- a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, requireFile, unzip }: stdenv.mkDerivation rec { - name = "input-fonts-${version}"; + pname = "input-fonts"; version = "2017-08-10"; # date of the download and checksum src = requireFile { diff --git a/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix b/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix index 6ed540121a2c..cf89a8fcb8f1 100644 --- a/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix +++ b/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix @@ -3,7 +3,8 @@ let version = "20030809"; in stdenv.mkDerivation { - name = "kochi-substitute-${version}"; + pname = "kochi-substitute"; + inherit version; src = fetchurl { url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb"; diff --git a/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix b/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix index ec932ab978c2..7a68c9deb5a6 100644 --- a/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix +++ b/nixpkgs/pkgs/data/fonts/libre-caslon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libre-caslon-${version}"; + pname = "libre-caslon"; version = "1.002"; srcs = [ @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} + cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${pname}-${version} ''; outputHashAlgo = "sha256"; diff --git a/nixpkgs/pkgs/data/fonts/lobster-two/default.nix b/nixpkgs/pkgs/data/fonts/lobster-two/default.nix index d9e7ec66ee67..773b53c88921 100644 --- a/nixpkgs/pkgs/data/fonts/lobster-two/default.nix +++ b/nixpkgs/pkgs/data/fonts/lobster-two/default.nix @@ -50,15 +50,15 @@ let in stdenv.mkDerivation rec { - name = "lobstertwo-${version}"; + pname = "lobstertwo"; version = "1.006"; phases = ["installPhase"]; installPhase = '' mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name} + mkdir -p $out/share/doc/${pname}-${version} + cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name} cp -v ${bold.file} $out/share/fonts/opentype/${bold.name} cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name} cp -v ${italic.file} $out/share/fonts/opentype/${italic.name} diff --git a/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix b/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix index f990575def0f..a041f9ce907a 100644 --- a/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix +++ b/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "meslo-lg-${version}"; + pname = "meslo-lg"; meslo-lg = fetchurl { url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true"; - name="${name}"; + name="${pname}-${version}"; sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"; }; meslo-lg-dz = fetchurl { url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true"; - name="${name}-dz"; + name="${pname}-${version}-dz"; sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; }; diff --git a/nixpkgs/pkgs/data/fonts/migmix/default.nix b/nixpkgs/pkgs/data/fonts/migmix/default.nix index 228952aaa56d..8a089ea9e79f 100644 --- a/nixpkgs/pkgs/data/fonts/migmix/default.nix +++ b/nixpkgs/pkgs/data/fonts/migmix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "migmix-${version}"; + pname = "migmix"; version = "20150712"; srcs = [ diff --git a/nixpkgs/pkgs/data/fonts/migu/default.nix b/nixpkgs/pkgs/data/fonts/migu/default.nix index 193e98d01a4b..775d1766894c 100644 --- a/nixpkgs/pkgs/data/fonts/migu/default.nix +++ b/nixpkgs/pkgs/data/fonts/migu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "migu-${version}"; + pname = "migu"; version = "20150712"; srcs = [ diff --git a/nixpkgs/pkgs/data/fonts/monoid/default.nix b/nixpkgs/pkgs/data/fonts/monoid/default.nix index 2bc5a82fa94f..c4cf4f142516 100644 --- a/nixpkgs/pkgs/data/fonts/monoid/default.nix +++ b/nixpkgs/pkgs/data/fonts/monoid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, fontforge }: stdenv.mkDerivation rec { - name = "monoid-${version}"; + pname = "monoid"; version = "2016-07-21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix b/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix index c08630335d4a..59b0f89e45ed 100644 --- a/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/nerdfonts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "nerdfonts-${version}"; + pname = "nerdfonts"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "nerd-fonts"; diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index 8e3e1f820ce0..fdc6061a5cf9 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -94,7 +94,8 @@ rec { }; }; noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation { - name = "noto-fonts-emoji-${version}"; + pname = "noto-fonts-emoji"; + inherit version; src = fetchFromGitHub { owner = "googlei18n"; diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix index a9d45128c5b4..f4c36f34074c 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, pythonPackages, lib }: pythonPackages.buildPythonPackage rec { - version = "2017-09-25"; - name = "nototools-${version}"; + pname = "nototools"; + version = "unstable-2019-03-20"; src = fetchFromGitHub { - owner = "googlei18n"; + owner = "googlefonts"; repo = "nototools"; - rev = "v2017-09-25-tooling-for-phase3-update"; - sha256 = "03nzvcvwmrhfrcjhg218q2f3hfrm3vlivp4rk19sc397kh3hisiz"; + rev = "9c4375f07c9adc00c700c5d252df6a25d7425870"; + sha256 = "0z9i23vl6xar4kvbqbc8nznq3s690mqc5zfv280l1c02l5n41smc"; }; propagatedBuildInputs = with pythonPackages; [ fonttools numpy ]; @@ -26,6 +26,6 @@ pythonPackages.buildPythonPackage rec { meta = { description = "Noto fonts support tools and scripts plus web site generation"; license = lib.licenses.asl20; - homepage = https://github.com/googlei18n/nototools; + homepage = https://github.com/googlefonts/nototools; }; } diff --git a/nixpkgs/pkgs/data/fonts/ricty/default.nix b/nixpkgs/pkgs/data/fonts/ricty/default.nix index 2667562b1b02..ab794992e45f 100644 --- a/nixpkgs/pkgs/data/fonts/ricty/default.nix +++ b/nixpkgs/pkgs/data/fonts/ricty/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, google-fonts, migu, fontforge, which }: stdenv.mkDerivation rec { - name = "ricty-${version}"; + pname = "ricty"; version = "4.1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 2bdb96228d9c..2e83d5b12d4c 100644 --- a/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/nixpkgs/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fontforge, pythonFull }: stdenv.mkDerivation rec { - name = "rictydiminished-with-firacode-${version}"; + pname = "rictydiminished-with-firacode"; version = "0.0.1"; src = fetchgit { url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; diff --git a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix index 175acb22d7b2..d55e3b753dd7 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix @@ -5,7 +5,7 @@ let commit = "883939708704a19a295e0652036369d22469e8dc"; in stdenv.mkDerivation rec { - name = "roboto-mono-${version}"; + pname = "roboto-mono"; version = "2016-01-11"; srcs = [ diff --git a/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix index c5ce13ad7ae4..548414152ddb 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto-slab/default.nix @@ -5,7 +5,7 @@ let commit = "883939708704a19a295e0652036369d22469e8dc"; in stdenv.mkDerivation rec { - name = "roboto-slab-${version}"; + pname = "roboto-slab"; version = "2016-01-11"; srcs = [ diff --git a/nixpkgs/pkgs/data/fonts/terminus-font/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix index 57356398004e..358ab959cd0e 100644 --- a/nixpkgs/pkgs/data/fonts/terminus-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/terminus-font/default.nix @@ -2,11 +2,10 @@ stdenv.mkDerivation rec { pname = "terminus-font"; - version = "4.48"; - name = "${pname}-${version}"; # set here for use in URL below + version = "4.48"; # set here for use in URL below src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"; }; diff --git a/nixpkgs/pkgs/data/fonts/tlwg/default.nix b/nixpkgs/pkgs/data/fonts/tlwg/default.nix index 494f48fd36e0..787009928313 100644 --- a/nixpkgs/pkgs/data/fonts/tlwg/default.nix +++ b/nixpkgs/pkgs/data/fonts/tlwg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, fontforge }: stdenv.mkDerivation rec { - name = "tlwg-${version}"; + pname = "tlwg"; version = "0.6.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix new file mode 100644 index 000000000000..5c01283d3e9c --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -0,0 +1,122 @@ +# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9 +# The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) + +{ stdenv +, fetchFromGitHub +, cairo +, imagemagick +, pkg-config +, pngquant +, python2 +, which +, zopfli +}: + +let + version = "12.1.2"; + + # Cannot use noto-fonts-emoji.src since it is too old + # and still tries to use vendored pngquant. + notoSrc = fetchFromGitHub { + name = "noto"; + owner = "googlefonts"; + repo = "noto-emoji"; + rev = "833a43d03246a9325e748a2d783006454d76ff66"; + sha256 = "1g6ikzk8banm3ihqm9g27ggjq2mn1b1hq3zhpl13lxid6mp60s4a"; + }; + + twemojiSrc = fetchFromGitHub { + name = "twemoji"; + owner = "twitter"; + repo = "twemoji"; + rev = "v${version}"; + sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; + }; + + python = python2.withPackages (pp: with pp; [ + nototools + ]); +in +stdenv.mkDerivation rec { + pname = "twitter-color-emoji"; + inherit version; + + srcs = [ + notoSrc + twemojiSrc + ]; + + sourceRoot = notoSrc.name; + + postUnpack = '' + chmod -R +w ${twemojiSrc.name} + mv ${twemojiSrc.name} ${notoSrc.name} + ''; + + nativeBuildInputs = [ + cairo + imagemagick + pkg-config + pngquant + python + which + zopfli + ]; + + postPatch = let + templateSubstitutions = stdenv.lib.concatStringsSep "; " [ + ''s#Noto Color Emoji#Twitter Color Emoji#'' + ''s#NotoColorEmoji#TwitterColorEmoji#'' + ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#'' + ''s# Version .*# ${version}#'' + ''s#.*is a trademark.*##'' + ''s#Google, Inc\.#Twitter, Inc and other contributors#'' + ''s#http://www.google.com/get/noto/#https://twemoji.twitter.com/#'' + ''s#.*is licensed under.*# Creative Commons Attribution 4.0 International#'' + ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' + ]; + in '' + patchShebangs ./flag_glyph_name.py + + sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl + pushd ${twemojiSrc.name}/assets/72x72/ + for png in *.png; do + mv $png emoji_u''${png//-/_} + done + popd + ''; + + makeFlags = [ + "EMOJI=TwitterColorEmoji" + "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72" + "BODY_DIMENSIONS=76x72" + ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm644 TwitterColorEmoji.ttf $out/share/fonts/truetype/TwitterColorEmoji.ttf + ''; + + meta = with stdenv.lib; { + description = "Color emoji font with a flat visual style, designed and used by Twitter"; + longDescription = '' + A bitmap color emoji font built from the Twitter Emoji for + Everyone artwork with support for ZWJ, skin tone diversity and country + flags. + + This font uses Google’s CBDT format making it work on Android and Linux graphical stack. + ''; + homepage = "https://twemoji.twitter.com/"; + # In noto-emoji-fonts source + ## noto-emoji code is in ASL 2.0 license + ## Emoji fonts are under OFL license + ### third_party color-emoji code is in ASL 2.0 license + ### third_party region-flags code is in Public Domain license + # In twemoji source + ## Artwork is Creative Commons Attribution 4.0 International + ## Non-artwork is MIT + license = with licenses; [ asl20 ofl cc-by-40 mit ]; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix index 996d11923972..f1545e3d5b45 100644 --- a/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "ucs-fonts-${version}"; + pname = "ucs-fonts"; version = "20090406"; srcs = [ diff --git a/nixpkgs/pkgs/data/fonts/unifont/default.nix b/nixpkgs/pkgs/data/fonts/unifont/default.nix index b3c6d585b8bb..a80beee342b3 100644 --- a/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, mkfontscale, mkfontdir }: stdenv.mkDerivation rec { - name = "unifont-${version}"; + pname = "unifont"; version = "12.1.03"; ttf = fetchurl { - url = "mirror://gnu/unifont/${name}/${name}.ttf"; + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p"; }; pcf = fetchurl { - url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; diff --git a/nixpkgs/pkgs/data/fonts/unscii/default.nix b/nixpkgs/pkgs/data/fonts/unscii/default.nix index 6d169e940cf9..cd4d0dc42cdd 100644 --- a/nixpkgs/pkgs/data/fonts/unscii/default.nix +++ b/nixpkgs/pkgs/data/fonts/unscii/default.nix @@ -1,11 +1,10 @@ {stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "unscii"; version = "1.1"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://pelulamu.net/${pname}/${name}-src.tar.gz"; + url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; }; nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge diff --git a/nixpkgs/pkgs/data/fonts/xits-math/default.nix b/nixpkgs/pkgs/data/fonts/xits-math/default.nix index 553c1dbde221..24e9f2a39357 100644 --- a/nixpkgs/pkgs/data/fonts/xits-math/default.nix +++ b/nixpkgs/pkgs/data/fonts/xits-math/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, fontforge }: stdenv.mkDerivation rec { - name = "xits-math-${version}"; + pname = "xits-math"; version = "1.200"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix index ce7bb11522ba..2e99c3d92327 100644 --- a/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix +++ b/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }: stdenv.mkDerivation rec { - name = "bibata-cursors-${version}"; + pname = "bibata-cursors"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 4b42f0b6ee9f..f276b573019f 100644 --- a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "elementary-xfce-icon-theme-${version}"; + pname = "elementary-xfce-icon-theme"; version = "0.13.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix index a4ffefe1f26d..99488a26f2b6 100644 --- a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "faba-mono-icons"; version = "2016-04-30"; diff --git a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index ee45a186f290..f7015621853c 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk3 }: stdenv.mkDerivation rec { - name = "iconpack-obsidian-${version}"; + pname = "iconpack-obsidian"; version = "4.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index 7b4ed7a66809..49d289cac391 100644 --- a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "maia-icon-theme-${version}"; + pname = "maia-icon-theme"; version = "2018-02-24"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix index 17892679a7ea..83c4b19472a3 100644 --- a/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "moka-icon-theme"; version = "5.4.0"; diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index 1a2eb6504d9d..e41373f536ff 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "numix-icon-theme"; version = "18.07.17"; diff --git a/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix index de808e44ea6c..5359b2229f39 100644 --- a/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "paper-icon-theme"; version = "2018-06-24"; diff --git a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix index b6def37def6f..c4a8fd44a610 100644 --- a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix +++ b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, xorg }: stdenv.mkDerivation rec { - name = "vanilla-dmz-${version}"; + pname = "vanilla-dmz"; version = "0.4.4"; src = fetchzip { url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix index 18331b5ada9d..5df7343f3be7 100644 --- a/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix +++ b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "combinatorial_designs-${version}"; + pname = "combinatorial_designs"; version = "20140630"; src = fetchurl { diff --git a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix index fec422b33acf..48b538fe1833 100644 --- a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix +++ b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "conway_polynomials-${version}"; + pname = "conway_polynomials"; version = "0.5"; pythonEnv = python.withPackages (ps: with ps; [ six ]); diff --git a/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix index 528486328c68..49b8736b0846 100644 --- a/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix +++ b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation rec { pname = "elliptic_curves"; version = "0.8"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix index 309ae47a8516..38662bef0af3 100644 --- a/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix +++ b/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "geolite-legacy-${version}"; + pname = "geolite-legacy"; version = "2017-12-02"; srcGeoIP = fetchDB diff --git a/nixpkgs/pkgs/data/misc/graphs/default.nix b/nixpkgs/pkgs/data/misc/graphs/default.nix index aea5feef46c7..14551c6a4a47 100644 --- a/nixpkgs/pkgs/data/misc/graphs/default.nix +++ b/nixpkgs/pkgs/data/misc/graphs/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "graphs"; version = "20161026"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/data/misc/libkkc-data/default.nix b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix index 343071fcf59c..cb446e9b0bc1 100644 --- a/nixpkgs/pkgs/data/misc/libkkc-data/default.nix +++ b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "libkkc-data"; version = "0.2.7"; - name = "${pname}-${version}"; src = fetchurl { - url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz"; + url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz"; sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; }; diff --git a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix index 222fd2f88707..1b6b60f104e0 100644 --- a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20080411"; - name = "pari-galdata-${version}"; + pname = "pari-galdata"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz"; diff --git a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix index 967122c1bd4d..2d3d52f697ed 100644 --- a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20090618"; - name = "pari-seadata-small-${version}"; + pname = "pari-seadata-small"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz"; diff --git a/nixpkgs/pkgs/data/misc/polytopes_db/default.nix b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix index 85f2cff09db2..8fec9a854260 100644 --- a/nixpkgs/pkgs/data/misc/polytopes_db/default.nix +++ b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "polytopes_db"; version = "20170220"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/data/misc/scowl/default.nix b/nixpkgs/pkgs/data/misc/scowl/default.nix index c90b8aa7e37d..f15a7534e267 100644 --- a/nixpkgs/pkgs/data/misc/scowl/default.nix +++ b/nixpkgs/pkgs/data/misc/scowl/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "scowl"; version = "2018.04.16"; diff --git a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index 6d29d8760734..79924c4832f6 100644 --- a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -3,7 +3,8 @@ let version = "1.12"; in stdenv.mkDerivation rec { - name = "shared-mime-info-${version}"; + pname = "shared-mime-info"; + inherit version; src = fetchurl { url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz"; diff --git a/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix b/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix index 043d3d65b84e..355a2c2c577a 100644 --- a/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/nixpkgs/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "sound-theme-freedesktop-${version}"; + pname = "sound-theme-freedesktop"; version = "0.8"; src = fetchurl { sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb"; - url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~mccann/dist/${pname}-${version}.tar.bz2"; }; nativeBuildInputs = [ intltool ]; diff --git a/nixpkgs/pkgs/data/misc/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix index 0d19d8c9dcab..c1f9153c5854 100644 --- a/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPackages }: stdenv.mkDerivation rec { - name = "tzdata-${version}"; + pname = "tzdata"; version = "2019a"; srcs = diff --git a/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix index e11362992608..12acc424b9d1 100644 --- a/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix +++ b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, pkgconfig, xorgproto}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "rgb"; version = "1.0.6"; diff --git a/nixpkgs/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix index 762ab3eac3e5..09ca8897a216 100644 --- a/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "matcha-${version}"; + pname = "matcha"; version = "2019-06-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/data/themes/nordic-polar/default.nix b/nixpkgs/pkgs/data/themes/nordic-polar/default.nix index c4265875390e..d1cfb800001b 100644 --- a/nixpkgs/pkgs/data/themes/nordic-polar/default.nix +++ b/nixpkgs/pkgs/data/themes/nordic-polar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "nordic-polar-${version}"; + pname = "nordic-polar"; version = "1.5.0"; srcs = [ diff --git a/nixpkgs/pkgs/data/themes/nordic/default.nix b/nixpkgs/pkgs/data/themes/nordic/default.nix index 1f0e110488b7..5172b2992ccc 100644 --- a/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "nordic-${version}"; + pname = "nordic"; version = "1.6.5"; srcs = [ diff --git a/nixpkgs/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix index 4d91b60960b3..6461697b04f2 100644 --- a/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2019-05-03"; + version = "2019-08-31"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "031nqr47b3x8ahcym7cfc75y8sy53dcmrrrlywi7m1a10ckfp0pd"; + sha256 = "1pqfnqc2c6f5cidg6c3y492hqlyn5ma4b7ra2lchw7g2dxfvq8w1"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs . mkdir -p $out/share/themes - name= ./Install -d $out/share/themes + name= ./install.sh -d $out/share/themes ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix index ee0c81d7d39e..3a0695f3fb84 100644 --- a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dbus-factory"; version = "3.1.17"; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix index 608096951b60..b052a1042403 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix @@ -23,7 +23,6 @@ }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "dde-api"; version = "3.18.4.1"; @@ -114,7 +113,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix index 0d25d9083ebb..427cb1249c90 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix @@ -3,7 +3,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-calendar"; version = "1.2.10"; @@ -38,7 +37,7 @@ mkDerivation rec { -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix index 88c3639ff2e6..0871e004e5f9 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix @@ -7,7 +7,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-control-center"; version = "4.10.11"; @@ -100,7 +99,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Control panel of Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix index 4fb0272a3cef..19089a6b050e 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix @@ -7,7 +7,6 @@ deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "dde-daemon"; version = "3.27.2.6"; @@ -122,7 +121,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-dock/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-dock/default.nix index 21c8221bd13b..fc25d007f200 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-dock/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-dock/default.nix @@ -6,7 +6,6 @@ let unwrapped = mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-dock"; version = "4.10.3"; @@ -69,7 +68,7 @@ unwrapped = mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Dock for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix index 3580eeb43045..081c93a65c86 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -9,7 +9,6 @@ xdg-user-dirs, xorg, zlib, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-file-manager"; version = "4.8.6.4"; @@ -239,7 +238,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "File manager and desktop module for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix index f8a05b869802..b36d87604e74 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix @@ -4,7 +4,6 @@ which, xdg_utils, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-launcher"; version = "4.6.13"; @@ -64,7 +63,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Desktop Environment launcher module"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix index 4fd08749ee49..5397439949b3 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -2,7 +2,6 @@ dde-qt-dbus-factory, proxychains, which, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-network-utils"; version = "0.1.4"; @@ -42,7 +41,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin network utils"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix index d1f1bed2775a..9d181c188d4d 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -2,7 +2,6 @@ dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-polkit-agent"; version = "0.2.10"; @@ -39,7 +38,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "PolicyKit agent for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 0d063cbd8485..a0e1e35ad859 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, qmake, python3, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; version = "1.1.5"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix index 8302e8e97bcd..d6713fb3688e 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -6,7 +6,6 @@ xkeyboard_config, xorg, xrandr, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-session-ui"; version = "4.9.12"; @@ -115,7 +114,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix index c768fa60ce70..619c66d9f5f8 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix @@ -2,7 +2,6 @@ dtkcore, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-anything"; version = "0.1.0"; @@ -52,7 +51,7 @@ mkDerivation rec { searchHardCodedPaths $modsrc # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin file search tool"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-calculator/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-calculator/default.nix index 51f0b666cb1e..97d2b53da70a 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -2,7 +2,6 @@ dtkwidget, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-calculator"; version = "1.0.11"; @@ -37,7 +36,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Easy to use calculator for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix index f43909f37dc1..ba826eb9063f 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-desktop-base"; version = "2019.06.19"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 5849bc78ac0b..b6c20ef71297 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -2,7 +2,6 @@ deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; version = "3.13.6"; @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index d9a6f3701688..f4f4ae2971a4 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-gettext-tools"; version = "1.0.8"; @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 469a43efe329..4c0643a7ce5c 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-gtk-theme"; version = "17.10.11"; @@ -16,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin GTK Theme"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix index c5cf9e9ad3a8..8ecb25f5a2e7 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-icon-theme"; version = "15.12.71"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 89ef62475047..733f4846f5cf 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -4,7 +4,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-image-viewer"; version = "1.3.17"; @@ -42,7 +41,7 @@ mkDerivation rec { -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix index 4292fb2d212b..9aef8a15eb94 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix @@ -2,7 +2,6 @@ qt5integration, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-menu"; version = "3.4.8"; @@ -35,7 +34,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin menu service"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix index a4aede5857c9..18f542233019 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -4,7 +4,6 @@ deepin, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-metacity"; version = "3.22.24"; @@ -54,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "2D window manager for Deepin"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 6e14f0fd804e..046f589263bd 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -3,7 +3,6 @@ libdvdnav, libdvdread, xorg, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-movie-reborn"; version = "3.2.24"; @@ -45,7 +44,7 @@ mkDerivation rec { sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin movie player"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix index 83afe1ee24f7..9f2e8068d555 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -5,7 +5,6 @@ deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-mutter"; version = "3.20.38"; @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Base window manager for deepin, fork of gnome mutter"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix index 256744828db8..e77aa5e68c63 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -3,7 +3,6 @@ deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-screenshot"; version = "4.2.1"; @@ -49,7 +48,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 8c482d534052..62c6c7ed9259 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -2,7 +2,6 @@ qt5integration, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-shortcut-viewer"; version = "1.3.5"; @@ -26,7 +25,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix index bb752cc1ca90..398be55398bf 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-sound-theme"; version = "15.10.3"; @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin sound theme"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix index 51156554f999..59789bd84bbe 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -5,7 +5,6 @@ libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-terminal"; version = "3.2.6"; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Default terminal emulator for Deepin"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix index 1fe930ea490d..299db5336746 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-turbo"; version = "0.0.3"; @@ -32,7 +31,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "A daemon that helps to launch applications faster"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix index f99974ba9c26..e822cf6269dd 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, dde-api, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-wallpapers"; version = "1.7.7"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix index 986bee2f0dd2..13b115e7042f 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix @@ -4,7 +4,6 @@ deepin-desktop-schemas, wrapGAppsHook, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-wm"; version = "1.9.38"; @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Window Manager"; diff --git a/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index 4baa2262cd6e..f645be0f4d9b 100644 --- a/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -2,7 +2,6 @@ dde-polkit-agent, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dpa-ext-gnomekeyring"; version = "0.1.0"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GNOME keyring extension for dde-polkit-agent"; diff --git a/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix index 2a527e3cc19c..2ed10f993681 100644 --- a/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkcore"; version = "2.0.14"; @@ -43,7 +42,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin tool kit core modules"; diff --git a/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix index 8487509e73b2..54c4163fcd1d 100644 --- a/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix @@ -3,7 +3,6 @@ dde-qt-dbus-factory, dtkcore, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkwidget"; version = "2.0.14"; @@ -41,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/nixpkgs/pkgs/desktops/deepin/dtkwm/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkwm/default.nix index c05eedd8857a..4807c3d312b5 100644 --- a/nixpkgs/pkgs/desktops/deepin/dtkwm/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dtkwm/default.nix @@ -2,7 +2,6 @@ deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkwm"; version = "2.0.11"; @@ -31,7 +30,7 @@ mkDerivation rec { "LIB_INSTALL_DIR=${outRef}/lib" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix index 044d5e2a2eaf..1d97991dffd0 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-dbus-factory"; version = "0.9.0"; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix index 92cf3960c736..2c63fd5ebe62 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, go, go-lib, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-dbus-generator"; version = "0.6.6"; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; diff --git a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix index 4b79969970a8..68504d756b17 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -2,7 +2,6 @@ libgudev, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-gir-generator"; version = "2.0.2"; @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; diff --git a/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix b/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix index 6f3a851eb2f1..fff92b595f8b 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix @@ -2,7 +2,6 @@ mobile-broadband-provider-info, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-lib"; version = "1.10.2"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { rm -r $out/share/go/src/pkg.deepin.io/lib/debian ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; diff --git a/nixpkgs/pkgs/desktops/deepin/qcef/default.nix b/nixpkgs/pkgs/desktops/deepin/qcef/default.nix index b275174fa9f1..ffbc230d2e2a 100644 --- a/nixpkgs/pkgs/desktops/deepin/qcef/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/qcef/default.nix @@ -39,7 +39,6 @@ let in mkDerivation rec { - name = "${pname}-${version}"; pname = "qcef"; version = "1.1.6"; @@ -91,7 +90,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt5 binding of Chromium Embedded Framework"; diff --git a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index f2e6eb0d1233..d76bed1b9b7b 100644 --- a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -2,7 +2,6 @@ mtdev, cairo, deepin, qtbase }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; version = "1.2.2"; @@ -31,7 +30,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; diff --git a/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix index 8302e701b386..97e60be6d678 100644 --- a/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix @@ -3,7 +3,6 @@ qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qt5integration"; version = "0.3.12"; @@ -41,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; diff --git a/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix b/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix index e7f735a4256a..51c38f6d3474 100644 --- a/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "udisks2-qt5"; version = "0.0.1"; @@ -29,7 +28,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "UDisks2 D-Bus interfaces binding for Qt5"; diff --git a/nixpkgs/pkgs/desktops/enlightenment/econnman.nix b/nixpkgs/pkgs/desktops/enlightenment/econnman.nix index 8e73682065d3..93b0cb59650b 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/econnman.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/econnman.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { - name = "econnman-${version}"; + pname = "econnman"; version = "1.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; + url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.gz"; sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; diff --git a/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix b/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix index 07aac3d611b7..b2a9d3987097 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa, - xkeyboard_config, pcre + xkeyboard_config, pcre, + + bluetoothSupport ? true, bluez5, + pulseSupport ? !stdenv.isDarwin, libpulseaudio, }: stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.22.4"; + pname = "enlightenment"; + version = "0.23.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq"; }; nativeBuildInputs = [ @@ -36,8 +39,11 @@ stdenv.mkDerivation rec { pcre mesa xkeyboard_config - ] ++ - stdenv.lib.optionals stdenv.isLinux [ libcap ]; + ] + ++ stdenv.lib.optional stdenv.isLinux libcap + ++ stdenv.lib.optional bluetoothSupport bluez5 + ++ stdenv.lib.optional pulseSupport libpulseaudio + ; patches = [ # Some programs installed by enlightenment (to set the cpu frequency, diff --git a/nixpkgs/pkgs/desktops/enlightenment/ephoto.nix b/nixpkgs/pkgs/desktops/enlightenment/ephoto.nix index 409b3f7bb8dd..f1455f68338f 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/ephoto.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/ephoto.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { - name = "ephoto-${version}"; + pname = "ephoto"; version = "1.5"; src = fetchurl { - url = "http://www.smhouston.us/stuff/${name}.tar.gz"; + url = "http://www.smhouston.us/stuff/${pname}-${version}.tar.gz"; sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb"; }; diff --git a/nixpkgs/pkgs/desktops/enlightenment/rage.nix b/nixpkgs/pkgs/desktops/enlightenment/rage.nix index a1de3f951312..8d99ce6e8e0e 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/rage.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/rage.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "rage-${version}"; - version = "0.3.0"; + pname = "rage"; + version = "0.3.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz"; - sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "04fdk23bbgvni212zrfy4ndg7vmshbsjgicrhckdvhay87pk9i75"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index 31dd985af2a7..7d8365337aa8 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation rec { ver_maj = "2.32"; ver_min = "0"; version = "${ver_maj}.${ver_min}"; - name = "gnome-python-desktop-${version}"; + pname = "gnome-python-desktop"; src = fetchurl { url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # gnome-python-desktop expects that .pth file is already installed by PyGTK # in the same directory. This is not the case for Nix. postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth + echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 03440c02c14f..87d2931d2744 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "2.10.5"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2"; + url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2"; sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index ac9a87299ab8..10b99e4eb5d2 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "9ae8768"; version = "5.4"; - name = "mail-notification-${version}"; + pname = "mail-notification"; src = fetchFromGitHub { inherit rev; diff --git a/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix index df3de11e738d..1a1848491b16 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }: stdenv.mkDerivation rec { - name = "gconf-${version}"; + pname = "gconf"; version = "3.2.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 3ea04048accc..33c2abef0fab 100644 --- a/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/nixpkgs/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "4.10.0"; - name = "gtkhtml-${version}"; + pname = "gtkhtml"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz"; sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix index f21e81237b26..b18e58f6f56f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -5,11 +5,11 @@ , adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { - name = "cheese-${version}"; + pname = "cheese"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 733b8ecca920..267a7f2f7d20 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -2,11 +2,11 @@ , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { - name = "file-roller-${version}"; + pname = "file-roller"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix index 2dcd265e2e48..35d97a87a86f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -5,11 +5,11 @@ , gnome3, gspell, perl, itstool, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gedit-${version}"; + pname = "gedit"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix index 4424eb4a3fd4..92b38ed5eee4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -4,11 +4,11 @@ , gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "glade-${version}"; + pname = "glade"; version = "3.22.1"; src = fetchurl { - url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 2a308a2da450..27ce5d0f078b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -11,10 +11,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-boxes-${version}"; + pname = "gnome-boxes"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index d2845bef2a13..38182f1f994f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -5,11 +5,11 @@ , gnome3, gdk-pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { - name = "gnome-clocks-${version}"; + pname = "gnome-clocks"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index e8796d49e9a1..1301381e5aaf 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -7,11 +7,11 @@ , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-documents-${version}"; + pname = "gnome-documents"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 4c215d347299..655e9e9fe34d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "gnome-getting-started-docs-${version}"; + pname = "gnome-getting-started-docs"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index d46882deb41e..8681a3c866ce 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -2,11 +2,11 @@ , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-logs-${version}"; + pname = "gnome-logs"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 4a34f12912f7..5978fb217e87 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -7,7 +7,8 @@ let version = "3.32.2"; in stdenv.mkDerivation rec { - name = "gnome-notes-${version}"; + pname = "gnome-notes"; + inherit version; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index d21cfcfd72d2..1e5a641f08fd 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -2,11 +2,11 @@ , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-weather-${version}"; + pname = "gnome-weather"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix index ae360d73b879..c5377157ef0c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -2,11 +2,11 @@ , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { - name = "vinagre-${version}"; + pname = "vinagre"; version = "3.22.0"; src = fetchurl { - url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 9ef94adcbd09..a7f4a637b178 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -2,11 +2,11 @@ , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "adwaita-icon-theme-${version}"; + pname = "adwaita-icon-theme"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix index 73c3f65a968a..5e4bbf8cce17 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -10,11 +10,11 @@ , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { - name = "empathy-${version}"; + pname = "empathy"; version = "3.25.90"; src = fetchurl { - url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix index 7b7b7f64aa4d..85f31bfdce5d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -5,11 +5,11 @@ , gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }: stdenv.mkDerivation rec { - name = "epiphany-${version}"; + pname = "epiphany"; version = "3.32.4"; src = fetchurl { - url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 078145e1231f..dda45a71fe20 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ , glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "evolution-data-server-${version}"; + pname = "evolution-data-server"; version = "3.32.4"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \ + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \ --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas" patches="$patches $PWD/hardcode-gsettings.patch" ''; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix index 420a0d3e6b11..a4d2fd2be5a5 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -4,11 +4,11 @@ , librsvg, coreutils, xwayland }: stdenv.mkDerivation rec { - name = "gdm-${version}"; + pname = "gdm"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix index 4e43d5f9d50c..303377b8631a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -3,11 +3,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "gjs-${version}"; + pname = "gjs"; version = "1.56.2"; src = fetchurl { - url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 1e332502db5d..e4c772cb1d40 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: stdenv.mkDerivation rec { - name = "gnome-backgrounds-${version}"; + pname = "gnome-backgrounds"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 9214aa0a9a79..df43371a4971 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -3,11 +3,11 @@ , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-calculator-${version}"; + pname = "gnome-calculator"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix index d0ab339a504d..f2eb65e50bbf 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { - name = "gnome-common-${version}"; + pname = "gnome-common"; version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 57cb90c7c458..75a15a41f97b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -7,10 +7,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-contacts-${version}"; + pname = "gnome-contacts"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 4beeb190f025..9d798c2811bd 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -3,13 +3,13 @@ , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-desktop-${version}"; + pname = "gnome-desktop"; version = "3.32.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 613de6c3c164..98398311882b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -3,11 +3,11 @@ , gnome3, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-dictionary-${version}"; + pname = "gnome-dictionary"; version = "3.26.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 8e09b152e83a..d6d9f9272528 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -4,11 +4,11 @@ , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - name = "gnome-disk-utility-${version}"; + pname = "gnome-disk-utility"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 317c7e915841..976829acd4c6 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -3,11 +3,11 @@ , wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { - name = "gnome-font-viewer-${version}"; + pname = "gnome-font-viewer"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index f36d3f4a6e0a..4148843d4ab7 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -3,11 +3,11 @@ , docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-keyring-${version}"; + pname = "gnome-keyring"; version = "3.31.91"; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index ed4c1a3da13a..93da1f8abec9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -3,11 +3,11 @@ , tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-online-miners-${version}"; + pname = "gnome-online-miners"; version = "3.30.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 38adf7137f76..f13ad9f47aa6 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -3,11 +3,11 @@ , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: stdenv.mkDerivation rec { - name = "gnome-session-${version}"; + pname = "gnome-session"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 6929f821e379..b9f33ce73a8a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -95,6 +95,12 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + NIX_CFLAGS_COMPILE = [ + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; + # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper postFixup = '' mkdir -p $out/bin/gnome-settings-daemon diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 21281f15a5c1..761216600120 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -2,11 +2,11 @@ , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { - name = "gnome-shell-extensions-${version}"; + pname = "gnome-shell-extensions"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/ + schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/ glib-compile-schemas $schemadir diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 1363cf6d6695..a1d8f2c599a8 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -13,11 +13,11 @@ let pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { - name = "gnome-shell-${version}"; + pname = "gnome-shell"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 6d4875979007..12081bbae5b0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { - name = "gnome-software-${version}"; + pname = "gnome-software"; version = "3.32.4"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 5c332c4135c5..a9f8367a5484 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -3,11 +3,11 @@ , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { - name = "gnome-system-monitor-${version}"; + pname = "gnome-system-monitor"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index c9f5229f8701..75d4b117e778 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -3,11 +3,11 @@ , desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-terminal-${version}"; + pname = "gnome-terminal"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 1a8582626e3a..7915e71a73c0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - name = "gnome-user-docs-${version}"; + pname = "gnome-user-docs"; version = "3.32.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index cfdda920e27c..56104aff4840 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gnome3 }: stdenv.mkDerivation rec { - name = "unicode-data-${version}"; + pname = "unicode-data"; version = "12.0.0"; srcs = [ (fetchurl { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 4f57c5247d97..de56b14d46fd 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,11 +3,11 @@ , libxml2, sane-backends, vala, gnome3, gobject-introspection }: stdenv.mkDerivation rec { - name = "simple-scan-${version}"; + pname = "simple-scan"; version = "3.32.2.1"; src = fetchurl { - url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix index 5554dbdfe302..86675f21f06a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -4,11 +4,11 @@ , gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }: stdenv.mkDerivation rec { - name = "sushi-${version}"; + pname = "sushi"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix index 4953b7ec7a82..a5388f2eae19 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix @@ -6,11 +6,11 @@ , gdk-pixbuf, tracker, nautilus, xvfb_run }: stdenv.mkDerivation rec { - name = "totem-${version}"; + pname = "totem"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index aac216262584..43863bf7f856 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - name = "yelp-tools-${version}"; + pname = "yelp-tools"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index f1a393117280..fc5b0268df70 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -2,11 +2,11 @@ , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { - name = "yelp-xsl-${version}"; + pname = "yelp-xsl"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix index 24a49413960c..7e326dd1657d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -4,11 +4,11 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "yelp-${version}"; + pname = "yelp"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix index 89d0fd7a3b90..5023ffce6b96 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -2,11 +2,11 @@ , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "zenity-${version}"; + pname = "zenity"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index d1e5179063f3..573259b7e7d0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -3,11 +3,11 @@ itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { - name = "anjuta-${version}"; + pname = "anjuta"; version = "3.28.0"; src = fetchurl { - url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 80a3770b7030..23a58011e027 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -3,11 +3,11 @@ , webkitgtk, gettext, itstool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "devhelp-${version}"; + pname = "devhelp"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 647e7163d0b9..81f63941729f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "gnome-devel-docs-${version}"; + pname = "gnome-devel-docs"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index 9fbce7c6cc02..7ebacc99c522 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -3,11 +3,11 @@ gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "nemiver-${version}"; + pname = "nemiver"; version = "0.9.6"; src = fetchurl { - url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 568a6cace720..6f289fd74d9f 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-appindicator-${version}"; + pname = "gnome-shell-extension-appindicator"; version = "29"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index afedd5f98e1a..b7bde83915c1 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-battery-status-${version}"; + pname = "gnome-shell-extension-battery-status"; version = "6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index e627bec8b931..95a68505c7c8 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext, bash }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-caffeine-${version}"; + pname = "gnome-shell-extension-caffeine"; version = "unstable-2019-04-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 755c8e1b02fb..b4b184d4fa03 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -5,10 +5,11 @@ let inherit (python3.pkgs) python pygobject3 requests; in stdenv.mkDerivation rec { - name = "chrome-gnome-shell-${version}"; + pname = "chrome-gnome-shell"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index e41227e85139..0faadbcd2b68 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-clipboard-indicator-${version}"; + pname = "gnome-shell-extension-clipboard-indicator"; version = "30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 06e7d27c5444..e80149e50053 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-dash-to-dock-${version}"; + pname = "gnome-shell-dash-to-dock"; version = "66"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 0d48b8359c91..30f9ad7d2ab1 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-dash-to-panel-${version}"; + pname = "gnome-shell-dash-to-panel"; version = "19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index dd2a02b6be85..0d9d54167ff2 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -3,7 +3,7 @@ , glib, gtk3, at-spi2-core, upower, openssh, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-gsconnect-${version}"; + pname = "gnome-shell-gsconnect"; version = "23"; src = fetchFromGitHub { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" - "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas" + "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" "-Dopenssl_path=${openssl}/bin/openssl" diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index d08e6f3a57df..8214300a5311 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-icon-hider-${version}"; + pname = "gnome-shell-extension-icon-hider"; version = "23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience.nix index 24b4c1cf703f..b36f3489b57c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/impatience.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-impatience-${version}"; + pname = "gnome-shell-impatience"; version = "0.4.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix index 686d7be91a47..f09822415a6e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extensions-mediaplayer-${version}"; + pname = "gnome-shell-extensions-mediaplayer"; version = "unstable-2019-03-21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index 8c075a11bdcd..f9f72bd77f02 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-no-title-bar-${version}"; + pname = "gnome-shell-extension-no-title-bar"; version = "9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix index 21ff70140be1..e2b5288e8869 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-nohotcorner-${version}"; + pname = "gnome-shell-extension-nohotcorner"; version = "19.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index 5faa55652d8a..d9ea670db09e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-remove-dropdown-arrows-${version}"; + pname = "gnome-shell-extension-remove-dropdown-arrows"; version = "11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 7046e6737269..285733d5f7c9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }: stdenv.mkDerivation rec { - name = "gnome-shell-system-monitor-${version}"; + pname = "gnome-shell-system-monitor"; version = "36"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index c72d72cce126..745541b7cf43 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-taskwhisperer-${version}"; + pname = "gnome-shell-extension-taskwhisperer"; version = "12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix index 604b7433ccb4..f841ef2403dc 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-timepp-${version}"; + pname = "gnome-shell-extension-timepp"; version = "unstable-2019-03-30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 9a151a6ac8f7..f0f6279fe2ee 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-topicons-plus-${version}"; + pname = "gnome-shell-extension-topicons-plus"; version = "22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/volume-mixer.nix index 19ced0b5252c..072d31b84fed 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/volume-mixer.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/volume-mixer.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-volume-mixer-${version}"; + pname = "gnome-shell-volume-mixer"; version = "844ed80ad448855d8f6218847183a80474b523c7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-grid.nix index 10aee5cafe6e..811e9911f628 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-grid.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-grid.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-workspace-grid-${version}"; + pname = "gnome-shell-workspace-grid"; version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 21f089b324ef..b4c6eaaec1bf 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -2,11 +2,11 @@ , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { - name = "five-or-more-${version}"; + pname = "five-or-more"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 94428d6640d0..5b233c48385d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -3,11 +3,11 @@ , python3, ninja, desktop-file-utils }: stdenv.mkDerivation rec { - name = "four-in-a-row-${version}"; + pname = "four-in-a-row"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index c6c24be4be8c..d7001e1c5279 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -2,11 +2,11 @@ , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { - name = "gnome-chess-${version}"; + pname = "gnome-chess"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index ee55b5a65a5d..9d173945cdd8 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-mahjongg-${version}"; + pname = "gnome-mahjongg"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index b2c8e99e8239..1ac7e51357eb 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -2,11 +2,11 @@ , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gnome-mines-${version}"; + pname = "gnome-mines"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 3bea240ecb97..7b0699221696 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -3,11 +3,11 @@ , libxml2, libgee, libgnome-games-support }: stdenv.mkDerivation rec { - name = "gnome-nibbles-${version}"; + pname = "gnome-nibbles"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 2b40548d37ce..46723867f8ad 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -3,11 +3,11 @@ , libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-robots-${version}"; + pname = "gnome-robots"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 5c3fafd3d02a..a555ee31cf37 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -2,11 +2,11 @@ , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gnome-sudoku-${version}"; + pname = "gnome-sudoku"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 06914d9817c7..b6c60362265d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-taquin-${version}"; + pname = "gnome-taquin"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index ab0f0f0faf2d..291415302116 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-tetravex-${version}"; + pname = "gnome-tetravex"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix index 86a1bd6485be..114551ed4ee1 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "iagno-${version}"; + pname = "iagno"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 5801c2935632..9c582f037a25 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -3,11 +3,11 @@ , meson, ninja, python3 }: stdenv.mkDerivation rec { - name = "lightsoff-${version}"; + pname = "lightsoff"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix index f0da625316fa..f196ada38504 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "tali-${version}"; + pname = "tali"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index c80c8b977cf5..c8d26988391d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-autoar-${version}"; + pname = "gnome-autoar"; version = "0.2.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index d819961d2819..ea9a79de40e4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -2,11 +2,11 @@ , gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-packagekit-${version}"; + pname = "gnome-packagekit"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix index a35067587e04..d8a78686e491 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.32.0"; - name = "gpaste-${version}"; + pname = "gpaste"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/libgpaste/settings/gpaste-settings.c \ - --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas" + --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 543453a2bd31..a607a6eb6a07 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -2,11 +2,11 @@ , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gtkhtml-${version}"; + pname = "gtkhtml"; version = "4.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; diff --git a/nixpkgs/pkgs/desktops/gnustep/make/default.nix b/nixpkgs/pkgs/desktops/gnustep/make/default.nix index 6ef87cece4e4..5e7db35a7276 100644 --- a/nixpkgs/pkgs/desktops/gnustep/make/default.nix +++ b/nixpkgs/pkgs/desktops/gnustep/make/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "gnustep-make-${version}"; + pname = "gnustep-make"; + inherit version; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxmenu-data.nix b/nixpkgs/pkgs/desktops/lxde/core/lxmenu-data.nix index 6e8644b19b0c..550e98c9dcc8 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "lxmenu-data-${version}"; + pname = "lxmenu-data"; version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; }; diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix index ca601531b68f..104ab20835fa 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }: stdenv.mkDerivation rec { - name = "lxtask-${version}"; + pname = "lxtask"; version = "0.1.9"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1"; }; diff --git a/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix b/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix index c1b29b161254..df717debbae8 100644 --- a/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,7 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qlipper"; version = "5.1.1"; diff --git a/nixpkgs/pkgs/desktops/mate/atril/default.nix b/nixpkgs/pkgs/desktops/mate/atril/default.nix index 5ef080ef50be..15dea9b10184 100644 --- a/nixpkgs/pkgs/desktops/mate/atril/default.nix +++ b/nixpkgs/pkgs/desktops/mate/atril/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "atril-${version}"; + pname = "atril"; version = "1.22.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190"; }; diff --git a/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix index 108e8fe1e0b1..ba21cb00d35d 100644 --- a/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix +++ b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "caja-extensions-${version}"; + pname = "caja-extensions"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p"; }; diff --git a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index 8fad6cac8799..675648363f52 100644 --- a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "engrampa-${version}"; + pname = "engrampa"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06z38vfs15f5crrrgvcsqfb557fhpq1mqkj5fd9wb0hvi77hasrk"; }; diff --git a/nixpkgs/pkgs/desktops/mate/eom/default.nix b/nixpkgs/pkgs/desktops/mate/eom/default.nix index 72e509d59afd..cc683ab2db21 100644 --- a/nixpkgs/pkgs/desktops/mate/eom/default.nix +++ b/nixpkgs/pkgs/desktops/mate/eom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "eom-${version}"; + pname = "eom"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4"; }; diff --git a/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix index bd6488d2c2ce..d6709c375e6d 100644 --- a/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix +++ b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: stdenv.mkDerivation rec { - name = "libmatekbd-${version}"; + pname = "libmatekbd"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"; }; diff --git a/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix b/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix index bf2a91971dd9..17fee5d61cbe 100644 --- a/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix +++ b/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "libmatemixer-${version}"; + pname = "libmatemixer"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"; }; diff --git a/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix index 664b85fc287b..e4976f71ae68 100644 --- a/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix +++ b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { - name = "libmateweather-${version}"; + pname = "libmateweather"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a"; }; diff --git a/nixpkgs/pkgs/desktops/mate/marco/default.nix b/nixpkgs/pkgs/desktops/mate/marco/default.nix index 4f77b3035015..9899256018a8 100644 --- a/nixpkgs/pkgs/desktops/mate/marco/default.nix +++ b/nixpkgs/pkgs/desktops/mate/marco/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "marco-${version}"; + pname = "marco"; version = "1.22.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix index 7fbd192ac2ca..ec7ad2b4294d 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-applets-${version}"; + pname = "mate-applets"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix index f5c151d01f7f..2667c25959e6 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "mate-backgrounds-${version}"; + pname = "mate-backgrounds"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix index 85631f03e1d4..64ede5101c75 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-calc-${version}"; + pname = "mate-calc"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-common/default.nix b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix index 3b154fd9812a..f85dd632bd16 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-common/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mate-common-${version}"; + pname = "mate-common"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix index 6e54b137ba1d..a06c24b9c728 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mate-control-center-${version}"; + pname = "mate-control-center"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix index 0bfcab586635..58515a492b5c 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-desktop-${version}"; + pname = "mate-desktop"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index ba0cbd526f96..7db01f598164 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "mate-icon-theme-faenza-${version}"; + pname = "mate-icon-theme-faenza"; version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix index 8f0f15fac2dd..9df0d0ce5a88 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3 }: stdenv.mkDerivation rec { - name = "mate-icon-theme-${version}"; + pname = "mate-icon-theme"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix b/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix index 623e7f240964..e1a6e874d1d6 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-indicator-applet-${version}"; + pname = "mate-indicator-applet"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix index 7185181d7476..93c765a99533 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-media-${version}"; + pname = "mate-media"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix b/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix index bb09b0a4849d..e37a270f9dca 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { - name = "mate-menus-${version}"; + pname = "mate-menus"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix index 049e0a4bb69a..51d23e475ff3 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-netbook-${version}"; + pname = "mate-netbook"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00n162bskbvxhy4k2w14f9zwlsg3wgi43228ssx7sc2p95psmm64"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix index 45d483503aa7..d53ae8efa356 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -2,11 +2,11 @@ libnotify, libwnck3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-notification-daemon-${version}"; + pname = "mate-notification-daemon"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index bbb49c203472..39d2c1812cbc 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-panel-${version}"; + pname = "mate-panel"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix index f5b6d62dd590..253472e3987e 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { - name = "mate-polkit-${version}"; + pname = "mate-polkit"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index 7f4d1c850151..6ba6ac205ce1 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-power-manager-${version}"; + pname = "mate-power-manager"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix index 53a89bec4c1e..d1c1e481d700 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-screensaver-${version}"; + pname = "mate-screensaver"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix b/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix index c5ad4628c54f..bd9ed9f6cbe7 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-sensors-applet-${version}"; + pname = "mate-sensors-applet"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix index 3448e8327f5b..b7735ec77fec 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mate-session-manager-${version}"; + pname = "mate-session-manager"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix index 00d967a2d5cf..5ee995402ecd 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,11 +4,11 @@ wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-settings-daemon-${version}"; + pname = "mate-settings-daemon"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix index f7cdf036cebf..6f5993cfc353 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-system-monitor-${version}"; + pname = "mate-system-monitor"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix index 2339ad8fb1b3..7ec9944aa0e1 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-terminal-${version}"; + pname = "mate-terminal"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix index a4724049f7c1..9ed5515ea3e7 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix @@ -2,11 +2,11 @@ gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { - name = "mate-themes-${version}"; + pname = "mate-themes"; version = "3.22.20"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix index eae425b18920..a9a0e1712312 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, itstool, libxml2, yelp }: stdenv.mkDerivation rec { - name = "mate-user-guide-${version}"; + pname = "mate-user-guide"; version = "1.22.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix b/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix index f152515d60e9..999bee2e5d10 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-user-share-${version}"; + pname = "mate-user-share"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix index 606a473cfaac..7775173611e2 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-utils-${version}"; + pname = "mate-utils"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0768y6x33ljc9dxjlfmvplsn4lrxj5xhjddbyab9h6pqav8527rg"; }; diff --git a/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/nixpkgs/pkgs/desktops/mate/pluma/default.nix index 171d8971c4e8..cfbe33dd380d 100644 --- a/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "pluma-${version}"; + pname = "pluma"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "14d5c5fg31d7br9h1y3gdcr53j4sxlgybf326jvdcw8mgy91k3dg"; }; diff --git a/nixpkgs/pkgs/desktops/mate/python-caja/default.nix b/nixpkgs/pkgs/desktops/mate/python-caja/default.nix index c3b39e85925d..42a8e328a161 100644 --- a/nixpkgs/pkgs/desktops/mate/python-caja/default.nix +++ b/nixpkgs/pkgs/desktops/mate/python-caja/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { - name = "python-caja-${version}"; + pname = "python-caja"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zwdjvxci72j0181nlfq6912lw3aq8j3746brlp7wlzn22qp7b0k"; }; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index a03594b7b18b..3b85b123fd03 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,4 +1,5 @@ { stdenv +, substituteAll , fetchFromGitHub , pantheon , meson @@ -9,6 +10,7 @@ , granite , gtk3 , switchboard +, onboard }: stdenv.mkDerivation rec { @@ -22,6 +24,13 @@ stdenv.mkDerivation rec { sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit onboard; + }) + ]; + passthru = { updateScript = pantheon.updateScript { repoName = pname; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch new file mode 100644 index 000000000000..4d69390f39d9 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Panes/Typing.vala b/src/Panes/Typing.vala +index b4ae8b0..5b8fd7e 100644 +--- a/src/Panes/Typing.vala ++++ b/src/Panes/Typing.vala +@@ -83,7 +83,7 @@ public class Accessibility.Panes.Typing : Categories.Pane { + + onboard_settings_label.clicked.connect (() => { + try { +- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE); ++ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE); + appinfo.launch (null, null); + } catch (Error e) { + warning ("%s\n", e.message); diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index c262fb37dbc5..df12fba645f2 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -7,6 +7,7 @@ , gnome-session , wingpanel , orca +, onboard , at-spi2-core , elementary-default-settings , writeShellScriptBin @@ -85,9 +86,9 @@ stdenv.mkDerivation rec { cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list mkdir -p $out/etc/xdg/autostart - cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart - cp -av ${orca}/etc/xdg/autostart/* $out/etc/xdg/autostart - cp -av ${at-spi2-core}/etc/xdg/autostart/* $out/etc/xdg/autostart + for package in ${gnome-keyring} ${orca} ${onboard} ${at-spi2-core}; do + cp -av $package/etc/xdg/autostart/* $out/etc/xdg/autostart + done cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 8381796c4561..67a67dd4b3d2 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -150,6 +150,12 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + NIX_CFLAGS_COMPILE = [ + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; + passthru = { updateScript = gnome3.updateScript { packageName = repoName; diff --git a/nixpkgs/pkgs/desktops/plasma-5/default.nix b/nixpkgs/pkgs/desktops/plasma-5/default.nix index d1bd9e957f71..07c6805c689a 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -86,7 +86,7 @@ let lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; homepage = http://www.kde.org; } // (args.meta or {}); in diff --git a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index 034b57ec06a3..4efd493a3dd7 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.4/ ) diff --git a/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix b/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix index 150b97be50d7..01e740f74c4b 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, - knewstuff, libksysguard, qtwebkit + knewstuff, libksysguard }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n lm_sensors qtwebkit + kdelibs4support ki18n lm_sensors ]; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix b/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix index 1cbfb87ea563..b4fd032cf1f7 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }: +{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }: mkDerivation { name = "kwallet-pam"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ pam socat libgcrypt qtbase ]; + buildInputs = [ pam socat libgcrypt qtbase kwallet ]; postPatch = '' sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; diff --git a/nixpkgs/pkgs/desktops/plasma-5/kwin/xwayland.patch b/nixpkgs/pkgs/desktops/plasma-5/kwin/xwayland.patch index 51f15c87d274..9d405b3bbb86 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kwin/xwayland.patch +++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/xwayland.patch @@ -1,13 +1,13 @@ -Index: kwin-5.7.3/main_wayland.cpp +Index: kwin-5.15.5/xwl/xwayland.cpp =================================================================== ---- kwin-5.7.3.orig/main_wayland.cpp -+++ kwin-5.7.3/main_wayland.cpp -@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe +--- kwin-5.15.5.orig/xwl/xwayland.cpp ++++ kwin-5.15.5/xwl/xwayland.cpp +@@ -143,7 +143,7 @@ void Xwayland::init() - m_xwaylandProcess = new Process(kwinApp()); + m_xwaylandProcess = new Process(this); m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); - m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); + m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND)); - QProcessEnvironment env = m_environment; + QProcessEnvironment env = m_app->processStartupEnvironment(); env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); - m_xwaylandProcess->setProcessEnvironment(env); + env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM")); diff --git a/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix index 0f9fe40d73c3..96d113e11fb6 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, + kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine, qtx11extras }: @@ -15,7 +15,7 @@ mkDerivation { buildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebkit + qtwebengine ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 55a4518021ed..5c27eee5010e 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -2,12 +2,13 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake index 69d3070..52e9102 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ [General] type=image color=#1d99f3 --background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png -+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png + fontSize=10 +-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt index 6a1a212..f03fd34 100644 --- a/startkde/CMakeLists.txt diff --git a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index ac0a3494c226..21dd5c36d78f 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz"; - sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f"; - name = "bluedevil-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz"; + sha256 = "36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521"; + name = "bluedevil-5.16.4.tar.xz"; }; }; breeze = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz"; - sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4"; - name = "breeze-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-5.16.4.tar.xz"; + sha256 = "84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395"; + name = "breeze-5.16.4.tar.xz"; }; }; breeze-grub = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz"; - sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64"; - name = "breeze-grub-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz"; + sha256 = "c36b2183fff7d559ae944881443e0caa03c63bcc81af9f6b21b722109d2e34db"; + name = "breeze-grub-5.16.4.tar.xz"; }; }; breeze-gtk = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz"; - sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8"; - name = "breeze-gtk-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz"; + sha256 = "8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb"; + name = "breeze-gtk-5.16.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz"; - sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8"; - name = "breeze-plymouth-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz"; + sha256 = "7556c8f6bff771f3439036f843309b45594c5e903fc11a3275cc2c38346dec9f"; + name = "breeze-plymouth-5.16.4.tar.xz"; }; }; discover = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz"; - sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854"; - name = "discover-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/discover-5.16.4.tar.xz"; + sha256 = "0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0"; + name = "discover-5.16.4.tar.xz"; }; }; drkonqi = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz"; - sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e"; - name = "drkonqi-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz"; + sha256 = "9d030a59a6d1d732241f8c54a54291ac60584d542ea0b891ca4b2bcb958bd51f"; + name = "drkonqi-5.16.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz"; - sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db"; - name = "kactivitymanagerd-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz"; + sha256 = "a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770"; + name = "kactivitymanagerd-5.16.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz"; - sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace"; - name = "kde-cli-tools-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz"; + sha256 = "56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d"; + name = "kde-cli-tools-5.16.4.tar.xz"; }; }; kdecoration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz"; - sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f"; - name = "kdecoration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz"; + sha256 = "aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4"; + name = "kdecoration-5.16.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz"; - sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185"; - name = "kde-gtk-config-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz"; + sha256 = "c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c"; + name = "kde-gtk-config-5.16.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz"; - sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3"; - name = "kdeplasma-addons-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz"; + sha256 = "4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1"; + name = "kdeplasma-addons-5.16.4.tar.xz"; }; }; kgamma5 = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz"; - sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7"; - name = "kgamma5-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz"; + sha256 = "18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46"; + name = "kgamma5-5.16.4.tar.xz"; }; }; khotkeys = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz"; - sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127"; - name = "khotkeys-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz"; + sha256 = "a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d"; + name = "khotkeys-5.16.4.tar.xz"; }; }; kinfocenter = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz"; - sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8"; - name = "kinfocenter-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz"; + sha256 = "30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426"; + name = "kinfocenter-5.16.4.tar.xz"; }; }; kmenuedit = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz"; - sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26"; - name = "kmenuedit-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz"; + sha256 = "f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2"; + name = "kmenuedit-5.16.4.tar.xz"; }; }; kscreen = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz"; - sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7"; - name = "kscreen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz"; + sha256 = "40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328"; + name = "kscreen-5.16.4.tar.xz"; }; }; kscreenlocker = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz"; - sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd"; - name = "kscreenlocker-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz"; + sha256 = "92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f"; + name = "kscreenlocker-5.16.4.tar.xz"; }; }; ksshaskpass = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz"; - sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e"; - name = "ksshaskpass-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz"; + sha256 = "e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c"; + name = "ksshaskpass-5.16.4.tar.xz"; }; }; ksysguard = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz"; - sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a"; - name = "ksysguard-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz"; + sha256 = "10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5"; + name = "ksysguard-5.16.4.tar.xz"; }; }; kwallet-pam = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz"; - sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e"; - name = "kwallet-pam-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz"; + sha256 = "7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429"; + name = "kwallet-pam-5.16.4.tar.xz"; }; }; kwayland-integration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz"; - sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17"; - name = "kwayland-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz"; + sha256 = "f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace"; + name = "kwayland-integration-5.16.4.tar.xz"; }; }; kwin = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz"; - sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805"; - name = "kwin-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwin-5.16.4.tar.xz"; + sha256 = "71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6"; + name = "kwin-5.16.4.tar.xz"; }; }; kwrited = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz"; - sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510"; - name = "kwrited-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz"; + sha256 = "c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f"; + name = "kwrited-5.16.4.tar.xz"; }; }; libkscreen = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz"; - sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87"; - name = "libkscreen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz"; + sha256 = "f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723"; + name = "libkscreen-5.16.4.tar.xz"; }; }; libksysguard = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz"; - sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0"; - name = "libksysguard-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz"; + sha256 = "b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f"; + name = "libksysguard-5.16.4.tar.xz"; }; }; milou = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz"; - sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9"; - name = "milou-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/milou-5.16.4.tar.xz"; + sha256 = "de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89"; + name = "milou-5.16.4.tar.xz"; }; }; oxygen = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz"; - sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c"; - name = "oxygen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz"; + sha256 = "7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1"; + name = "oxygen-5.16.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz"; - sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b"; - name = "plasma-browser-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz"; + sha256 = "a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef"; + name = "plasma-browser-integration-5.16.4.tar.xz"; }; }; plasma-desktop = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz"; - sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741"; - name = "plasma-desktop-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz"; + sha256 = "990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344"; + name = "plasma-desktop-5.16.4.tar.xz"; }; }; plasma-integration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz"; - sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621"; - name = "plasma-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz"; + sha256 = "d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d"; + name = "plasma-integration-5.16.4.tar.xz"; }; }; plasma-nm = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz"; - sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee"; - name = "plasma-nm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz"; + sha256 = "2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09"; + name = "plasma-nm-5.16.4.tar.xz"; }; }; plasma-pa = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz"; - sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92"; - name = "plasma-pa-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz"; + sha256 = "9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4"; + name = "plasma-pa-5.16.4.tar.xz"; }; }; plasma-sdk = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz"; - sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329"; - name = "plasma-sdk-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz"; + sha256 = "ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403"; + name = "plasma-sdk-5.16.4.tar.xz"; }; }; plasma-tests = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz"; - sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827"; - name = "plasma-tests-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-tests-5.16.4.tar.xz"; + sha256 = "9e0f8fcef080fc1b0ffae01f6b3caa17eccac27445e312243221fcace56d1097"; + name = "plasma-tests-5.16.4.tar.xz"; }; }; plasma-vault = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz"; - sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5"; - name = "plasma-vault-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz"; + sha256 = "8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6"; + name = "plasma-vault-5.16.4.tar.xz"; }; }; plasma-workspace = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz"; - sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973"; - name = "plasma-workspace-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz"; + sha256 = "5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1"; + name = "plasma-workspace-5.16.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz"; - sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945"; - name = "plasma-workspace-wallpapers-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz"; + sha256 = "052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003"; + name = "plasma-workspace-wallpapers-5.16.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz"; - sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa"; - name = "plymouth-kcm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz"; + sha256 = "cf9d3e6f14d012617cc8a5c3381295449e68b1b13209436b561417232d21863f"; + name = "plymouth-kcm-5.16.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.5"; + version = "1-5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz"; - sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267"; - name = "polkit-kde-agent-1-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz"; + sha256 = "917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0"; + name = "polkit-kde-agent-1-5.16.4.tar.xz"; }; }; powerdevil = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz"; - sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06"; - name = "powerdevil-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz"; + sha256 = "40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed"; + name = "powerdevil-5.16.4.tar.xz"; }; }; sddm-kcm = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz"; - sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b"; - name = "sddm-kcm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz"; + sha256 = "340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68"; + name = "sddm-kcm-5.16.4.tar.xz"; }; }; systemsettings = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz"; - sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a"; - name = "systemsettings-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz"; + sha256 = "73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e"; + name = "systemsettings-5.16.4.tar.xz"; }; }; user-manager = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz"; - sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431"; - name = "user-manager-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz"; + sha256 = "3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745"; + name = "user-manager-5.16.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz"; - sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50"; - name = "xdg-desktop-portal-kde-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz"; + sha256 = "3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052"; + name = "xdg-desktop-portal-kde-5.16.4.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 79f0800ff34c..2782decf6c4c 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xfce4-hardware-monitor-plugin"; version = "1.6.0"; src = fetchurl { - url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; + url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2"; sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b"; }; diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index 7134d29c9ffb..f67ba7af8aa9 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: stdenv.mkDerivation rec { - name = "vala-panel-appmenu-xfce-${version}"; + pname = "vala-panel-appmenu-xfce"; version = "0.6.94"; src = "${fetchFromGitHub { diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index 694f6772282b..144291da86d7 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -3,7 +3,7 @@ xfce, libwnck3, libdbusmenu, gobject-introspection }: stdenv.mkDerivation rec { - name = "xfce4-vala-panel-appmenu-plugin-${version}"; + pname = "xfce4-vala-panel-appmenu-plugin"; version = "0.6.94"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix index 2178226ab9d3..827c5137bf8e 100644 --- a/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix +++ b/nixpkgs/pkgs/development/arduino/arduino-mk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.0"; - name = "arduino-mk-${version}"; + pname = "arduino-mk"; src = fetchFromGitHub { owner = "sudar"; diff --git a/nixpkgs/pkgs/development/compilers/abcl/default.nix b/nixpkgs/pkgs/development/compilers/abcl/default.nix index c48b36e5aba5..accedf9a7af7 100644 --- a/nixpkgs/pkgs/development/compilers/abcl/default.nix +++ b/nixpkgs/pkgs/development/compilers/abcl/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "abcl"; version = "1.5.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index a3c34bd7e8e6..305e0f202bf1 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; - rev = "${pname}-${version}"; + rev = "icedtea-web-${version}"; sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; }; diff --git a/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix b/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix index e8759ec073b3..ed6b2b2ff247 100644 --- a/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -7,11 +7,11 @@ let sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f"; }; in stdenv.mkDerivation rec { - name = "apache-flex-sdk-${version}"; + pname = "apache-flex-sdk"; version = "4.16.1"; src = fetchurl { - url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz"; + url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p"; }; diff --git a/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix index ad68382c13ae..3058e926c3f9 100644 --- a/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix @@ -3,7 +3,7 @@ with builtins; stdenv.mkDerivation rec { - name = "arachne-pnr-${version}"; + pname = "arachne-pnr"; version = "2018.09.09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/as31/default.nix b/nixpkgs/pkgs/development/compilers/as31/default.nix index 519992fd8c26..b70fde00e15e 100644 --- a/nixpkgs/pkgs/development/compilers/as31/default.nix +++ b/nixpkgs/pkgs/development/compilers/as31/default.nix @@ -5,7 +5,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "as31-${version}"; + pname = "as31"; + inherit version; src = fetchurl { name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/compilers/asn1c/default.nix b/nixpkgs/pkgs/development/compilers/asn1c/default.nix index ce754813dda1..3cbb7577f34c 100644 --- a/nixpkgs/pkgs/development/compilers/asn1c/default.nix +++ b/nixpkgs/pkgs/development/compilers/asn1c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "asn1c-${version}"; + pname = "asn1c"; version = "0.9.28"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/ats/default.nix b/nixpkgs/pkgs/development/compilers/ats/default.nix index 002f34daa13b..f086c36468d7 100644 --- a/nixpkgs/pkgs/development/compilers/ats/default.nix +++ b/nixpkgs/pkgs/development/compilers/ats/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "ats-${version}"; + pname = "ats"; version = "0.2.12"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/ats2/default.nix b/nixpkgs/pkgs/development/compilers/ats2/default.nix index df61ea2b791c..a1e5927e349f 100644 --- a/nixpkgs/pkgs/development/compilers/ats2/default.nix +++ b/nixpkgs/pkgs/development/compilers/ats2/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - name = "ats2-${version}"; + pname = "ats2"; version = versionPkg; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/avian/default.nix b/nixpkgs/pkgs/development/compilers/avian/default.nix index 387ae906b88d..34d1e64c484f 100644 --- a/nixpkgs/pkgs/development/compilers/avian/default.nix +++ b/nixpkgs/pkgs/development/compilers/avian/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: stdenv.mkDerivation rec { - name = "avian-${version}"; + pname = "avian"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/bigloo/default.nix b/nixpkgs/pkgs/development/compilers/bigloo/default.nix index bf2272a75c17..6e768e65091b 100644 --- a/nixpkgs/pkgs/development/compilers/bigloo/default.nix +++ b/nixpkgs/pkgs/development/compilers/bigloo/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, gmp }: stdenv.mkDerivation rec { - name = "bigloo-${version}"; + pname = "bigloo"; version = "4.1a-2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 52323b3de765..c0e6c4b50044 100644 --- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = if emscriptenRev == null then "version_${version}" else emscriptenRev; - name = "binaryen-${version}"; + pname = "binaryen"; src = fetchFromGitHub { owner = "WebAssembly"; diff --git a/nixpkgs/pkgs/development/compilers/ccl/default.nix b/nixpkgs/pkgs/development/compilers/ccl/default.nix index 646963eedbca..6fac183125f5 100644 --- a/nixpkgs/pkgs/development/compilers/ccl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ccl/default.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { - name = "ccl-${version}"; + pname = "ccl"; version = "1.11.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/chez/default.nix b/nixpkgs/pkgs/development/compilers/chez/default.nix index 9216c7791433..1bac7eb9b95e 100644 --- a/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "chez-scheme-${version}"; + pname = "chez-scheme"; version = "9.5.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix index ceeff56330b2..34512fc8ef05 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 8; diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index 74f711811907..5fefce12dbf1 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 11; diff --git a/nixpkgs/pkgs/development/compilers/clasp/default.nix b/nixpkgs/pkgs/development/compilers/clasp/default.nix index a1e29951ddb5..664d84921135 100644 --- a/nixpkgs/pkgs/development/compilers/clasp/default.nix +++ b/nixpkgs/pkgs/development/compilers/clasp/default.nix @@ -56,7 +56,6 @@ let }; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clasp"; version = "0.8.99.20181128"; diff --git a/nixpkgs/pkgs/development/compilers/closure/default.nix b/nixpkgs/pkgs/development/compilers/closure/default.nix index e9e973618257..d9f2a588d8f6 100644 --- a/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "closure-compiler-${version}"; + pname = "closure-compiler"; version = "20190215"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/cmucl/binary.nix b/nixpkgs/pkgs/development/compilers/cmucl/binary.nix index 9e3184c42eb2..3f93ea9e1bac 100644 --- a/nixpkgs/pkgs/development/compilers/cmucl/binary.nix +++ b/nixpkgs/pkgs/development/compilers/cmucl/binary.nix @@ -19,7 +19,8 @@ let in stdenv.mkDerivation { - name = "cmucl-binary-${version}"; + pname = "cmucl-binary"; + inherit version; buildCommand = '' mkdir -p $out diff --git a/nixpkgs/pkgs/development/compilers/colm/default.nix b/nixpkgs/pkgs/development/compilers/colm/default.nix index 237a80280ec8..cc8e9f827b7f 100644 --- a/nixpkgs/pkgs/development/compilers/colm/default.nix +++ b/nixpkgs/pkgs/development/compilers/colm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: stdenv.mkDerivation rec { - name = "colm-${version}"; + pname = "colm"; version = "0.13.0.7"; src = fetchurl { - url = "https://www.colm.net/files/colm/${name}.tar.gz"; + url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz"; sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; diff --git a/nixpkgs/pkgs/development/compilers/compcert/default.nix b/nixpkgs/pkgs/development/compilers/compcert/default.nix index 69e11a48918c..940eb851fe61 100644 --- a/nixpkgs/pkgs/development/compilers/compcert/default.nix +++ b/nixpkgs/pkgs/development/compilers/compcert/default.nix @@ -11,7 +11,7 @@ let ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; in stdenv.mkDerivation rec { - name = "compcert-${version}"; + pname = "compcert"; version = "3.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/coreclr/default.nix b/nixpkgs/pkgs/development/compilers/coreclr/default.nix index 8be482e2150f..00816fca36bd 100644 --- a/nixpkgs/pkgs/development/compilers/coreclr/default.nix +++ b/nixpkgs/pkgs/development/compilers/coreclr/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "coreclr-${version}"; + pname = "coreclr"; version = "2.0.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/crystal/build-package.nix b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix new file mode 100644 index 000000000000..8ffa89a11b4a --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }: +{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root + shardsFile ? null + # Specify binaries to build in the form { foo.src = "src/foo.cr"; } + # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } +, crystalBinaries ? {} +, ... +}@args: +let + mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ]; + + crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { + inherit name; + path = fetchFromGitHub value; + }) (import shardsFile)); + + defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ]; + +in stdenv.mkDerivation (mkDerivationArgs // { + + configurePhase = args.configurePhase or '' + runHook preConfigure + ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} + runHook postConfigure + ''; + + buildInputs = args.buildInputs or [] ++ [ crystal ]; + + buildPhase = args.buildPhase or '' + runHook preBuild + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: '' + crystal ${lib.escapeShellArgs ([ + "build" + "-o" bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ attrs.options or defaultOptions)} + '') crystalBinaries)} + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + mkdir -p "$out/bin" + ${lib.concatMapStringsSep "\n" (bin: '' + mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} + '') (lib.attrNames crystalBinaries)} + runHook postInstall + ''; + + meta = args.meta or {} // { + platforms = args.meta.platforms or crystal.meta.platforms; + }; +}) diff --git a/nixpkgs/pkgs/development/compilers/mint/crystal2nix.cr b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr index f608102a37b4..0610de5cfa4d 100644 --- a/nixpkgs/pkgs/development/compilers/mint/crystal2nix.cr +++ b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr @@ -26,7 +26,7 @@ File.open "shards.nix", "w+" do |file| sha256 = "" args = ["--url", url, "--rev", rev] - Process.run("nix-prefetch-git", args: args) do |x| + Process.run("@nixPrefetchGit@", args: args) do |x| x.error.each_line { |e| puts e } sha256 = PrefetchJSON.from_json(x.output).sha256 end diff --git a/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix new file mode 100644 index 000000000000..ac69b9b3d965 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix @@ -0,0 +1,16 @@ +{ lib, crystal, nix-prefetch-git }: +crystal.buildCrystalPackage { + pname = "crystal2nix"; + version = "unstable-2018-07-31"; + + nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git"; + unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr"; + + crystalBinaries.crystal2nix.src = "crystal2nix.cr"; + + meta = with lib; { + description = "Utility to convert Crystal's shard.lock files to a Nix file"; + license = licenses.mit; + maintainers = [ maintainers.manveru ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix index db57bc3e9df7..0c79b3d394ff 100644 --- a/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper -, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }: +, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib +, callPackage }: # We need multiple binaries as a given binary isn't always able to build # (even slightly) older or newer versions. @@ -19,11 +20,12 @@ let arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ]; genericBinary = { version, sha256s, rel ? 1 }: stdenv.mkDerivation rec { - name = "crystal-binary-${version}"; + pname = "crystal-binary"; + inherit version; src = fetchurl { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; @@ -37,7 +39,7 @@ let }; generic = { version, sha256, binary, doCheck ? true }: - stdenv.mkDerivation rec { + let compiler = stdenv.mkDerivation rec { pname = "crystal"; inherit doCheck version; @@ -72,7 +74,7 @@ let buildInputs = [ boehmgc libatomic_ops pcre libevent libyaml - llvm zlib openssl + llvm zlib openssl_1_0_2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -134,6 +136,10 @@ let export PATH=${lib.makeBinPath checkInputs}:$PATH ''; + passthru.buildCrystalPackage = callPackage ./build-package.nix { + crystal = compiler; + }; + meta = with lib; { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; @@ -141,7 +147,7 @@ let maintainers = with maintainers; [ manveru david50407 peterhoeg ]; platforms = builtins.attrNames archs; }; - }; + }; in compiler; in rec { binaryCrystal_0_26 = genericBinary { @@ -207,4 +213,6 @@ in rec { }; crystal = crystal_0_30; + + crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix index 5b9e9010ef05..8aab9580232b 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix @@ -16,7 +16,7 @@ let }: stdenv.mkDerivation rec { - name = "cudatoolkit-${version}"; + pname = "cudatoolkit"; inherit version runPatches; dontPatchELF = true; diff --git a/nixpkgs/pkgs/development/compilers/dale/default.nix b/nixpkgs/pkgs/development/compilers/dale/default.nix index 8bae6e2363f6..128c245d2773 100644 --- a/nixpkgs/pkgs/development/compilers/dale/default.nix +++ b/nixpkgs/pkgs/development/compilers/dale/default.nix @@ -11,7 +11,8 @@ let version = "20170519"; in stdenv.mkDerivation { - name = "dale-${version}"; + pname = "dale"; + inherit version; src = fetchFromGitHub { owner = "tomhrr"; diff --git a/nixpkgs/pkgs/development/compilers/dev86/default.nix b/nixpkgs/pkgs/development/compilers/dev86/default.nix index 514075651e15..839ee821d00e 100644 --- a/nixpkgs/pkgs/development/compilers/dev86/default.nix +++ b/nixpkgs/pkgs/development/compilers/dev86/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dev86-${version}"; + pname = "dev86"; version = "0.16.21"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/dmd/default.nix b/nixpkgs/pkgs/development/compilers/dmd/default.nix index b3b58e836215..332ded31df6a 100644 --- a/nixpkgs/pkgs/development/compilers/dmd/default.nix +++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "dmd-${version}"; + pname = "dmd"; inherit version; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/eli/default.nix b/nixpkgs/pkgs/development/compilers/eli/default.nix index 4635c6d0a4e8..a22862c42920 100644 --- a/nixpkgs/pkgs/development/compilers/eli/default.nix +++ b/nixpkgs/pkgs/development/compilers/eli/default.nix @@ -28,11 +28,11 @@ let }; in stdenv.mkDerivation rec { - name = "eli-${version}"; + pname = "eli"; version = "4.8.1"; src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2"; sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; }; diff --git a/nixpkgs/pkgs/development/compilers/eql/default.nix b/nixpkgs/pkgs/development/compilers/eql/default.nix index 1128fbe64ec3..cb960227bebe 100644 --- a/nixpkgs/pkgs/development/compilers/eql/default.nix +++ b/nixpkgs/pkgs/development/compilers/eql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = src.rev; - name = "eql-git-${version}"; + pname = "eql-git"; src = fetchgit { rev = "9097bf98446ee33c07bb155d800395775ce0d9b2"; url = "https://gitlab.com/eql/eql.git"; diff --git a/nixpkgs/pkgs/development/compilers/factor-lang/default.nix b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix index 405aa8aa3ca5..ef445faec923 100644 --- a/nixpkgs/pkgs/development/compilers/factor-lang/default.nix +++ b/nixpkgs/pkgs/development/compilers/factor-lang/default.nix @@ -4,7 +4,7 @@ mesa, xorg, openssl, unzip }: stdenv.mkDerivation rec { - name = "factor-lang-${version}"; + pname = "factor-lang"; version = "0.98"; rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; diff --git a/nixpkgs/pkgs/development/compilers/fasm/default.nix b/nixpkgs/pkgs/development/compilers/fasm/default.nix index 47b90469234f..4b20c4051a82 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (fasm-bin) version src meta; - name = "fasm-${version}"; + pname = "fasm"; nativeBuildInputs = [ fasm-bin ]; diff --git a/nixpkgs/pkgs/development/compilers/fpc/default.nix b/nixpkgs/pkgs/development/compilers/fpc/default.nix index b516019ffc9a..a2b73f61c279 100644 --- a/nixpkgs/pkgs/development/compilers/fpc/default.nix +++ b/nixpkgs/pkgs/development/compilers/fpc/default.nix @@ -4,7 +4,7 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { version = "3.0.0"; - name = "fpc-${version}"; + pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix index 3fe72e6b5057..1b3f4d168ee9 100644 --- a/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix +++ b/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix @@ -3,7 +3,7 @@ , libXi, xorgproto, libX11, libXext }: stdenv.mkDerivation rec { - name = "lazarus-${version}"; + pname = "lazarus"; version = "1.8.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/fsharp/default.nix b/nixpkgs/pkgs/development/compilers/fsharp/default.nix index 2de487cc9c8b..bcb95d9ca906 100644 --- a/nixpkgs/pkgs/development/compilers/fsharp/default.nix +++ b/nixpkgs/pkgs/development/compilers/fsharp/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { - name = "fsharp-${version}"; + pname = "fsharp"; version = "4.0.1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/fsharp41/default.nix b/nixpkgs/pkgs/development/compilers/fsharp41/default.nix index 468fd49ba44e..e497deb2e873 100644 --- a/nixpkgs/pkgs/development/compilers/fsharp41/default.nix +++ b/nixpkgs/pkgs/development/compilers/fsharp41/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: stdenv.mkDerivation rec { - name = "fsharp-${version}"; + pname = "fsharp"; version = "4.1.34"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/fstar/default.nix b/nixpkgs/pkgs/development/compilers/fstar/default.nix index 94836e84fd68..9306eec817f9 100644 --- a/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "fstar-${version}"; + pname = "fstar"; version = "0.9.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix index 65cd67f527d4..eca2cba7775f 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, ... }: stdenv.mkDerivation rec { - name = "gambit-bootstrap-${version}"; + pname = "gambit-bootstrap"; version = "4.9.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/gambit/build.nix b/nixpkgs/pkgs/development/compilers/gambit/build.nix index 65d16c48a616..7a3324d75602 100644 --- a/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -1,7 +1,8 @@ { stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }: stdenv.mkDerivation rec { - name = "gambit-${version}"; + pname = "gambit"; + inherit version; inherit src; bootstrap = import ./bootstrap.nix ( pkgs ); diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 9e5a172eed84..940dec0338ca 100644 --- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses5, python27 }: stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; version = "6-2017-q2-update"; subdir = "6-2017q2"; diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 80e042b5c2e9..90f9d5957bb3 100644 --- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; version = "7-2018-q2-update"; subdir = "7-2018q2"; diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index ee57dcc8c144..b2815cc71849 100644 --- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -3,20 +3,20 @@ with lib; stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; - version = "8-2018-q4-major"; - subdir = "8-2018q4"; + pname = "gcc-arm-embedded"; + version = "8-2019-q3-update"; + subdir = "8-2019q3/RC1.1"; src = if stdenv.isLinux then fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; + sha256="b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; } else if stdenv.isDarwin then fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; - sha256="0q44r57fizpk1z3ngcjwal3rxgsnzjyfknpgwlwzmw5r9p98wlhb"; + sha256="fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; } else throw "unsupported platform"; diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/default.nix index 350eed2fedd0..b86b35525a67 100644 --- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -14,7 +14,8 @@ let else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update in stdenv.mkDerivation { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; + inherit version; src = fetchurl { url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; diff --git a/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix index 16450cf24ab4..1c3df80645a8 100644 --- a/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/nixpkgs/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -8,7 +8,7 @@ assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; stdenv.mkDerivation rec { - name = "gcl-${version}"; + pname = "gcl"; version = "2.6.13pre50"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/compilers/gcl/default.nix b/nixpkgs/pkgs/development/compilers/gcl/default.nix index 50d397d2cd47..e3c2d0e09de3 100644 --- a/nixpkgs/pkgs/development/compilers/gcl/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcl/default.nix @@ -8,12 +8,12 @@ assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; stdenv.mkDerivation rec { - name = "gcl-${version}"; + pname = "gcl"; version = "2.6.12"; src = fetchurl { sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f"; - url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz"; + url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz"; }; patches = [(fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/gerbil/build.nix b/nixpkgs/pkgs/development/compilers/gerbil/build.nix index b20d6f9c47ef..9ef650c330fa 100644 --- a/nixpkgs/pkgs/development/compilers/gerbil/build.nix +++ b/nixpkgs/pkgs/development/compilers/gerbil/build.nix @@ -7,7 +7,8 @@ # TODO: make static compilation work stdenv.mkDerivation rec { - name = "gerbil-${version}"; + pname = "gerbil"; + inherit version; inherit src; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/nixpkgs/pkgs/development/compilers/gforth/default.nix b/nixpkgs/pkgs/development/compilers/gforth/default.nix index 675522d54ead..e90e0dc3d983 100644 --- a/nixpkgs/pkgs/development/compilers/gforth/default.nix +++ b/nixpkgs/pkgs/development/compilers/gforth/default.nix @@ -4,7 +4,8 @@ let version = "0.7.3"; in stdenv.mkDerivation { - name = "gforth-${version}"; + pname = "gforth"; + inherit version; src = fetchurl { url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix index 3c46dfc107b8..161e57b54792 100644 --- a/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }: +{ stdenv, fetchFromGitHub +, bison +, cmake +, jq +, python3 +, spirv-headers +, spirv-tools +}: + stdenv.mkDerivation rec { - name = "glslang-${version}"; - version = "7.11.3113"; + pname = "glslang"; + version = "7.11.3214"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "${version}"; - sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6"; + rev = version; + sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins"; + }; + + # These get set at all-packages, keep onto them for child drvs + passthru = { + inherit spirv-tools spirv-headers; }; - nativeBuildInputs = [ cmake python bison jq ]; + nativeBuildInputs = [ cmake python3 bison jq ]; enableParallelBuilding = true; postPatch = '' @@ -18,6 +31,7 @@ stdenv.mkDerivation rec { ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers ''; + # Ensure spirv-headers and spirv-tools match exactly to what is expected preConfigure = '' HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') diff --git a/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix index ae27964ae8f0..df5202cb1c20 100644 --- a/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix +++ b/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix @@ -6,7 +6,7 @@ let lib = stdenv.lib; in stdenv.mkDerivation rec { - name = "gnu-cobol-${version}"; + pname = "gnu-cobol"; inherit version; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix b/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix index 41c325c2b1ad..1035091654a6 100644 --- a/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -18,7 +18,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library. in stdenv.mkDerivation rec { version = "3.2.5"; - name = "gnu-smalltalk-${version}"; + pname = "gnu-smalltalk"; src = fetchurl { url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix index 69507685f29b..e051d41993cc 100644 --- a/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-jsonnet-${version}"; + pname = "go-jsonnet"; version = "0.13.0"; goPackagePath = "github.com/google/go-jsonnet"; diff --git a/nixpkgs/pkgs/development/compilers/go/1.10.nix b/nixpkgs/pkgs/development/compilers/go/1.10.nix index 39de36293c8e..3b924f58bfe1 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.10.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.10.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; + pname = "go"; version = "1.10.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/go/1.4.nix b/nixpkgs/pkgs/development/compilers/go/1.4.nix index 95312f9e1ead..97c243439e89 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.4.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.4.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; + pname = "go"; version = "1.4-bootstrap-20161024"; revision = "79d85a4965ea7c46db483314c3981751909d7883"; diff --git a/nixpkgs/pkgs/development/compilers/graalvm/default.nix b/nixpkgs/pkgs/development/compilers/graalvm/default.nix index be03e1aeeed3..61e3b6c16aee 100644 --- a/nixpkgs/pkgs/development/compilers/graalvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/graalvm/default.nix @@ -214,7 +214,7 @@ in rec { jvmci8 = stdenv.mkDerivation rec { version = "19.2-b01"; - name = "jvmci-${version}"; + pname = "jvmci"; src = fetchFromGitHub { owner = "graalvm"; repo = "graal-jvmci-8"; @@ -280,7 +280,7 @@ in rec { graalvm8 = stdenv.mkDerivation rec { inherit version; - name = "graal-${version}"; + pname = "graal"; src = fetchFromGitHub { owner = "oracle"; repo = "graal"; diff --git a/nixpkgs/pkgs/development/compilers/haxe/default.nix b/nixpkgs/pkgs/development/compilers/haxe/default.nix index 0a974fccc888..7e11c75e07dc 100644 --- a/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,8 @@ let generic = { version, sha256, prePatch }: stdenv.mkDerivation rec { - name = "haxe-${version}"; + pname = "haxe"; + inherit version; buildInputs = [ocaml zlib pcre neko camlp4]; diff --git a/nixpkgs/pkgs/development/compilers/hhvm/default.nix b/nixpkgs/pkgs/development/compilers/hhvm/default.nix index 010dacd0c71a..24e88f9ee2e2 100644 --- a/nixpkgs/pkgs/development/compilers/hhvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/hhvm/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "hhvm-${version}"; + pname = "hhvm"; version = "3.23.2"; # use git version since we need submodules diff --git a/nixpkgs/pkgs/development/compilers/iasl/default.nix b/nixpkgs/pkgs/development/compilers/iasl/default.nix index 2b5891256043..b1b31aecae13 100644 --- a/nixpkgs/pkgs/development/compilers/iasl/default.nix +++ b/nixpkgs/pkgs/development/compilers/iasl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "iasl-${version}"; + pname = "iasl"; version = "20181213"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/inform7/default.nix b/nixpkgs/pkgs/development/compilers/inform7/default.nix index a6955c030519..2a6551aad187 100644 --- a/nixpkgs/pkgs/development/compilers/inform7/default.nix +++ b/nixpkgs/pkgs/development/compilers/inform7/default.nix @@ -2,7 +2,8 @@ let version = "6M62"; in stdenv.mkDerivation { - name = "inform7-${version}"; + pname = "inform7"; + inherit version; buildInputs = [ perl coreutils gnutar gzip ]; src = fetchzip { url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz"; diff --git a/nixpkgs/pkgs/development/compilers/intercal/default.nix b/nixpkgs/pkgs/development/compilers/intercal/default.nix index f601dc254a43..6640c4aa89ab 100644 --- a/nixpkgs/pkgs/development/compilers/intercal/default.nix +++ b/nixpkgs/pkgs/development/compilers/intercal/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "intercal-${version}"; + pname = "intercal"; version = "0.30"; src = fetchurl { - url = "http://catb.org/esr/intercal/${name}.tar.gz"; + url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz"; sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk"; }; diff --git a/nixpkgs/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix index 1cbe95232eb7..f240deda0bf9 100644 --- a/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit testedTargets; - name = "ispc-${version}"; + pname = "ispc"; src = fetchFromGitHub { owner = "ispc"; diff --git a/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix index 06f321bc39c4..f49d3d6e2109 100644 --- a/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "javacard-devkit"; version = "2.2.2"; uscoreVersion = builtins.replaceStrings ["."] ["_"] version; diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index d407fb46b9b5..1349b7f0dddc 100644 --- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -8,7 +8,6 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; version = "164"; - name = pname + "-" + version; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index 7bbad0e12016..460ff405b94e 100644 --- a/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jsonnet-${version}"; + pname = "jsonnet"; version = "0.13.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/julia/shared.nix b/nixpkgs/pkgs/development/compilers/julia/shared.nix index d8d521952bda..c0414c6259fd 100644 --- a/nixpkgs/pkgs/development/compilers/julia/shared.nix +++ b/nixpkgs/pkgs/development/compilers/julia/shared.nix @@ -77,10 +77,9 @@ in stdenv.mkDerivation rec { pname = "julia"; inherit version; - name = "${pname}-${version}"; src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = src_sha256; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/compilers/jwasm/default.nix b/nixpkgs/pkgs/development/compilers/jwasm/default.nix index 9800b33e7a9e..b2db09e1c182 100644 --- a/nixpkgs/pkgs/development/compilers/jwasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/jwasm/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jwasm-${version}"; + pname = "jwasm"; version = "git-2017-11-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 32659d5be564..754ab020d51e 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -4,7 +4,7 @@ let version = "1.3.41"; in stdenv.mkDerivation rec { inherit version; - name = "kotlin-${version}"; + pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; diff --git a/nixpkgs/pkgs/development/compilers/ldc/default.nix b/nixpkgs/pkgs/development/compilers/ldc/default.nix index e4ef37e4721d..787a9352e225 100644 --- a/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation rec { - name = "ldc-${version}"; + pname = "ldc"; + inherit version; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/clang.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang.nix index 132cd67a4aeb..9a602c62777d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/clang.nix @@ -2,7 +2,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/dragonegg.nix index d54ffd96382d..e327fa79c6f0 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,7 +1,8 @@ {stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { - name = "dragonegg-${version}"; + pname = "dragonegg"; + inherit version; src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw"; @@ -11,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ]; installPhase = '' - mkdir -p $out/lib $out/share/doc/${name} + mkdir -p $out/lib $out/share/doc/${pname}-${version} cp -d dragonegg.so $out/lib - cp README COPYING $out/share/doc/${name} + cp README COPYING $out/share/doc/${pname}-${version} ''; meta = { diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 6edd5e9798c7..4f766e5f9a5c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -3,7 +3,8 @@ let version = "3.5.2"; in stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix index 268f2702a234..d295ddbf8a44 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix @@ -8,7 +8,8 @@ let sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j"; }; in stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/lld.nix index 4a398bd96a05..8fe4dd6f1d5f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/lld.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/lldb.nix index a5161333b282..b4823e9d8c2a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix index 6eec99717785..95632a45999d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -18,7 +18,8 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.5/polly.nix b/nixpkgs/pkgs/development/compilers/llvm/3.5/polly.nix index bacf4d30556b..06bc7490c7b5 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.5/polly.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, isl, python, gmp, llvm, version }: stdenv.mkDerivation { - name = "polly-${version}"; + pname = "polly"; + inherit version; src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix index 47a1bed126da..0276393d840c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -3,7 +3,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix index 5a0410302f2f..b66284152d49 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 8b25681c2dbf..80b069fff75a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix index d27786464c05..985cd6663857 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix index a73b73137ddc..5fe681185b2d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -17,7 +17,8 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/default.nix index e2cf437e19e1..3d09277ad4cf 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -3,7 +3,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix index bd2cc19d2e0b..af65fd6388ea 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dffb207a32b6..f799199d449f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.9/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/lldb.nix index 52f27de8cdb5..1a7c9aeead86 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm.nix index c8d819cc9634..4dde3be277ab 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -27,7 +27,8 @@ let in stdenv.mkDerivation { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix index 2b543b9d793a..74e9b8719d1d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/4/libc++abi.nix index 735c5e9e7435..8e36c5ad53a6 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/4/lld.nix index cf6de26a9e83..3ab56677d72f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/4/lldb.nix index 325149fc19be..8adf11abddda 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/4/openmp.nix index a8a6b3dfea87..a69fe286ecc0 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/openmp.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix index 19833e4d3d4a..9660be4df11f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,7 +1,7 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix index b182f1250e72..e3015ae8448d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix index 227ecbeda194..1b891af09ed1 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix index bf23f80ef103..bfee91d91bf6 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix index 5e670d4de159..cce44c7e50f9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix index 901015bf2ff4..559377bcc1b7 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix index be18a315f12a..da2a5cfb58ae 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,7 +1,7 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix index 3a165e9da7b1..906baa4ae646 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix index df9c784a10f4..ac1f4f653e6a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix index 1e68276945ec..58b9b8060fa3 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix index 9571e7ab5a63..d3db8082c963 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix index 908a5f1218f7..447904b9ad5f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index 989529ff8cc8..e9cc6dfc1dbe 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix index e2ec4e274f4c..fc9e3714db0c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix index 2fe6f1c58f66..b5e6e0e70480 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix index 63ad43e62cd7..823e9640cf4e 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix index 1b2dff2c76cf..44687ead4d1c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/lldb.nix @@ -16,7 +16,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix index e55f4aa5ba13..7adc2aa588e3 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 5959b99316d9..1f216178b558 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: stdenv.mkDerivation rec { - name = "compiler-rt-${version}"; + pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index f8a07de07222..e0bc9e816f50 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix index 1ee6d069f4b5..58a1241d8236 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix index 75edd1fff54d..646cd3c3ca4a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,7 +1,8 @@ { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { - name = "libunwind-${version}"; + pname = "libunwind"; + inherit version; src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix index aec1b14b9943..fc52d691d030 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix index f31da000bb82..254933c82a09 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix index 8cf551735619..166e7f68eb3b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y"; diff --git a/nixpkgs/pkgs/development/compilers/manticore/default.nix b/nixpkgs/pkgs/development/compilers/manticore/default.nix index efbf8561b7ff..1c0bdf479871 100644 --- a/nixpkgs/pkgs/development/compilers/manticore/default.nix +++ b/nixpkgs/pkgs/development/compilers/manticore/default.nix @@ -3,7 +3,7 @@ let rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; in stdenv.mkDerivation rec { - name = "manticore-${version}"; + pname = "manticore"; version = "2018.09.29"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/mercury/default.nix b/nixpkgs/pkgs/development/compilers/mercury/default.nix index b7fc3e4dd772..0327e0dc2155 100644 --- a/nixpkgs/pkgs/development/compilers/mercury/default.nix +++ b/nixpkgs/pkgs/development/compilers/mercury/default.nix @@ -2,7 +2,7 @@ , readline }: stdenv.mkDerivation rec { - name = "mercury-${version}"; + pname = "mercury"; version = "14.01.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/microscheme/default.nix b/nixpkgs/pkgs/development/compilers/microscheme/default.nix index f15a76243277..a18202b9f884 100644 --- a/nixpkgs/pkgs/development/compilers/microscheme/default.nix +++ b/nixpkgs/pkgs/development/compilers/microscheme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, vim, makeWrapper }: stdenv.mkDerivation rec { - name = "microscheme-${version}"; + pname = "microscheme"; version = "0.9.3"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz"; sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"; }; diff --git a/nixpkgs/pkgs/development/compilers/mint/default.nix b/nixpkgs/pkgs/development/compilers/mint/default.nix index 1c8e9fb7eb20..5f72bd3649b1 100644 --- a/nixpkgs/pkgs/development/compilers/mint/default.nix +++ b/nixpkgs/pkgs/development/compilers/mint/default.nix @@ -1,40 +1,7 @@ -# Updating the dependencies for this package: -# -# wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock -# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' -# -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: -let - crystalPackages = lib.mapAttrs (name: src: - stdenv.mkDerivation { - name = lib.replaceStrings ["/"] ["-"] name; - src = fetchFromGitHub src; - phases = "installPhase"; - installPhase = ''cp -r $src $out''; - passthru = { libName = name; }; - } - ) (import ./shards.nix); - - crystalLib = stdenv.mkDerivation { - name = "crystal-lib"; - src = lib.attrValues crystalPackages; - libNames = lib.mapAttrsToList (k: v: [k v]) crystalPackages; - phases = "buildPhase"; - buildPhase = '' - mkdir -p $out - linkup () { - while [ "$#" -gt 0 ]; do - ln -s $2 $out/$1 - shift; shift - done - } - linkup $libNames - ''; - }; -in -stdenv.mkDerivation rec { +{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: +crystal.buildCrystalPackage rec { version = "0.5.0"; - name = "mint-${version}"; + pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; @@ -42,23 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; }; - nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ]; - - buildPhase = '' - mkdir -p $out/bin tmp - cd tmp - ln -s ${crystalLib} lib - cp -r $src/* . - crystal build src/mint.cr -o $out/bin/mint --verbose --progress --release --no-debug - ''; + buildInputs = [ openssl_1_0_2 ]; - installPhase = ''true''; + # Update with + # nix-shell -p crystal2nix --run crystal2nix + # with mint's shard.lock file in the current directory + shardsFile = ./shards.nix; + crystalBinaries.mint.src = "src/mint.cr"; meta = { description = "A refreshing language for the front-end web"; homepage = https://mint-lang.com/; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ manveru ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/mkcl/default.nix b/nixpkgs/pkgs/development/compilers/mkcl/default.nix index 72626ec0014b..405846343cf1 100644 --- a/nixpkgs/pkgs/development/compilers/mkcl/default.nix +++ b/nixpkgs/pkgs/development/compilers/mkcl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }: with stdenv.lib; stdenv.mkDerivation rec { - name = "mkcl-${version}"; + pname = "mkcl"; version = "1.1.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/mlton/20130715.nix b/nixpkgs/pkgs/development/compilers/mlton/20130715.nix index f495be8a93e4..207ed8f29bc7 100644 --- a/nixpkgs/pkgs/development/compilers/mlton/20130715.nix +++ b/nixpkgs/pkgs/development/compilers/mlton/20130715.nix @@ -9,32 +9,33 @@ let in stdenv.mkDerivation rec { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; binSrc = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.x86-linux.tgz"; sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz"; sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz"; sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; }) else throw "Architecture not supported"; codeSrc = fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}.src.tgz"; sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; }; srcs = [ binSrc codeSrc ]; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; diff --git a/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix b/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix index 0589733cb3c6..2b4998f91c91 100644 --- a/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix +++ b/nixpkgs/pkgs/development/compilers/mlton/20180207-binary.nix @@ -3,15 +3,15 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in stdenv.mkDerivation rec { - name = "mlton-${version}"; + pname = "mlton"; version = "20180207"; src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz"; sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz"; sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; }) else diff --git a/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix b/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix index 3a3538a7ea42..2585b599caf3 100644 --- a/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix +++ b/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; src = fetchgit { inherit url rev sha256; diff --git a/nixpkgs/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix index 6b5c15642a5c..9a2f01b9f3d5 100644 --- a/nixpkgs/pkgs/development/compilers/mono/generic.nix +++ b/nixpkgs/pkgs/development/compilers/mono/generic.nix @@ -7,10 +7,12 @@ let llvm = callPackage ./llvm.nix { }; in stdenv.mkDerivation rec { - name = "mono-${version}"; + pname = "mono"; + inherit version; + src = fetchurl { inherit sha256; - url = "https://download.mono-project.com/sources/mono/${name}.${srcArchiveSuffix}"; + url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}"; }; buildInputs = diff --git a/nixpkgs/pkgs/development/compilers/mono/llvm.nix b/nixpkgs/pkgs/development/compilers/mono/llvm.nix index 616ec420d2d0..193e45bf55eb 100644 --- a/nixpkgs/pkgs/development/compilers/mono/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/mono/llvm.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; version = "3.6-mono-2017-02-15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/mosml/default.nix b/nixpkgs/pkgs/development/compilers/mosml/default.nix index b22072651a46..19324593a30c 100644 --- a/nixpkgs/pkgs/development/compilers/mosml/default.nix +++ b/nixpkgs/pkgs/development/compilers/mosml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gmp, perl }: stdenv.mkDerivation rec { - name = "mosml-${version}"; + pname = "mosml"; version = "2.10.1"; buildInputs = [ gmp perl ]; diff --git a/nixpkgs/pkgs/development/compilers/mozart/binary.nix b/nixpkgs/pkgs/development/compilers/mozart/binary.nix index ef6cd1160b33..2067184a5b00 100644 --- a/nixpkgs/pkgs/development/compilers/mozart/binary.nix +++ b/nixpkgs/pkgs/development/compilers/mozart/binary.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "mozart-binary-${version}"; + pname = "mozart-binary"; + inherit version; preferLocalBuild = true; diff --git a/nixpkgs/pkgs/development/compilers/nasm/default.nix b/nixpkgs/pkgs/development/compilers/nasm/default.nix index bfb3c154a3c7..8d92bc4eba2f 100644 --- a/nixpkgs/pkgs/development/compilers/nasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/nasm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "nasm-${version}"; + pname = "nasm"; version = "2.14.02"; src = fetchFromRepoOrCz { repo = "nasm"; - rev = name; + rev = "${pname}-${version}"; sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; }; diff --git a/nixpkgs/pkgs/development/compilers/neko/default.nix b/nixpkgs/pkgs/development/compilers/neko/default.nix index e2aa5736c7a3..74ccaac388f2 100644 --- a/nixpkgs/pkgs/development/compilers/neko/default.nix +++ b/nixpkgs/pkgs/development/compilers/neko/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "neko-${version}"; + pname = "neko"; version = "2.2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index c1e01ef77828..894ef8c45fa0 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, cmake , boost, python3, eigen , icestorm, trellis +, llvmPackages , enableGui ? true , wrapQtAppsHook @@ -12,13 +13,13 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2019.08.21"; + version = "2019.08.31"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4"; - sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf"; + rev = "c0b7379e8672b6263152d5e340e62f22179fdc8b"; + sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh"; }; nativeBuildInputs @@ -26,7 +27,8 @@ with stdenv; mkDerivation rec { ++ (lib.optional enableGui wrapQtAppsHook); buildInputs = [ boostPython python3 eigen ] - ++ (lib.optional enableGui qtbase); + ++ (lib.optional enableGui qtbase) + ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); enableParallelBuilding = true; cmakeFlags = @@ -59,7 +61,7 @@ with stdenv; mkDerivation rec { description = "Place and route tool for FPGAs"; homepage = https://github.com/yosyshq/nextpnr; license = licenses.isc; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice emily ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 6bd4af05da36..fa49bf9dd732 100644 --- a/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { date = "April2012"; - name = "nvidia-cg-toolkit-${version}"; + pname = "nvidia-cg-toolkit"; src = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/nixpkgs/pkgs/development/compilers/obliv-c/default.nix b/nixpkgs/pkgs/development/compilers/obliv-c/default.nix index 0d171a474a20..8fd6f33740e4 100644 --- a/nixpkgs/pkgs/development/compilers/obliv-c/default.nix +++ b/nixpkgs/pkgs/development/compilers/obliv-c/default.nix @@ -1,6 +1,6 @@ { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { - name = "obliv-c-${version}"; + pname = "obliv-c"; version = "0.0pre20180624"; buildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix index 4337de702e16..cd621c131ffa 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.08.0"; builder = ./builder.sh; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.tar.gz"; + url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz"; sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx"; }; configureScript = ./configure-3.08.0; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix index 99a65dec1501..556aefd37049 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.10.0"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix index e65510c172e6..4be414905348 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.11.2"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2"; sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; }; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix index 8636f670059c..edb3acdbdb1a 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "3.12.1"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2"; sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; }; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix index 0a30ef1352c4..2669e8224bff 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.00.1.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { - name = "ocaml-${version}"; + pname = "ocaml"; version = "4.00.1"; src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2"; sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix index a933151de12a..fb507b9836ad 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "ber-metaocaml-${version}"; + pname = "ber-metaocaml"; version = metaocamlPatch; src = fetchurl { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { postConfigure = '' tar -xvzf $metaocaml - cd ${name} + cd ${pname}-${version} make patch cd .. ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { make installopt mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml - cd ${name} + cd ${pname}-${version} make all ''; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; checkPhase = '' - cd ${name} + cd ${pname}-${version} make test make test-compile make test-native diff --git a/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index e9adbeff4904..881748c36ea7 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { - name = "metaocaml-${version}"; + pname = "metaocaml"; version = "3.09-alpha-30"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/opa/default.nix b/nixpkgs/pkgs/development/compilers/opa/default.nix index 06ed7c51e9ab..da1df6f30bbd 100644 --- a/nixpkgs/pkgs/development/compilers/opa/default.nix +++ b/nixpkgs/pkgs/development/compilers/opa/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "opa"; version = "4310"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "MLstate"; diff --git a/nixpkgs/pkgs/development/compilers/openspin/default.nix b/nixpkgs/pkgs/development/compilers/openspin/default.nix index 690707265b4a..31e3800a6c9c 100644 --- a/nixpkgs/pkgs/development/compilers/openspin/default.nix +++ b/nixpkgs/pkgs/development/compilers/openspin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "openspin-${version}"; + pname = "openspin"; version = "unstable-2018-10-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/polyml/5.6.nix b/nixpkgs/pkgs/development/compilers/polyml/5.6.nix index 7f22f4de6244..370c08f001a7 100644 --- a/nixpkgs/pkgs/development/compilers/polyml/5.6.nix +++ b/nixpkgs/pkgs/development/compilers/polyml/5.6.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "polyml-${version}"; + pname = "polyml"; + inherit version; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ diff --git a/nixpkgs/pkgs/development/compilers/polyml/5.7.nix b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix index b7feed84c37f..eef972a2cc3c 100644 --- a/nixpkgs/pkgs/development/compilers/polyml/5.7.nix +++ b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { - name = "polyml-${version}"; + pname = "polyml"; version = "5.7.1"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/compilers/polyml/default.nix b/nixpkgs/pkgs/development/compilers/polyml/default.nix index 91a3bb45352f..5ab13d5f761f 100644 --- a/nixpkgs/pkgs/development/compilers/polyml/default.nix +++ b/nixpkgs/pkgs/development/compilers/polyml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { - name = "polyml-${version}"; + pname = "polyml"; version = "5.8"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix index 2aab6a99a1cf..6719293af2a7 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation rec { - name = "pony-stable-${version}"; + pname = "pony-stable"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/nixpkgs/pkgs/development/compilers/rgbds/default.nix index eee4507d6cec..3856ced250e7 100644 --- a/nixpkgs/pkgs/development/compilers/rgbds/default.nix +++ b/nixpkgs/pkgs/development/compilers/rgbds/default.nix @@ -5,7 +5,7 @@ # in a published version. stdenv.mkDerivation rec { - name = "rgbds-${version}"; + pname = "rgbds"; version = "0.3.8"; src = fetchFromGitHub { owner = "rednex"; diff --git a/nixpkgs/pkgs/development/compilers/rust/binaryBuild.nix b/nixpkgs/pkgs/development/compilers/rust/binary.nix index cb2fba96e181..acccc749686c 100644 --- a/nixpkgs/pkgs/development/compilers/rust/binaryBuild.nix +++ b/nixpkgs/pkgs/development/compilers/rust/binary.nix @@ -60,6 +60,8 @@ rec { # are very hard to track down. For details, see # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 ''; + + setupHooks = ./setup-hook.sh; }; cargo = stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix index 973d17e1c7bd..5cf48715dae2 100644 --- a/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.35.0"; + version = "1.36.0"; - # fetch hashes by running `print-hashes.sh 1.34.2` + # fetch hashes by running `print-hashes.sh 1.36.0` hashes = { - i686-unknown-linux-gnu = "05337776b3645e4b8c8c7ced0bcd1615cf9ad1b9c8b3d0f333620e5401e31aee"; - x86_64-unknown-linux-gnu = "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c"; - armv7-unknown-linux-gnueabihf = "8f0f32d8ddc6fb7bcb8f50ec5e694078799d93facbf135eec5bd9a8c94d0c11e"; - aarch64-unknown-linux-gnu = "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952"; - i686-apple-darwin = "6a45ae8db094c5f6c57c5594a00f1a92b08c444a7347a657b4033186d4f08b19"; - x86_64-apple-darwin = "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6"; + i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d"; + x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55"; + armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb"; + aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d"; + i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60"; + x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325"; }; platform = @@ -35,7 +35,7 @@ let sha256 = hashes."${platform}"; }; -in callPackage ./binaryBuild.nix +in callPackage ./binary.nix { inherit version src platform; versionType = "bootstrap"; } diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index d77769583902..daf7af1babdc 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python2, tzdata, ps -, llvm_7, darwin, git, cmake, rustPlatform +, llvmPackages_7, darwin, git, cmake, rustPlatform , which, libffi, gdb , withBundledLLVM ? false }: @@ -9,21 +9,31 @@ let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; }; + llvmPackages = llvmPackages_7; + + llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; }; # For use at runtime - llvmShared = llvm_7.override { enableSharedLibraries = true; }; -in stdenv.mkDerivation rec { + llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; }; +in + +stdenv.mkDerivation rec { pname = "rustc"; - version = "1.36.0"; + version = "1.37.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"; + sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"; }; + # Provide the compiler-rt sources needed for profiling. + preConfigure = '' + mkdir src/llvm-project/compiler-rt + tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1 + ''; + __darwinAllowLocalNetworking = true; # rustc complains about modified source files otherwise @@ -38,7 +48,6 @@ in stdenv.mkDerivation rec { # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 stripDebugList = [ "bin" ]; - NIX_LDFLAGS = # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" diff --git a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix index 056ad7454600..0d2a10b6a998 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix @@ -43,7 +43,7 @@ let in assert builtins.hasAttr stdenv.hostPlatform.system options; stdenv.mkDerivation rec { - name = "sbcl-bootstrap-${version}"; + pname = "sbcl-bootstrap"; version = cfg.version; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/nixpkgs/pkgs/development/compilers/sbcl/default.nix index e2cc7adc26e1..e5b36ad78908 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/default.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation rec { - name = "sbcl-${version}"; + pname = "sbcl"; version = "1.5.3"; src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj"; }; diff --git a/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix b/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix index ab42eae31a68..5a01e295e49e 100644 --- a/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix +++ b/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.14.0-RC1"; - name = "dotty-bare-${version}"; + pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/compilers/sdcc/default.nix b/nixpkgs/pkgs/development/compilers/sdcc/default.nix index 4fd46c35a0a9..cdac400b1afd 100644 --- a/nixpkgs/pkgs/development/compilers/sdcc/default.nix +++ b/nixpkgs/pkgs/development/compilers/sdcc/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "sdcc-${version}"; + pname = "sdcc"; version = "3.9.0"; src = fetchurl { @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://sdcc.sourceforge.net/; license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/compilers/seexpr/default.nix b/nixpkgs/pkgs/development/compilers/seexpr/default.nix index a6abe6791d7e..efcaf56110d2 100644 --- a/nixpkgs/pkgs/development/compilers/seexpr/default.nix +++ b/nixpkgs/pkgs/development/compilers/seexpr/default.nix @@ -3,7 +3,7 @@ bison, flex, libGLU, pythonPackages }: stdenv.mkDerivation rec { - name = "seexpr-${version}"; + pname = "seexpr"; version = "2.11"; src = fetchFromGitHub { owner = "wdas"; diff --git a/nixpkgs/pkgs/development/compilers/serpent/default.nix b/nixpkgs/pkgs/development/compilers/serpent/default.nix index e9c6b706e5ad..c9b4f9639d07 100644 --- a/nixpkgs/pkgs/development/compilers/serpent/default.nix +++ b/nixpkgs/pkgs/development/compilers/serpent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "serpent-${version}"; + pname = "serpent"; # I can't find any version numbers, so we're just using the date # of the last commit. diff --git a/nixpkgs/pkgs/development/compilers/shaderc/default.nix b/nixpkgs/pkgs/development/compilers/shaderc/default.nix index 75717b5ba096..82cccc3befc3 100644 --- a/nixpkgs/pkgs/development/compilers/shaderc/default.nix +++ b/nixpkgs/pkgs/development/compilers/shaderc/default.nix @@ -24,7 +24,7 @@ let sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2"; }; in stdenv.mkDerivation rec { - name = "shaderc-${version}"; + pname = "shaderc"; version = "2019.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; diff --git a/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix b/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix index 21cfd4082988..e2103fb718fa 100644 --- a/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: stdenv.mkDerivation rec { - name = "smlnj-bootstrap-${version}"; + pname = "smlnj-bootstrap"; version = "110.91"; diff --git a/nixpkgs/pkgs/development/compilers/smlnj/default.nix b/nixpkgs/pkgs/development/compilers/smlnj/default.nix index dce46ade4592..89912ac9ad6b 100644 --- a/nixpkgs/pkgs/development/compilers/smlnj/default.nix +++ b/nixpkgs/pkgs/development/compilers/smlnj/default.nix @@ -29,7 +29,8 @@ let { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; } ]; in stdenv.mkDerivation { - name = "smlnj-${version}"; + pname = "smlnj"; + inherit version; inherit sources; diff --git a/nixpkgs/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix index f34283938326..b0fdc8863784 100644 --- a/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation rec { - name = "solc-${version}"; + pname = "solc"; version = "0.5.11"; # upstream suggests avoid using archive generated by github diff --git a/nixpkgs/pkgs/development/compilers/souffle/default.nix b/nixpkgs/pkgs/development/compilers/souffle/default.nix index 219d5307790d..a39a6c4a2e4f 100644 --- a/nixpkgs/pkgs/development/compilers/souffle/default.nix +++ b/nixpkgs/pkgs/development/compilers/souffle/default.nix @@ -9,7 +9,7 @@ let toolsPath = stdenv.lib.makeBinPath [ mcpp ]; in stdenv.mkDerivation rec { - name = "souffle-${version}"; + pname = "souffle"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/squeak/default.nix b/nixpkgs/pkgs/development/compilers/squeak/default.nix index 25ea47978fcd..c8379fe90909 100644 --- a/nixpkgs/pkgs/development/compilers/squeak/default.nix +++ b/nixpkgs/pkgs/development/compilers/squeak/default.nix @@ -2,7 +2,7 @@ , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }: stdenv.mkDerivation rec { - name = "squeak-${version}"; + pname = "squeak"; version = "4.10.2.2614"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index bf452d21d1dc..9245e59553fe 100644 --- a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -13,7 +13,8 @@ let ''; in stdenv.mkDerivation { - name = "swi-prolog-${version}"; + pname = "swi-prolog"; + inherit version; src = fetchgit { url = "https://github.com/SWI-Prolog/swipl-devel"; diff --git a/nixpkgs/pkgs/development/compilers/terra/default.nix b/nixpkgs/pkgs/development/compilers/terra/default.nix index b1f9ee799e5c..dea6df1b7aa4 100644 --- a/nixpkgs/pkgs/development/compilers/terra/default.nix +++ b/nixpkgs/pkgs/development/compilers/terra/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "terra-git-${version}"; + pname = "terra-git"; version = "1.0.0-beta1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/teyjus/default.nix b/nixpkgs/pkgs/development/compilers/teyjus/default.nix index 04efe1a91342..41cc9b386067 100644 --- a/nixpkgs/pkgs/development/compilers/teyjus/default.nix +++ b/nixpkgs/pkgs/development/compilers/teyjus/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "teyjus-${version}"; + pname = "teyjus"; + inherit version; src = fetchurl { url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/compilers/tinycc/default.nix b/nixpkgs/pkgs/development/compilers/tinycc/default.nix index a5c3db65857f..338ba9312492 100644 --- a/nixpkgs/pkgs/development/compilers/tinycc/default.nix +++ b/nixpkgs/pkgs/development/compilers/tinycc/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "tcc-${version}"; + pname = "tcc"; version = "0.9.27"; src = fetchFromRepoOrCz { diff --git a/nixpkgs/pkgs/development/compilers/urweb/default.nix b/nixpkgs/pkgs/development/compilers/urweb/default.nix index 2300d63015b9..01d4972a55d5 100644 --- a/nixpkgs/pkgs/development/compilers/urweb/default.nix +++ b/nixpkgs/pkgs/development/compilers/urweb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "urweb-${version}"; + pname = "urweb"; version = "20190217"; src = fetchurl { - url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s"; }; diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index 353963007d4b..15ed7f8bd29d 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -119,8 +119,8 @@ in rec { }; vala_0_40 = generic { - version = "0.40.15"; - sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19"; + version = "0.40.16"; + sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b"; }; vala_0_42 = generic { @@ -129,8 +129,8 @@ in rec { }; vala_0_44 = generic { - version = "0.44.5"; - sha256 = "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv"; + version = "0.44.6"; + sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb"; }; vala = vala_0_44; diff --git a/nixpkgs/pkgs/development/compilers/wcc/default.nix b/nixpkgs/pkgs/development/compilers/wcc/default.nix index 8cb1e8e5f2cd..3196592da485 100644 --- a/nixpkgs/pkgs/development/compilers/wcc/default.nix +++ b/nixpkgs/pkgs/development/compilers/wcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: stdenv.mkDerivation rec { - name = "wcc-unstable-${version}"; + pname = "wcc-unstable"; version = "2018-04-05"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/x11basic/default.nix b/nixpkgs/pkgs/development/compilers/x11basic/default.nix index 88666148da3f..3d955c4394b0 100644 --- a/nixpkgs/pkgs/development/compilers/x11basic/default.nix +++ b/nixpkgs/pkgs/development/compilers/x11basic/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation rec { pname = "X11basic"; version = "1.26"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "kollokollo"; diff --git a/nixpkgs/pkgs/development/compilers/yap/default.nix b/nixpkgs/pkgs/development/compilers/yap/default.nix index 3ad0bc25787e..1cc96455be7a 100644 --- a/nixpkgs/pkgs/development/compilers/yap/default.nix +++ b/nixpkgs/pkgs/development/compilers/yap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.3.3"; - name = "yap-${version}"; + pname = "yap"; src = fetchurl { - url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; + url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz"; sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; }; diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix index 467d4e3b49eb..1535c7a7de64 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { pname = "yosys"; - version = "2019.08.21"; + version = "2019.09.01"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4"; - sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw"; + rev = "4aa505d1b254b3fbb66af2d95b396a8f077da9d0"; + sha256 = "16rhwmn1z2ppaq3wycgq713krq48s80a6h57vgzjzj17hgncg7hs"; name = "yosys"; }) diff --git a/nixpkgs/pkgs/development/compilers/zulu/8.nix b/nixpkgs/pkgs/development/compilers/zulu/8.nix index cc42ee1dd3f1..f0e0693d12c4 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; - name = "zulu-${version}"; + pname = "zulu"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; diff --git a/nixpkgs/pkgs/development/compilers/zulu/default.nix b/nixpkgs/pkgs/development/compilers/zulu/default.nix index a43992164d23..d4c4c1f0ac31 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; - name = "zulu-${version}"; + pname = "zulu"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}"; diff --git a/nixpkgs/pkgs/development/em-modules/generic/default.nix b/nixpkgs/pkgs/development/em-modules/generic/default.nix index f03e6e42739a..d1e7ac882d79 100644 --- a/nixpkgs/pkgs/development/em-modules/generic/default.nix +++ b/nixpkgs/pkgs/development/em-modules/generic/default.nix @@ -7,10 +7,11 @@ , meta ? {}, ... } @ args: pkgs.stdenv.mkDerivation ( - args // + args // { - name = "emscripten-${args.name}"; + pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}"; + version = args.version or (builtins.parseDrvName args.name).version; buildInputs = [ emscripten python ] ++ buildInputs; nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs; diff --git a/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix index 592e6ad89994..8377dad690f6 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }: stdenv.mkDerivation rec { - name = "guile-cairo-${version}"; + pname = "guile-cairo"; version = "1.10.0"; src = fetchurl { - url = "mirror://savannah/guile-cairo/${name}.tar.gz"; + url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"; }; diff --git a/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix index 26fffac0a131..80ce29799a88 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-gnome/default.nix @@ -5,12 +5,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "guile-gnome-platform"; version = "2.16.4"; src = fetchurl { - url = "mirror://gnu/guile-gnome/${pname}/${name}.tar.gz"; + url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; }; diff --git a/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix index 35bcd7bfc2f3..6ffcc153ec45 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "guile-reader-${version}"; + pname = "guile-reader"; version = "0.6.2"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz"; + url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz"; sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"; }; diff --git a/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix index a606b3ecf288..41bfb2ef62a9 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-sdl/default.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "guile-sdl"; version = "0.5.2"; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; }; diff --git a/nixpkgs/pkgs/development/interpreters/acl2/default.nix b/nixpkgs/pkgs/development/interpreters/acl2/default.nix index a88d07d1655f..d53337aca1ad 100644 --- a/nixpkgs/pkgs/development/interpreters/acl2/default.nix +++ b/nixpkgs/pkgs/development/interpreters/acl2/default.nix @@ -11,7 +11,7 @@ revs = { "8.2" = "8.2"; }; in stdenv.mkDerivation rec { - name = "acl2-${version}"; + pname = "acl2"; version = "8.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/interpreters/bats/default.nix b/nixpkgs/pkgs/development/interpreters/bats/default.nix index 85794b09ae0b..744106bce5d0 100644 --- a/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, gnugrep }: stdenv.mkDerivation rec { - name = "bats-${version}"; + pname = "bats"; version = "1.1.0"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/interpreters/clips/default.nix b/nixpkgs/pkgs/development/interpreters/clips/default.nix index b597ba6fe789..918c577356cd 100644 --- a/nixpkgs/pkgs/development/interpreters/clips/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clips/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.30"; - name = "clips-${version}"; + pname = "clips"; src = fetchurl { url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z"; sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy"; diff --git a/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix b/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix index 57ced325aad0..369d84708dc4 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix @@ -3,7 +3,8 @@ let version = "0.4.4"; in stdenv.mkDerivation { - name = "clooj-${version}"; + pname = "clooj"; + inherit version; jar = fetchurl { # mirrored as original mediafire.com source does not work without user interaction diff --git a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix index 16f3e7f73e20..ab8e616ac6d5 100644 --- a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -128,7 +128,7 @@ let # packageJSON=./package.json; in stdenv.mkDerivation rec { inherit version; - name = "lumo-${version}"; + pname = "lumo"; src = fetchurl { url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/dart/default.nix b/nixpkgs/pkgs/development/interpreters/dart/default.nix index fa8996f0fb56..02ac6bfbcde7 100644 --- a/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -47,7 +47,8 @@ in stdenv.mkDerivation { - name = "dart-${version}"; + pname = "dart"; + inherit version; nativeBuildInputs = [ unzip diff --git a/nixpkgs/pkgs/development/interpreters/duktape/default.nix b/nixpkgs/pkgs/development/interpreters/duktape/default.nix index f79c30740a12..f968e04bbe99 100644 --- a/nixpkgs/pkgs/development/interpreters/duktape/default.nix +++ b/nixpkgs/pkgs/development/interpreters/duktape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "duktape-${version}"; + pname = "duktape"; version = "2.4.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/development/interpreters/eff/default.nix b/nixpkgs/pkgs/development/interpreters/eff/default.nix index 258aebe81727..7c7cd9abb7e9 100644 --- a/nixpkgs/pkgs/development/interpreters/eff/default.nix +++ b/nixpkgs/pkgs/development/interpreters/eff/default.nix @@ -4,7 +4,8 @@ let version = "5.0"; in stdenv.mkDerivation { - name = "eff-${version}"; + pname = "eff"; + inherit version; src = fetchFromGitHub { owner = "matijapretnar"; diff --git a/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 84ebc49a2218..54ee243cb33e 100644 --- a/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "08zsdl6pkg6dx7k0ns8cd070v7ydsxkscd2ms8wh9r68c08vwzcp"; + sha256 = "1j2vsqgljqw7415rgjlnc1w3nmr9ghizx2mncbm1yipwj8xbrmf6"; }; - cargoSha256 = "1hqlagwl94xcybfqq5h2mrz9296mjns2l598d6jclls7ac5wsdfc"; + cargoSha256 = "0ckxpmi547y7q4w287znimpxgaj3mjkgmkcs2n9cp4m8cw143hly"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ zeromq ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/interpreters/falcon/default.nix b/nixpkgs/pkgs/development/interpreters/falcon/default.nix index 857a1e5cd8df..744a0f76ff09 100644 --- a/nixpkgs/pkgs/development/interpreters/falcon/default.nix +++ b/nixpkgs/pkgs/development/interpreters/falcon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: stdenv.mkDerivation rec { - name = "falcon-${version}"; + pname = "falcon"; version = "2013-09-19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/interpreters/gauche/default.nix b/nixpkgs/pkgs/development/interpreters/gauche/default.nix index a0d20b7ebe4f..71542046af91 100644 --- a/nixpkgs/pkgs/development/interpreters/gauche/default.nix +++ b/nixpkgs/pkgs/development/interpreters/gauche/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gauche-${version}"; + pname = "gauche"; version = "0.9.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix index cd7dacf65279..7f15c2b31845 100644 --- a/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, gettext, ncurses }: stdenv.mkDerivation rec { - name = "gnu-apl-${version}"; + pname = "gnu-apl"; version = "1.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/nixpkgs/pkgs/development/interpreters/groovy/default.nix index d5635fc22327..bdd138418969 100644 --- a/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/groovy/default.nix @@ -3,7 +3,7 @@ # at runtime, need jdk stdenv.mkDerivation rec { - name = "groovy-${version}"; + pname = "groovy"; version = "2.5.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix index 56becd3d6c94..0d3fe100329c 100644 --- a/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix +++ b/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: stdenv.mkDerivation rec { - name = "icon-lang-${version}"; + pname = "icon-lang"; version = "9.5.1"; src = fetchFromGitHub { owner = "gtownsend"; diff --git a/nixpkgs/pkgs/development/interpreters/j/default.nix b/nixpkgs/pkgs/development/interpreters/j/default.nix index 11feb1170c2c..791ac6dd3381 100644 --- a/nixpkgs/pkgs/development/interpreters/j/default.nix +++ b/nixpkgs/pkgs/development/interpreters/j/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, readline, libedit, bc }: stdenv.mkDerivation rec { - name = "j-${version}"; + pname = "j"; version = "807"; jtype = "release"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix b/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix index 704e3eb4031a..91b4c0b9a9e6 100644 --- a/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix @@ -4,7 +4,7 @@ let makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL"); in stdenv.mkDerivation rec { - name = "jimtcl-${version}"; + pname = "jimtcl"; version = "0.78"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix index ba65c00f1e9d..4ab9427934d7 100644 --- a/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "joker-${version}"; + pname = "joker"; version = "0.12.4"; goPackagePath = "github.com/candid82/joker"; diff --git a/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/nixpkgs/pkgs/development/interpreters/jruby/default.nix index 56c0f1f73e6c..6c4a9f20fa3e 100644 --- a/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -4,7 +4,7 @@ let # The version number here is whatever is reported by the RUBY_VERSION string rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { - name = "jruby-${version}"; + pname = "jruby"; version = "9.2.8.0"; diff --git a/nixpkgs/pkgs/development/interpreters/jython/default.nix b/nixpkgs/pkgs/development/interpreters/jython/default.nix index f822fdd9c8f0..0e1734565f2f 100644 --- a/nixpkgs/pkgs/development/interpreters/jython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/jython/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "jython-${version}"; + pname = "jython"; version = "2.7.1"; diff --git a/nixpkgs/pkgs/development/interpreters/kona/default.nix b/nixpkgs/pkgs/development/interpreters/kona/default.nix index 03c836d9251a..a9922a387657 100644 --- a/nixpkgs/pkgs/development/interpreters/kona/default.nix +++ b/nixpkgs/pkgs/development/interpreters/kona/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "kona-${version}"; + pname = "kona"; version = "3.21"; src = fetchurl { url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/lolcode/default.nix b/nixpkgs/pkgs/development/interpreters/lolcode/default.nix index 284773fe660f..3ef239e89a9a 100644 --- a/nixpkgs/pkgs/development/interpreters/lolcode/default.nix +++ b/nixpkgs/pkgs/development/interpreters/lolcode/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lolcode-${version}"; + pname = "lolcode"; version = "0.11.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/build-rocks.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-rocks.nix deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/nixpkgs/pkgs/development/interpreters/lua-5/build-rocks.nix +++ /dev/null diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/build-rockspec.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-rockspec.nix deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/nixpkgs/pkgs/development/interpreters/lua-5/build-rockspec.nix +++ /dev/null diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix index 7aa41e95cc9b..0ac1fa30e2f8 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; - name = "lua-filesystem-${version}"; + pname = "lua-filesystem"; isLibrary = true; src = fetchurl { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix b/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix index d8a789e9209e..f0eb1becc578 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lua5 }: stdenv.mkDerivation rec { - name = "lua-sockets-${version}"; + pname = "lua-sockets"; version = "2.0.2"; src = fetchurl { url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/maude/default.nix b/nixpkgs/pkgs/development/interpreters/maude/default.nix index 30013946886b..afd2627d20ec 100644 --- a/nixpkgs/pkgs/development/interpreters/maude/default.nix +++ b/nixpkgs/pkgs/development/interpreters/maude/default.nix @@ -14,7 +14,8 @@ let in stdenv.mkDerivation rec { - name = "maude-${version}"; + pname = "maude"; + inherit version; src = fetchurl { url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/nixpkgs/pkgs/development/interpreters/metamath/default.nix index e8e23cee830a..cd325c949489 100644 --- a/nixpkgs/pkgs/development/interpreters/metamath/default.nix +++ b/nixpkgs/pkgs/development/interpreters/metamath/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "metamath-${version}"; + pname = "metamath"; version = "0.172"; buildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/nixpkgs/pkgs/development/interpreters/mujs/default.nix index ceea3932063a..aef23ad6881d 100644 --- a/nixpkgs/pkgs/development/interpreters/mujs/default.nix +++ b/nixpkgs/pkgs/development/interpreters/mujs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "mujs-${version}"; + pname = "mujs"; version = "1.0.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix b/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix index 277993339e23..bde2f5d9fa96 100644 --- a/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix +++ b/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { - name = "nix-exec-${version}"; + pname = "nix-exec"; + inherit version; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/development/interpreters/octave/default.nix b/nixpkgs/pkgs/development/interpreters/octave/default.nix index d3dda7655c2e..cc9f6fcc3c90 100644 --- a/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -19,9 +19,9 @@ in stdenv.mkDerivation rec { version = "5.1.0"; - name = "octave-${version}"; + pname = "octave"; src = fetchurl { - url = "mirror://gnu/octave/${name}.tar.gz"; + url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3"; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { # Keep a copy of the octave tests detailed results in the output # derivation, because someone may care postInstall = '' - cp test/fntests.log $out/share/octave/${name}-fntests.log || true + cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true ''; passthru = { diff --git a/nixpkgs/pkgs/development/interpreters/picoc/default.nix b/nixpkgs/pkgs/development/interpreters/picoc/default.nix index 62ab7b02585e..6e57ad250bb4 100644 --- a/nixpkgs/pkgs/development/interpreters/picoc/default.nix +++ b/nixpkgs/pkgs/development/interpreters/picoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, readline }: stdenv.mkDerivation rec { - name = "picoc-${version}"; + pname = "picoc"; version = "2015-05-04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix index 5adf41a0f3b6..dc3b08acbd96 100644 --- a/nixpkgs/pkgs/development/interpreters/picolisp/default.nix +++ b/nixpkgs/pkgs/development/interpreters/picolisp/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "picoLisp-${version}"; + pname = "picoLisp"; version = "19.6"; src = fetchurl { - url = "https://www.software-lab.de/${name}.tgz"; + url = "https://www.software-lab.de/${pname}-${version}.tgz"; sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq"; }; buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; diff --git a/nixpkgs/pkgs/development/interpreters/pixie/default.nix b/nixpkgs/pkgs/development/interpreters/pixie/default.nix index d1f2edce936d..99c763615e3d 100644 --- a/nixpkgs/pkgs/development/interpreters/pixie/default.nix +++ b/nixpkgs/pkgs/development/interpreters/pixie/default.nix @@ -30,7 +30,7 @@ let bin-path = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") [ gcc ]); build = {flags, target}: stdenv.mkDerivation rec { - name = "pixie-${version}"; + pname = "pixie"; version = "0-r${commit-count}-${variant}"; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = libs; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/boot.nix index 9e38e8250748..0b9ddc0bb345 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "python-boot-${version}"; + pname = "python-boot"; version = "2.7.12"; libPrefix = "python2.7"; diff --git a/nixpkgs/pkgs/development/interpreters/qnial/default.nix b/nixpkgs/pkgs/development/interpreters/qnial/default.nix index 779039c6d6aa..3b41e14be850 100644 --- a/nixpkgs/pkgs/development/interpreters/qnial/default.nix +++ b/nixpkgs/pkgs/development/interpreters/qnial/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: stdenv.mkDerivation rec { - name = "qnial-${version}"; + pname = "qnial"; version = "6.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix index e37c43a0bd65..35bd1729866e 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -45,7 +45,7 @@ let in stdenv.mkDerivation rec { - name = "racket-${version}"; + pname = "racket"; version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { inherit sha256; } )) { - inherit name; + inherit ;name = "${pname}-${version}"; sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl"; }; diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix index 1244ad5ecd2e..ab5493e8a9d0 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix +++ b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ , CoreServices, ApplicationServices }: stdenv.mkDerivation rec { - name = "rakudo-star-${version}"; + pname = "rakudo-star"; version = "2017.01"; src = fetchurl { - url = "http://rakudo.org/downloads/star/${name}.tar.gz"; + url = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz"; sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq"; }; diff --git a/nixpkgs/pkgs/development/interpreters/rebol/default.nix b/nixpkgs/pkgs/development/interpreters/rebol/default.nix index 4d98f18eee4a..274b70b2c798 100644 --- a/nixpkgs/pkgs/development/interpreters/rebol/default.nix +++ b/nixpkgs/pkgs/development/interpreters/rebol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }: stdenv.mkDerivation rec { - name = "rebol-nightly-${version}"; + pname = "rebol-nightly"; version = "3-alpha"; src = fetchFromGitHub { rev = "bd45d0de512ff5953e098301c3d610f6024515d6"; diff --git a/nixpkgs/pkgs/development/interpreters/red/default.nix b/nixpkgs/pkgs/development/interpreters/red/default.nix index 56ff02831741..2121f54a3b11 100644 --- a/nixpkgs/pkgs/development/interpreters/red/default.nix +++ b/nixpkgs/pkgs/development/interpreters/red/default.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "red-${version}"; + pname = "red"; version = "0.6.3"; src = fetchFromGitHub { rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { rm -rf $out/opt/red/rebol install -Dm755 console $out/bin/red install -Dm644 BSD-3-License.txt \ - $out/share/licenses/${name}/BSD-3-License.txt + $out/share/licenses/${pname}-${version}/BSD-3-License.txt install -Dm644 BSL-License.txt \ - $out/share/licenses/${name}/BSL-License.txt + $out/share/licenses/${pname}-${version}/BSL-License.txt install -Dm644 docs/red-system-quick-test.html \ - $out/share/doc/${name}/red-system-quick-test.html + $out/share/doc/${pname}-${version}/red-system-quick-test.html install -Dm644 docs/red-system-specs.html \ - $out/share/doc/${name}/red-system-specs.html + $out/share/doc/${pname}-${version}/red-system-specs.html # PathElf patchelf --set-interpreter \ diff --git a/nixpkgs/pkgs/development/interpreters/regina/default.nix b/nixpkgs/pkgs/development/interpreters/regina/default.nix index 1d67193a73cf..ec19b0679f4b 100644 --- a/nixpkgs/pkgs/development/interpreters/regina/default.nix +++ b/nixpkgs/pkgs/development/interpreters/regina/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "Regina-REXX-${version}"; + pname = "Regina-REXX"; version = "3.9.1"; src = fetchurl { - url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz"; sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx"; }; diff --git a/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/nixpkgs/pkgs/development/interpreters/renpy/default.nix index f438e9fb13ce..db68578d62a6 100644 --- a/nixpkgs/pkgs/development/interpreters/renpy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/renpy/default.nix @@ -6,7 +6,7 @@ with pythonPackages; stdenv.mkDerivation rec { - name = "renpy-${version}"; + pname = "renpy"; version = "7.3.2"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix index f2766f51534a..a938897227e2 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -55,7 +55,8 @@ let , libiconv, libobjc, libunwind, Foundation }: stdenv.mkDerivation rec { - name = "ruby-${version}"; + pname = "ruby"; + inherit version; src = if useRailsExpress then fetchFromGitHub { owner = "ruby"; diff --git a/nixpkgs/pkgs/development/interpreters/self/default.nix b/nixpkgs/pkgs/development/interpreters/self/default.nix index 594bbc05b7ce..c6c8caa7cf3e 100644 --- a/nixpkgs/pkgs/development/interpreters/self/default.nix +++ b/nixpkgs/pkgs/development/interpreters/self/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # $ Self -s myimage.snap # version = "4.5.0"; - name = "self-${version}"; + pname = "self"; src = fetchgit { url = "https://github.com/russellallen/self"; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 9c81b230ada2..e00af6213479 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,7 +1,7 @@ { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; version = "1.8.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix index 2c45ba589767..89bbd713a5c6 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "38.8.0"; - name = "spidermonkey-${version}"; + pname = "spidermonkey"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix index 2ec5923b0e1f..1e1ea10ef6dd 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix @@ -3,7 +3,8 @@ let version = "52.9.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix index 518fc5f77b72..175b2f2e7671 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix @@ -6,7 +6,8 @@ with stdenv.lib; let version = "60.4.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix index 057375182f53..049dd9192d7e 100644 --- a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix +++ b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -7,8 +7,8 @@ let optional = stdenv.lib.optional; in -stdenv.mkDerivation rec { - name = "supercollider-${version}"; +mkDerivation rec { + pname = "supercollider"; version = "3.10.2"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; - cmakeFlags = '' - -DSC_WII=OFF - -DSC_EL=${if useSCEL then "ON" else "OFF"} - ''; + cmakeFlags = [ + "-DSC_WII=OFF" + "-DSC_EL=${if useSCEL then "ON" else "OFF"}" + ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index cd377e70cd9c..d4ec1677bfbc 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "tcl-${version}"; + pname = "tcl"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix b/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix index f2c5fd938cec..ca897ec692c1 100644 --- a/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix +++ b/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tinyscheme-${version}"; + pname = "tinyscheme"; version = "1.41"; src = fetchurl { - url = "mirror://sourceforge/tinyscheme/${name}.tar.gz"; + url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz"; sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a"; }; diff --git a/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix index 77154b54fd8f..30ea124cf4bb 100644 --- a/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix +++ b/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, libX11, libXt }: stdenv.mkDerivation rec { - name = "unicon-lang-${version}"; + pname = "unicon-lang"; version = "11.7"; src = fetchurl { url = "http://unicon.org/dist/uni-2-4-2010.zip"; diff --git a/nixpkgs/pkgs/development/java-modules/jogl/default.nix b/nixpkgs/pkgs/development/java-modules/jogl/default.nix index 36c4af5f4961..abb549110a87 100644 --- a/nixpkgs/pkgs/development/java-modules/jogl/default.nix +++ b/nixpkgs/pkgs/development/java-modules/jogl/default.nix @@ -16,7 +16,8 @@ in fetchSubmodules = true; }; in stdenv.mkDerivation rec { - name = "jogl-${version}"; + pname = "jogl"; + inherit version; src = fetchgit { url = git://jogamp.org/srv/scm/jogl.git; diff --git a/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix b/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix index c67d72705482..69cb24fc0b0c 100644 --- a/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { - name = "postgresql-jdbc-${version}"; + pname = "postgresql-jdbc"; version = "42.2.5"; src = fetchMavenArtifact { diff --git a/nixpkgs/pkgs/development/libraries/CoinMP/default.nix b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix index fbf9615f88a2..f251d2bed0c5 100644 --- a/nixpkgs/pkgs/development/libraries/CoinMP/default.nix +++ b/nixpkgs/pkgs/development/libraries/CoinMP/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "CoinMP-${version}"; + pname = "CoinMP"; version = "1.8.4"; src = fetchurl { - url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz"; sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; diff --git a/nixpkgs/pkgs/development/libraries/LASzip/default.nix b/nixpkgs/pkgs/development/libraries/LASzip/default.nix index 9522038df6af..418900ddeeb5 100644 --- a/nixpkgs/pkgs/development/libraries/LASzip/default.nix +++ b/nixpkgs/pkgs/development/libraries/LASzip/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; - name = "LASzip-${version}"; + pname = "LASzip"; src = fetchurl { url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix index a8d5d608f895..610f1b768f24 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "SDL-${version}"; + pname = "SDL"; version = "1.2.15"; src = fetchurl { - url = "https://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 94aca192852d..d538a0969b04 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -23,11 +23,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "SDL2-${version}"; + pname = "SDL2"; version = "2.0.9"; src = fetchurl { - url = "https://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix index 803cc97a8ae8..d57bb6cbc940 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,12 +1,11 @@ { stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "SDL2_gfx"; version = "1.0.4"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz"; + url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz"; sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix index ba33b1fbc1de..326d9d66264d 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }: stdenv.mkDerivation rec { - name = "SDL2_image-${version}"; + pname = "SDL2_image"; version = "2.0.5"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix index 61e15d621bcd..826cf793cd2e 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix @@ -4,11 +4,11 @@ , enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { - name = "SDL2_mixer-${version}"; + pname = "SDL2_mixer"; version = "2.0.4"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix index 1cb74ac1b2d3..309102e70b5e 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix @@ -1,11 +1,11 @@ { stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "SDL2_net-${version}"; + pname = "SDL2_net"; version = "2.0.1"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix index b219922223fb..50e47bc1d362 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ { stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { - name = "SDL2_ttf-${version}"; + pname = "SDL2_ttf"; version = "2.0.15"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix index 68c8c16ed4e8..74a31d946874 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_gfx-${version}"; + pname = "SDL_gfx"; version = "2.0.26"; src = fetchurl { - url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; + url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz"; sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL_image/default.nix index 961a0a7f5aab..8e3078563e2b 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_image/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_image/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { - name = "SDL_image-${version}"; + pname = "SDL_image"; version = "1.2.12"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix index 887319062be9..427439f496e9 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "SDL_mixer"; version = "1.2.12"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz"; + url = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz"; sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL_net/default.nix b/nixpkgs/pkgs/development/libraries/SDL_net/default.nix index f1c5a5462d11..6ac91a6d129d 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_net/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_net/default.nix @@ -4,10 +4,8 @@ stdenv.mkDerivation rec { pname = "SDL_net"; version = "1.2.8"; - name = "${pname}-${version}"; - src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix index 6279bfcb4286..7b8fb67a30f1 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel }: stdenv.mkDerivation rec { - name = "SDL_sixel-${version}"; + pname = "SDL_sixel"; version = "1.2-nightly"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/SDL_sound/default.nix b/nixpkgs/pkgs/development/libraries/SDL_sound/default.nix index 0e717c530357..94534ecd6999 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_sound/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_sound/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }: stdenv.mkDerivation rec { - name = "SDL_sound-${version}"; + pname = "SDL_sound"; version = "1.0.3"; src = fetchurl { - url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz"; + url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz"; sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix b/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix index 7f276387c834..9695d51ed897 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_stretch-${version}"; + pname = "SDL_stretch"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2"; sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw"; }; diff --git a/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix index cf6b53021f79..96b60b1061fd 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_ttf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, SDL, freetype }: stdenv.mkDerivation rec { - name = "SDL_ttf-${version}"; + pname = "SDL_ttf"; version = "2.0.11"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; }; diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix index 4e1da8666227..5795d0baa624 100644 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "abseil-cpp-${version}"; + pname = "abseil-cpp"; date = "20190322"; rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a"; version = "${date}-${rev}"; diff --git a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix index a50c92924e9a..0aace12569a5 100644 --- a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }: stdenv.mkDerivation rec { - name = "accounts-qt-${version}"; + pname = "accounts-qt"; version = "1.15"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/development/libraries/ace/default.nix b/nixpkgs/pkgs/development/libraries/ace/default.nix index 75c942d4d487..04ab13314755 100644 --- a/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libtool, perl }: stdenv.mkDerivation rec { - name = "ace-${version}"; + pname = "ace"; version = "6.5.6"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ --replace /usr/bin/perl "${perl}/bin/perl"''; - + preConfigure = '' export INSTALL_PREFIX=$out export ACE_ROOT=$(pwd) diff --git a/nixpkgs/pkgs/development/libraries/adns/default.nix b/nixpkgs/pkgs/development/libraries/adns/default.nix index 76e49768d53d..c9797b31eaa9 100644 --- a/nixpkgs/pkgs/development/libraries/adns/default.nix +++ b/nixpkgs/pkgs/development/libraries/adns/default.nix @@ -4,7 +4,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "adns-${version}"; + pname = "adns"; + inherit version; src = fetchurl { urls = [ diff --git a/nixpkgs/pkgs/development/libraries/afflib/default.nix b/nixpkgs/pkgs/development/libraries/afflib/default.nix index 5170e384f77b..f0d87c811330 100644 --- a/nixpkgs/pkgs/development/libraries/afflib/default.nix +++ b/nixpkgs/pkgs/development/libraries/afflib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.7.18"; - name = "afflib-${version}"; + pname = "afflib"; src = fetchFromGitHub { owner = "sshock"; diff --git a/nixpkgs/pkgs/development/libraries/aften/default.nix b/nixpkgs/pkgs/development/libraries/aften/default.nix index 22e91ee61d7a..a1d4c2259091 100644 --- a/nixpkgs/pkgs/development/libraries/aften/default.nix +++ b/nixpkgs/pkgs/development/libraries/aften/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "aften-${version}"; + pname = "aften"; version = "0.0.8"; src = fetchurl { - url = "mirror://sourceforge/aften/${name}.tar.bz2"; + url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2"; sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47"; }; diff --git a/nixpkgs/pkgs/development/libraries/alembic/default.nix b/nixpkgs/pkgs/development/libraries/alembic/default.nix index 5c25da920556..1e9496c1a1cc 100644 --- a/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "alembic-${version}"; + pname = "alembic"; version = "1.7.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/alkimia/default.nix b/nixpkgs/pkgs/development/libraries/alkimia/default.nix index f98c8fa480e1..407aa557ea2e 100644 --- a/nixpkgs/pkgs/development/libraries/alkimia/default.nix +++ b/nixpkgs/pkgs/development/libraries/alkimia/default.nix @@ -4,11 +4,11 @@ }: mkDerivation rec { - name = "alkimia-${version}"; + pname = "alkimia"; version = "8.0.1"; src = fetchurl { - url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m"; }; diff --git a/nixpkgs/pkgs/development/libraries/allegro/default.nix b/nixpkgs/pkgs/development/libraries/allegro/default.nix index eca32b740e35..6b44ec1b598a 100644 --- a/nixpkgs/pkgs/development/libraries/allegro/default.nix +++ b/nixpkgs/pkgs/development/libraries/allegro/default.nix @@ -4,11 +4,11 @@ , libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { - name = "allegro-${version}"; + pname = "allegro"; version="4.4.2"; src = fetchurl { - url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; diff --git a/nixpkgs/pkgs/development/libraries/alure/default.nix b/nixpkgs/pkgs/development/libraries/alure/default.nix index 95828c44f851..a4f3b714e1cb 100644 --- a/nixpkgs/pkgs/development/libraries/alure/default.nix +++ b/nixpkgs/pkgs/development/libraries/alure/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, openal }: stdenv.mkDerivation rec { - name = "alure-${version}"; + pname = "alure"; version = "1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/amrwb/default.nix b/nixpkgs/pkgs/development/libraries/amrwb/default.nix index 15331c22599b..7525b3baab09 100644 --- a/nixpkgs/pkgs/development/libraries/amrwb/default.nix +++ b/nixpkgs/pkgs/development/libraries/amrwb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "amrwb-${version}"; + pname = "amrwb"; version = "11.0.0.0"; srcAmr = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index fc79cae36f83..9fc11555b697 100644 --- a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apache-activemq-${version}"; + pname = "apache-activemq"; version = "5.14.5"; src = fetchurl { sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54"; - url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz"; + url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix index 429da8de8350..62d72844386f 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "appstream-${version}"; + pname = "appstream"; version = "0.12.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix index 0013764d7791..307f57d20cf5 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -3,7 +3,7 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here stdenv.mkDerivation rec { - name = "appstream-qt-${version}"; + pname = "appstream-qt"; inherit (appstream) version src prePatch; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix index b26291469e75..8be98f061a84 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/default.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/default.nix @@ -5,14 +5,14 @@ let inherit ((import ./sources.nix).aqbanking) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "aqbanking-${version}"; + pname = "aqbanking"; inherit version; src = let qstring = "package=03&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix index bb337e471cfc..061ed77849f4 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -13,14 +13,14 @@ let inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "gwenhywfar-${version}"; + pname = "gwenhywfar"; inherit version; src = let qstring = "package=01&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix index 9a0b70e0d97f..23c300ab48a3 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -3,14 +3,14 @@ let inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; in stdenv.mkDerivation rec { - name = "libchipcard-${version}"; + pname = "libchipcard"; inherit version; src = let qstring = "package=02&release=${releaseId}&file=01"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ]; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/arb/default.nix b/nixpkgs/pkgs/development/libraries/arb/default.nix index eb58003a5f63..ac67a101bc58 100644 --- a/nixpkgs/pkgs/development/libraries/arb/default.nix +++ b/nixpkgs/pkgs/development/libraries/arb/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "arb"; version = "2.16.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 3b93a351f7f9..127c2f3ae311 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { + pname = "armadillo"; version = "9.600.6"; - name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 7660ea81eaf8..f763f98799d0 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - name = "arrow-cpp-${version}"; + pname = "arrow-cpp"; version = "0.14.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/asio/generic.nix b/nixpkgs/pkgs/development/libraries/asio/generic.nix index 72305cb633fb..b8d166507a90 100644 --- a/nixpkgs/pkgs/development/libraries/asio/generic.nix +++ b/nixpkgs/pkgs/development/libraries/asio/generic.nix @@ -5,7 +5,8 @@ with stdenv.lib; stdenv.mkDerivation { - name = "asio-${version}"; + pname = "asio"; + inherit version; src = fetchurl { url = "mirror://sourceforge/asio/asio-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/assimp/default.nix b/nixpkgs/pkgs/development/libraries/assimp/default.nix index 24e06b0d65a9..d5a98b0ce92e 100644 --- a/nixpkgs/pkgs/development/libraries/assimp/default.nix +++ b/nixpkgs/pkgs/development/libraries/assimp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, zlib }: stdenv.mkDerivation rec { - name = "assimp-${version}"; + pname = "assimp"; version = "4.1.0"; src = fetchFromGitHub{ diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix index 2268d4389026..a805949bf119 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,12 +16,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "at-spi2-atk"; version = "2.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"; }; diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 47c8c090d08f..7adc84f47861 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -17,12 +17,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "at-spi2-core"; version = "2.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix b/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix index b79d85bcd7c9..02409d6ace06 100644 --- a/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/jamomacore/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0-beta.1"; - name = "JamomaCore-${version}"; + pname = "JamomaCore"; src = fetchFromGitHub { owner = "jamoma"; diff --git a/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix index 3a4c363e23c8..2fde40327e96 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libsndfile }: stdenv.mkDerivation rec { - name = "libbs2b-${version}"; + pname = "libbs2b"; version = "3.1.0"; src = fetchurl { - url = "mirror://sourceforge/bs2b/${name}.tar.bz2"; + url = "mirror://sourceforge/bs2b/${pname}-${version}.tar.bz2"; sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix b/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix index ac6f0470a0a8..b8f1a5c088ac 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix @@ -2,7 +2,8 @@ let version = "0.6.2"; in stdenv.mkDerivation { - name = "libgme-${version}"; + pname = "libgme"; + inherit version; meta = with stdenv.lib; { description = "A collection of video game music chip emulators"; diff --git a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix index 0f9f5f5aac68..0e0f0c5d425d 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { - name = "libmysofa-${version}"; + pname = "libmysofa"; version = "0.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix index fe0e0854a327..1c5a5302d71c 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libsmf/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "libsmf-${version}"; + pname = "libsmf"; src = fetchurl { - url = "https://github.com/stump/libsmf/archive/${name}.tar.gz"; + url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz"; sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 373d50a0a434..04752fd29519 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { - name = "lilv-${version}"; + pname = "lilv"; version = "0.24.4"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix index d026dd258bc7..50593cab6476 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lv2-${version}"; + pname = "lv2"; version = "1.16.0"; src = fetchurl { - url = "http://lv2plug.in/spec/${name}.tar.bz2"; + url = "http://lv2plug.in/spec/${pname}-${version}.tar.bz2"; sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix index 81cc868f52ca..978376eb4fa7 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lv2-unstable-${version}"; + pname = "lv2-unstable"; version = "2017-07-08"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix index 78763ca29e2a..826c36db1a63 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "lvtk-${version}"; + pname = "lvtk"; version = "1.2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix index ddd3940098a4..7cb151e4203f 100644 --- a/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }: stdenv.mkDerivation rec { - name = "ntk-${version}"; + pname = "ntk"; version = "1.3.1000"; src = fetchFromGitHub { owner = "original-male"; diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix index 2adec665e1c0..dad36209ed8d 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.1.0"; - name = "rtaudio-${version}"; + pname = "rtaudio"; src = fetchFromGitHub { owner = "thestk"; diff --git a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix index 41bb9ca9f11b..6cd7d06da9df 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; - name = "rtmidi-${version}"; + pname = "rtmidi"; src = fetchFromGitHub { owner = "thestk"; diff --git a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix index 09a6230184af..21d6cdfb5d4d 100644 --- a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }: stdenv.mkDerivation rec { - name = "sratom-${version}"; + pname = "sratom"; version = "0.6.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 320fc41f76c5..d91784ce14f4 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , alsaLib, }: stdenv.mkDerivation rec { - name = "zita-alsa-pcmi-${version}"; + pname = "zita-alsa-pcmi"; version = "0.3.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix index 4fc5c12ccc4c..308aa020e363 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fftwFloat }: stdenv.mkDerivation rec { - name = "zita-convolver-${version}"; + pname = "zita-convolver"; version = "4.0.3"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs"; }; diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix index e9cccab39f02..98e272d5dab4 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zita-resampler-${version}"; + pname = "zita-resampler"; version = "1.6.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"; }; diff --git a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix index 11c66db70752..a2fdb66d7e95 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix @@ -3,7 +3,8 @@ let version = "1.8.2"; in stdenv.mkDerivation { - name = "avro-c++-${version}"; + pname = "avro-c++"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/nixpkgs/pkgs/development/libraries/avro-c/default.nix index cbd29a095d45..9582e54ffaca 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -3,7 +3,8 @@ let version = "1.9.0"; in stdenv.mkDerivation rec { - name = "avro-c-${version}"; + pname = "avro-c"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7233a187053e..1cc65b53b3e9 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "aws-sdk-cpp-${version}"; + pname = "aws-sdk-cpp"; version = "1.7.90"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index d95797d5a5f6..c4b1d36ce701 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { lcms2 ]; - doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; diff --git a/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix index 42621a1792cc..af727e394d16 100644 --- a/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "backward-${version}"; + pname = "backward"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix index 9d5063d8f07d..de436864edaa 100644 --- a/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -3,7 +3,7 @@ , xorgserver, dbus, python2, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "bamf-${version}"; + pname = "bamf"; version = "0.5.4"; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/beignet/default.nix b/nixpkgs/pkgs/development/libraries/beignet/default.nix index 05ff5593205a..05203d6c233a 100644 --- a/nixpkgs/pkgs/development/libraries/beignet/default.nix +++ b/nixpkgs/pkgs/development/libraries/beignet/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "beignet-${version}"; + pname = "beignet"; version = "unstable-2018.08.20"; src = fetchFromGitHub { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; passthru.utests = stdenv.mkDerivation rec { - name = "beignet-utests-${version}"; + pname = "beignet-utests"; inherit version src; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/biblesync/default.nix b/nixpkgs/pkgs/development/libraries/biblesync/default.nix index e6702d0db640..16be4600ec61 100644 --- a/nixpkgs/pkgs/development/libraries/biblesync/default.nix +++ b/nixpkgs/pkgs/development/libraries/biblesync/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "biblesync-${version}"; + pname = "biblesync"; version = "1.1.2"; src = fetchurl{ - url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz"; + url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz"; sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8"; }; diff --git a/nixpkgs/pkgs/development/libraries/bobcat/default.nix b/nixpkgs/pkgs/development/libraries/bobcat/default.nix index 812ad546f866..c7520c89ef54 100644 --- a/nixpkgs/pkgs/development/libraries/bobcat/default.nix +++ b/nixpkgs/pkgs/development/libraries/bobcat/default.nix @@ -3,7 +3,7 @@ , utillinux, yodl }: stdenv.mkDerivation rec { - name = "bobcat-${version}"; + pname = "bobcat"; version = "4.08.03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix index c84e0863517a..0e828a6f6dad 100644 --- a/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boehm-gc-${version}"; + pname = "boehm-gc"; version = "7.6.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix index a241b42e1878..cf76d9e7d24c 100644 --- a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "boehm-gc-${version}"; + pname = "boehm-gc"; version = "8.0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index ee62d5423a15..7db73f5ad47c 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -2,7 +2,7 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation rec { - name = "boringssl-${version}"; + pname = "boringssl"; version = "2017-02-23"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 2580b959bf2a..18b1b47f6d38 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "botan-${version}"; + pname = "botan"; version = "${baseVersion}.${revision}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/box2d/default.nix b/nixpkgs/pkgs/development/libraries/box2d/default.nix index 102e7bfcc12b..328ac434d85a 100644 --- a/nixpkgs/pkgs/development/libraries/box2d/default.nix +++ b/nixpkgs/pkgs/development/libraries/box2d/default.nix @@ -2,7 +2,7 @@ , libXi, pkgconfig }: stdenv.mkDerivation rec { - name = "box2d-${version}"; + pname = "box2d"; version = "2.3.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/brigand/default.nix b/nixpkgs/pkgs/development/libraries/brigand/default.nix index b4a57396cc8b..ba7b51bb0e4e 100644 --- a/nixpkgs/pkgs/development/libraries/brigand/default.nix +++ b/nixpkgs/pkgs/development/libraries/brigand/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "brigand-${version}"; + pname = "brigand"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/bullet/default.nix b/nixpkgs/pkgs/development/libraries/bullet/default.nix index b4a2133f7d8f..f6041802a9c5 100644 --- a/nixpkgs/pkgs/development/libraries/bullet/default.nix +++ b/nixpkgs/pkgs/development/libraries/bullet/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bullet-${version}"; + pname = "bullet"; version = "2.87"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix index 12fc1834e905..97fe7e512993 100644 --- a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "bullet-${version}"; + pname = "bullet"; version = "2019-03-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/bulletml/default.nix b/nixpkgs/pkgs/development/libraries/bulletml/default.nix index b61ac1dcb09f..f64090bd53a3 100644 --- a/nixpkgs/pkgs/development/libraries/bulletml/default.nix +++ b/nixpkgs/pkgs/development/libraries/bulletml/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "bulletml-${version}"; + pname = "bulletml"; + inherit version; srcs = [ (fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/bwidget/default.nix b/nixpkgs/pkgs/development/libraries/bwidget/default.nix index 1e2bda285a70..e763afc4a430 100644 --- a/nixpkgs/pkgs/development/libraries/bwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/bwidget/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { - name = "bwidget-${version}"; + pname = "bwidget"; version = "1.9.13"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix index 3603667fbf21..396e419406ae 100644 --- a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "c-blosc-${version}"; + pname = "c-blosc"; version = "1.16.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/caf/default.nix b/nixpkgs/pkgs/development/libraries/caf/default.nix index 4a1ea3942077..890e2996f5d2 100644 --- a/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "actor-framework-${version}"; + pname = "actor-framework"; version = "0.17.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 2d6fd1eab964..e5152b8a6461 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -22,10 +22,11 @@ let version = "1.16.0"; inherit (lib) enableFeature optional optionals; in stdenv.mkDerivation rec { - name = "cairo-${version}"; + pname = "cairo"; + inherit version; src = fetchurl { - url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; diff --git a/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/nixpkgs/pkgs/development/libraries/capnproto/default.nix index b175250872f3..9020ccf08b5b 100644 --- a/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "capnproto-${version}"; + pname = "capnproto"; version = "0.7.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix index c02633d880c4..956fd74da585 100644 --- a/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "capstone-${version}"; + pname = "capstone"; version = "4.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/catch/default.nix b/nixpkgs/pkgs/development/libraries/catch/default.nix index d83060fc24d8..92e5c04e0322 100644 --- a/nixpkgs/pkgs/development/libraries/catch/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch-${version}"; + pname = "catch"; version = "1.12.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix index 2d0fd4cb1bcf..d7876affe2f9 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch2-${version}"; + pname = "catch2"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/cctz/default.nix b/nixpkgs/pkgs/development/libraries/cctz/default.nix index 832b070c8837..5897f84efff0 100644 --- a/nixpkgs/pkgs/development/libraries/cctz/default.nix +++ b/nixpkgs/pkgs/development/libraries/cctz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, darwin }: stdenv.mkDerivation rec { - name = "cctz-${version}"; + pname = "cctz"; version = "2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/nixpkgs/pkgs/development/libraries/cddlib/default.nix index 68d34c75c010..5f6b3766012e 100644 --- a/nixpkgs/pkgs/development/libraries/cddlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/cddlib/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "cddlib-${version}"; + pname = "cddlib"; version = "0.94j"; src = fetchFromGitHub { owner = "cddlib"; diff --git a/nixpkgs/pkgs/development/libraries/cdk/default.nix b/nixpkgs/pkgs/development/libraries/cdk/default.nix index 4c311f07e017..8487435981ca 100644 --- a/nixpkgs/pkgs/development/libraries/cdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/cdk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "cdk-${version}"; + pname = "cdk"; version ="5.0-20190224"; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/cegui/default.nix b/nixpkgs/pkgs/development/libraries/cegui/default.nix index 7e5c768036fc..eaeb6bf8e43f 100644 --- a/nixpkgs/pkgs/development/libraries/cegui/default.nix +++ b/nixpkgs/pkgs/development/libraries/cegui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, ogre, freetype, boost, expat }: stdenv.mkDerivation rec { - name = "cegui-${version}"; + pname = "cegui"; version = "0.8.7"; src = fetchurl { - url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2"; + url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2"; sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; }; diff --git a/nixpkgs/pkgs/development/libraries/celt/generic.nix b/nixpkgs/pkgs/development/libraries/celt/generic.nix index 6bf7975034b5..d9e69b8e7512 100644 --- a/nixpkgs/pkgs/development/libraries/celt/generic.nix +++ b/nixpkgs/pkgs/development/libraries/celt/generic.nix @@ -7,7 +7,8 @@ # The celt codec has been deprecated and is now a part of the opus codec stdenv.mkDerivation rec { - name = "celt-${version}"; + pname = "celt"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix index 52e0f06eeec4..3ce8c4ef080a 100644 --- a/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix +++ b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix @@ -11,7 +11,7 @@ assert runTests -> gflags != null; stdenv.mkDerivation rec { - name = "ceres-solver-${version}"; + pname = "ceres-solver"; version = "1.14.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/cgui/default.nix b/nixpkgs/pkgs/development/libraries/cgui/default.nix index df75d3a1f1da..39ed74d00750 100644 --- a/nixpkgs/pkgs/development/libraries/cgui/default.nix +++ b/nixpkgs/pkgs/development/libraries/cgui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo, allegro, perl, libX11 }: stdenv.mkDerivation rec { - name = "cgui-${version}"; + pname = "cgui"; version="2.1.0"; src = fetchurl { - url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz"; sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s"; }; diff --git a/nixpkgs/pkgs/development/libraries/check/default.nix b/nixpkgs/pkgs/development/libraries/check/default.nix index ae8b6ca18df3..08610d1e9aff 100644 --- a/nixpkgs/pkgs/development/libraries/check/default.nix +++ b/nixpkgs/pkgs/development/libraries/check/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "check-${version}"; + pname = "check"; version = "0.12.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/chipmunk/default.nix b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix index f460b69a4f84..76f722f31aa7 100644 --- a/nixpkgs/pkgs/development/libraries/chipmunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "chipmunk-${version}"; + pname = "chipmunk"; majorVersion = "7"; version = "${majorVersion}.0.1"; diff --git a/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix index 02420735ff76..fd868884f986 100644 --- a/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, boost, ffmpeg }: stdenv.mkDerivation rec { - name = "chromaprint-${version}"; + pname = "chromaprint"; version = "1.3.2"; src = fetchurl { - url = "https://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/acoustid/chromaprint/downloads/${pname}-${version}.tar.gz"; sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; }; diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index 3e6e62e5a967..3e7ef6d96eec 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - - name = "cimg-${version}"; + pname = "cimg"; version = "2.7.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/cl/default.nix b/nixpkgs/pkgs/development/libraries/cl/default.nix index 1890d2b25a0d..a7d7a0ea982b 100644 --- a/nixpkgs/pkgs/development/libraries/cl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "cl-${version}"; + pname = "cl"; src = fetchFromGitHub { owner = "tonyrog"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # 'cp' line taken from Arch recipe # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl installPhase = '' - DIR=$out/lib/erlang/lib/${name} + DIR=$out/lib/erlang/lib/${pname}-${version} mkdir -p $DIR cp -ruv c_src doc ebin include priv src $DIR ''; diff --git a/nixpkgs/pkgs/development/libraries/classads/default.nix b/nixpkgs/pkgs/development/libraries/classads/default.nix index d329b1945fc7..ff8e1ca6759c 100644 --- a/nixpkgs/pkgs/development/libraries/classads/default.nix +++ b/nixpkgs/pkgs/development/libraries/classads/default.nix @@ -3,7 +3,8 @@ let version = "1.0.10"; in stdenv.mkDerivation { - name = "classads-${version}"; + pname = "classads"; + inherit version; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/clipper/default.nix b/nixpkgs/pkgs/development/libraries/clipper/default.nix index 086816655d3b..117524239061 100644 --- a/nixpkgs/pkgs/development/libraries/clipper/default.nix +++ b/nixpkgs/pkgs/development/libraries/clipper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.4.2"; - name = "Clipper-${version}"; + pname = "Clipper"; src = fetchurl { url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip"; sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1"; diff --git a/nixpkgs/pkgs/development/libraries/cln/default.nix b/nixpkgs/pkgs/development/libraries/cln/default.nix index 7764e9c67ed2..7adc2a365c5b 100644 --- a/nixpkgs/pkgs/development/libraries/cln/default.nix +++ b/nixpkgs/pkgs/development/libraries/cln/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "cln-${version}"; + pname = "cln"; version = "1.3.4"; src = fetchurl { - url = "${meta.homepage}${name}.tar.bz2"; + url = "${meta.homepage}${pname}-${version}.tar.bz2"; sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d"; }; diff --git a/nixpkgs/pkgs/development/libraries/cmark/default.nix b/nixpkgs/pkgs/development/libraries/cmark/default.nix index ede2049b6ee9..e7c02312b66e 100644 --- a/nixpkgs/pkgs/development/libraries/cmark/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.29.0"; - name = "cmark-${version}"; + pname = "cmark"; src = fetchFromGitHub { owner = "jgm"; diff --git a/nixpkgs/pkgs/development/libraries/cmrt/default.nix b/nixpkgs/pkgs/development/libraries/cmrt/default.nix index 8044d7165f75..11e719b36df4 100644 --- a/nixpkgs/pkgs/development/libraries/cmrt/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmrt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: stdenv.mkDerivation rec { - name = "cmrt-${version}"; + pname = "cmrt"; version = "1.0.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix index 9f4c4c3b6b36..7c42a7479b1a 100644 --- a/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation { - name = "codec2-${version}"; + pname = "codec2"; + inherit version; src = fetchsvn { url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}"; diff --git a/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix index 29ce216cadf1..cc42407433c5 100644 --- a/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix +++ b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "concurrencykit-${version}"; + pname = "concurrencykit"; version = "0.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/coprthr/default.nix b/nixpkgs/pkgs/development/libraries/coprthr/default.nix index 5630daa0d933..86f4485a900d 100644 --- a/nixpkgs/pkgs/development/libraries/coprthr/default.nix +++ b/nixpkgs/pkgs/development/libraries/coprthr/default.nix @@ -2,7 +2,7 @@ , bison, flex }: stdenv.mkDerivation rec { - name = "coprthr-${version}"; + pname = "coprthr"; version = "1.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix index c2f3ce9b9b4a..ea3eec825c70 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-hocon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { - name = "cpp-hocon-${version}"; + pname = "cpp-hocon"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix index c13b32a67b06..2585a7abaed1 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: stdenv.mkDerivation rec { - name = "cpp-ipfs-api-${version}"; + pname = "cpp-ipfs-api"; version = "2017-01-04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/cppcms/default.nix b/nixpkgs/pkgs/development/libraries/cppcms/default.nix index a2493e55fb0b..7bb2bad9689d 100644 --- a/nixpkgs/pkgs/development/libraries/cppcms/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppcms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { - name = "cppcms-${version}"; + pname = "cppcms"; version = "1.2.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; }; diff --git a/nixpkgs/pkgs/development/libraries/cppdb/default.nix b/nixpkgs/pkgs/development/libraries/cppdb/default.nix index 3423b29d76c8..737122c57bfe 100644 --- a/nixpkgs/pkgs/development/libraries/cppdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { - name = "cppdb-${version}"; + pname = "cppdb"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; }; diff --git a/nixpkgs/pkgs/development/libraries/cppunit/default.nix b/nixpkgs/pkgs/development/libraries/cppunit/default.nix index 3f8b2d896ac6..76fd6db18b05 100644 --- a/nixpkgs/pkgs/development/libraries/cppunit/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppunit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cppunit-${version}"; + pname = "cppunit"; version = "1.14.0"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/${name}.tar.gz"; + url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz"; sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; diff --git a/nixpkgs/pkgs/development/libraries/cpputest/default.nix b/nixpkgs/pkgs/development/libraries/cpputest/default.nix index 2dce60d4b2c4..28ab31a08ccd 100644 --- a/nixpkgs/pkgs/development/libraries/cpputest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpputest/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.8"; - name = "cpputest-${version}"; + pname = "cpputest"; src = fetchurl { - url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8"; }; diff --git a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix index 5bffda607ee1..2328bd533629 100644 --- a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zeromq }: stdenv.mkDerivation rec { - name = "cppzmq-${version}"; + pname = "cppzmq"; version = "4.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/cre2/default.nix b/nixpkgs/pkgs/development/libraries/cre2/default.nix index d8130d0b8f91..a4313fa94d36 100644 --- a/nixpkgs/pkgs/development/libraries/cre2/default.nix +++ b/nixpkgs/pkgs/development/libraries/cre2/default.nix @@ -2,8 +2,8 @@ libtool, pkgconfig, re2, texinfo }: stdenv.mkDerivation rec { - name = "cre2-${version}"; - version = "0.3.6"; + pname = "cre2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "marcomaggi"; diff --git a/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix index 61a825cd3745..cb481fc7084e 100644 --- a/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "crypto++-${version}"; + pname = "crypto++"; majorVersion = "5.6"; version = "${majorVersion}.5"; diff --git a/nixpkgs/pkgs/development/libraries/csfml/default.nix b/nixpkgs/pkgs/development/libraries/csfml/default.nix index 9b74ecdb0f7e..506aa5f475d6 100644 --- a/nixpkgs/pkgs/development/libraries/csfml/default.nix +++ b/nixpkgs/pkgs/development/libraries/csfml/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "csfml-${version}"; + pname = "csfml"; + inherit version; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; diff --git a/nixpkgs/pkgs/development/libraries/ctpl/default.nix b/nixpkgs/pkgs/development/libraries/ctpl/default.nix index fd81de5139d6..5696684e91d2 100644 --- a/nixpkgs/pkgs/development/libraries/ctpl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctpl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "ctpl-${version}"; + pname = "ctpl"; version = "0.3.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ctpp2/default.nix b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix index 5a2a53ef24d5..ea2230909a2c 100644 --- a/nixpkgs/pkgs/development/libraries/ctpp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctpp2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "ctpp2-${version}"; + pname = "ctpp2"; version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/${name}.tar.gz"; + url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; diff --git a/nixpkgs/pkgs/development/libraries/curlcpp/default.nix b/nixpkgs/pkgs/development/libraries/curlcpp/default.nix index a2188f687d13..647c80bf8ac3 100644 --- a/nixpkgs/pkgs/development/libraries/curlcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/curlcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { - name = "curlcpp-${version}"; + pname = "curlcpp"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/curlpp/default.nix b/nixpkgs/pkgs/development/libraries/curlpp/default.nix index 58f88e6d8ebf..490f472a0662 100644 --- a/nixpkgs/pkgs/development/libraries/curlpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/curlpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, curl }: stdenv.mkDerivation rec { - name = "curlpp-${version}"; + pname = "curlpp"; version = "0.8.1"; src = fetchFromGitHub { owner = "jpbarrette"; diff --git a/nixpkgs/pkgs/development/libraries/cutee/default.nix b/nixpkgs/pkgs/development/libraries/cutee/default.nix index ba1d02380e29..1658f8a6fa7a 100644 --- a/nixpkgs/pkgs/development/libraries/cutee/default.nix +++ b/nixpkgs/pkgs/development/libraries/cutee/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "cutee"; version = "0.4.2"; - name = "${pname}-${version}"; src = fetchurl { url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix index 216b644b38e1..e84fbe89aa95 100644 --- a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix +++ b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "cutelyst-${version}"; + pname = "cutelyst"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix b/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix index 8be68a314e3d..e668e6534777 100644 --- a/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cxx-prettyprint-unstable-${version}"; + pname = "cxx-prettyprint-unstable"; version = "2016-04-30"; rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533"; diff --git a/nixpkgs/pkgs/development/libraries/cxxtools/default.nix b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix index 77b27640fd77..4c572cf781a6 100644 --- a/nixpkgs/pkgs/development/libraries/cxxtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxxtools/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.2.1"; - name = "cxxtools-${version}"; + pname = "cxxtools"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; }; diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index 0bdaf1be9551..a050dd8d9cac 100644 --- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cyrus-sasl-${version}"; + pname = "cyrus-sasl"; version = "2.1.27"; src = fetchurl { urls = - [ "http://www.cyrusimap.org/releases/${name}.tar.gz" - "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + [ "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" + "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz" ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; }; diff --git a/nixpkgs/pkgs/development/libraries/czmq/3.x.nix b/nixpkgs/pkgs/development/libraries/czmq/3.x.nix index d418b879d1dd..73a51cd27310 100644 --- a/nixpkgs/pkgs/development/libraries/czmq/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/czmq/3.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.2"; - name = "czmq-${version}"; + pname = "czmq"; src = fetchurl { - url = "http://download.zeromq.org/${name}.tar.gz"; + url = "http://download.zeromq.org/${pname}-${version}.tar.gz"; sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; }; diff --git a/nixpkgs/pkgs/development/libraries/czmq/4.x.nix b/nixpkgs/pkgs/development/libraries/czmq/4.x.nix index 13cee8fe86ba..05e499c73d0c 100644 --- a/nixpkgs/pkgs/development/libraries/czmq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/czmq/4.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.2.0"; - name = "czmq-${version}"; + pname = "czmq"; src = fetchurl { - url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg"; }; diff --git a/nixpkgs/pkgs/development/libraries/czmqpp/default.nix b/nixpkgs/pkgs/development/libraries/czmqpp/default.nix index 0c026b9f47a5..079eb0806d2c 100644 --- a/nixpkgs/pkgs/development/libraries/czmqpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/czmqpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: stdenv.mkDerivation rec { - name = "czmqpp-${version}"; + pname = "czmqpp"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix index 163b0f4be883..2609f47b2760 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, dbus, glib, pkgconfig, expat }: stdenv.mkDerivation rec { - name = "dbus-cplusplus-${version}"; + pname = "dbus-cplusplus"; version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 0f897d97467f..22c0a9137cae 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: stdenv.mkDerivation rec { - name = "dbus-sharp-glib-${version}"; + pname = "dbus-sharp-glib"; version = "0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix index cd020317f4c2..496a109b58f1 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-glib-${version}"; + pname = "dbus-sharp-glib"; version = "0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 18ea3ad3ecb7..084beae59727 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-${version}"; + pname = "dbus-sharp"; version = "0.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix b/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix index 14db5baea3fb..0fd638dbf8eb 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: stdenv.mkDerivation rec { - name = "dbus-sharp-${version}"; + pname = "dbus-sharp"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/dbxml/default.nix b/nixpkgs/pkgs/development/libraries/dbxml/default.nix index da7549aeea36..b940315aed83 100644 --- a/nixpkgs/pkgs/development/libraries/dbxml/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbxml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, db62, xercesc, xqilla }: stdenv.mkDerivation rec { - name = "dbxml-${version}"; + pname = "dbxml"; version = "6.1.4"; src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + url = "http://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz"; sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a"; }; diff --git a/nixpkgs/pkgs/development/libraries/dirac/default.nix b/nixpkgs/pkgs/development/libraries/dirac/default.nix index 5b05d64f0727..93e5da5b792d 100644 --- a/nixpkgs/pkgs/development/libraries/dirac/default.nix +++ b/nixpkgs/pkgs/development/libraries/dirac/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.2"; - name = "dirac-${version}"; + pname = "dirac"; src = fetchurl { - url = "mirror://sourceforge/dirac/${name}.tar.gz"; + url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz"; sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1"; }; diff --git a/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix index d52f1b6a2cff..643e7d3cc5d7 100644 --- a/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "dleyna-connector-dbus"; - name = "${pname}-${version}"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix index 97d74e1ed3c8..dfa5509fb98e 100644 --- a/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { + pname = "dlib"; version = "19.17"; - name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; diff --git a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix index 83466b693f59..59578ef796ec 100644 --- a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.6.2"; - name = "docopt.cpp-${version}"; + pname = "docopt.cpp"; src = fetchFromGitHub { owner = "docopt"; diff --git a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix index 095697762ddd..bc4bc8b23524 100644 --- a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix +++ b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "double-conversion-${version}"; + pname = "double-conversion"; version = "3.1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/nixpkgs/pkgs/development/libraries/drumstick/default.nix index c85f6de0405c..756a03503b35 100644 --- a/nixpkgs/pkgs/development/libraries/drumstick/default.nix +++ b/nixpkgs/pkgs/development/libraries/drumstick/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "drumstick-${version}"; + pname = "drumstick"; version = "1.1.2"; src = fetchurl { - url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp"; }; diff --git a/nixpkgs/pkgs/development/libraries/dssi/default.nix b/nixpkgs/pkgs/development/libraries/dssi/default.nix index 9be19f51e7e8..779e6b077625 100644 --- a/nixpkgs/pkgs/development/libraries/dssi/default.nix +++ b/nixpkgs/pkgs/development/libraries/dssi/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "dssi-${version}"; + pname = "dssi"; version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/project/dssi/dssi/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/dssi/dssi/${version}/${pname}-${version}.tar.gz"; sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j"; }; diff --git a/nixpkgs/pkgs/development/libraries/dxflib/default.nix b/nixpkgs/pkgs/development/libraries/dxflib/default.nix index 832b013123dd..8d8b41e0609b 100644 --- a/nixpkgs/pkgs/development/libraries/dxflib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dxflib/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { version = "3.12.2"; - name = "dxflib-${version}"; + pname = "dxflib"; src = fetchurl { - url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; + url = "http://www.qcad.org/archives/dxflib/${pname}-${version}.src.tar.gz"; sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9"; }; diff --git a/nixpkgs/pkgs/development/libraries/dyncall/default.nix b/nixpkgs/pkgs/development/libraries/dyncall/default.nix index 704f5c51c9c9..a6ff37bee97a 100644 --- a/nixpkgs/pkgs/development/libraries/dyncall/default.nix +++ b/nixpkgs/pkgs/development/libraries/dyncall/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dyncall-${version}"; + pname = "dyncall"; version = "1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix index 4ca9eab51bbe..028cd221614b 100644 --- a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix @@ -3,7 +3,7 @@ # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { - name = "easyloggingpp-${version}"; + pname = "easyloggingpp"; version = "9.96.7"; src = fetchFromGitHub { owner = "muflihun"; diff --git a/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/nixpkgs/pkgs/development/libraries/eccodes/default.nix index 78f80d2baf42..a9a77f6a9daf 100644 --- a/nixpkgs/pkgs/development/libraries/eccodes/default.nix +++ b/nixpkgs/pkgs/development/libraries/eccodes/default.nix @@ -5,7 +5,7 @@ , enableOpenMPThreads ? false}: with stdenv.lib; stdenv.mkDerivation rec { - name = "eccodes-${version}"; + pname = "eccodes"; version = "2.12.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix index 62f04e061cfa..71229909431e 100644 --- a/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -13,7 +13,6 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "eclib"; version = "20190226"; # upgrade might break the sage interface # sage tests to run: diff --git a/nixpkgs/pkgs/development/libraries/editline/default.nix b/nixpkgs/pkgs/development/libraries/editline/default.nix index 6dfd4edd0716..5f9c72f04afe 100644 --- a/nixpkgs/pkgs/development/libraries/editline/default.nix +++ b/nixpkgs/pkgs/development/libraries/editline/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "editline-${version}"; + pname = "editline"; version = "1.16.1"; src = fetchFromGitHub { owner = "troglobit"; diff --git a/nixpkgs/pkgs/development/libraries/eigen/default.nix b/nixpkgs/pkgs/development/libraries/eigen/default.nix index 6aec15f976bb..63e2707917a5 100644 --- a/nixpkgs/pkgs/development/libraries/eigen/default.nix +++ b/nixpkgs/pkgs/development/libraries/eigen/default.nix @@ -4,7 +4,8 @@ let version = "3.3.7"; in stdenv.mkDerivation { - name = "eigen-${version}"; + pname = "eigen"; + inherit version; src = fetchurl { url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix index 710338842f8d..566f8bfd8d15 100644 --- a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "elementary-cmake-modules-${version}"; + pname = "elementary-cmake-modules"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/embree/2.x.nix b/nixpkgs/pkgs/development/libraries/embree/2.x.nix index c973c2bd9449..4fc85aee69f6 100644 --- a/nixpkgs/pkgs/development/libraries/embree/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/embree/2.x.nix @@ -3,7 +3,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: stdenv.mkDerivation rec { - name = "embree-${version}"; + pname = "embree"; version = "2.17.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/enchant/1.x.nix b/nixpkgs/pkgs/development/libraries/enchant/1.x.nix index b7303468cbaf..ed91f791149d 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/1.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/1.x.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.6.1"; pname = "enchant"; src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz"; + url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz"; sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; }; diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 8b559bd03c82..3f46390c12ba 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }: +{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell, unittest-cpp }: -let - version = "2.2.3"; +stdenv.mkDerivation rec { pname = "enchant"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "2.2.4"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b"; + url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "1p6a3qmrh8bjzds6x7rg9da0ir44gg804jzkf634h39wsa4vdmpm"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib hunspell ]; + checkInputs = [ unittest-cpp ]; propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file - doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory" + enableParallelBuilding = true; + + doCheck = false; # https://github.com/AbiWord/enchant/issues/219 meta = with stdenv.lib; { description = "Generic spell checking library"; diff --git a/nixpkgs/pkgs/development/libraries/epoxy/default.nix b/nixpkgs/pkgs/development/libraries/epoxy/default.nix index c4285eadabc0..d45767058bb7 100644 --- a/nixpkgs/pkgs/development/libraries/epoxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/epoxy/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "epoxy-${version}"; + pname = "epoxy"; version = "1.5.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/exempi/default.nix b/nixpkgs/pkgs/development/libraries/exempi/default.nix index 3bc5270f0537..22c812ba4c21 100644 --- a/nixpkgs/pkgs/development/libraries/exempi/default.nix +++ b/nixpkgs/pkgs/development/libraries/exempi/default.nix @@ -1,24 +1,14 @@ { stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.5"; + pname = "exempi"; + version = "2.5.1"; src = fetchurl { - url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2"; + url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; - patches = [ - # CVE-2018-12648 - # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9 - # remove with exempi > 2.4.5 - (fetchpatch { - name = "CVE-2018-12648.patch"; - url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch; - sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q"; - }) - ]; - configureFlags = [ "--with-boost=${boost.dev}" ]; diff --git a/nixpkgs/pkgs/development/libraries/exosip/default.nix b/nixpkgs/pkgs/development/libraries/exosip/default.nix index 332504e46b54..4968c38bfd33 100644 --- a/nixpkgs/pkgs/development/libraries/exosip/default.nix +++ b/nixpkgs/pkgs/development/libraries/exosip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }: stdenv.mkDerivation rec { - name = "libexosip2-${version}"; + pname = "libexosip2"; version = "4.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/faac/default.nix b/nixpkgs/pkgs/development/libraries/faac/default.nix index c568a670f553..7a5afd8e8018 100644 --- a/nixpkgs/pkgs/development/libraries/faac/default.nix +++ b/nixpkgs/pkgs/development/libraries/faac/default.nix @@ -7,11 +7,11 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "faac-${version}"; + pname = "faac"; version = "1.29.9.2"; src = fetchurl { - url = "mirror://sourceforge/faac/${name}.tar.gz"; + url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl"; }; diff --git a/nixpkgs/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix index e7e4835d2ed3..29c0252482ea 100644 --- a/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "faad2-${version}"; + pname = "faad2"; version = "2.8.8"; src = fetchurl { - url = "mirror://sourceforge/faac/${name}.tar.gz"; + url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; diff --git a/nixpkgs/pkgs/development/libraries/farbfeld/default.nix b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix index c23fc0bc59f6..a29cbb9bbd11 100644 --- a/nixpkgs/pkgs/development/libraries/farbfeld/default.nix +++ b/nixpkgs/pkgs/development/libraries/farbfeld/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { - name = "farbfeld-${version}"; + pname = "farbfeld"; version = "4"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/fastjson/default.nix b/nixpkgs/pkgs/development/libraries/fastjson/default.nix index bac867978f43..75d9146c3357 100644 --- a/nixpkgs/pkgs/development/libraries/fastjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/fastjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.99.8"; - name = "fastjson-${version}"; + pname = "fastjson"; src = fetchFromGitHub { repo = "libfastjson"; owner = "rsyslog"; diff --git a/nixpkgs/pkgs/development/libraries/fcgi/default.nix b/nixpkgs/pkgs/development/libraries/fcgi/default.nix index de78647dc483..5eb7e3866ce6 100644 --- a/nixpkgs/pkgs/development/libraries/fcgi/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "fcgi-${version}"; + pname = "fcgi"; version = "2.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix index 9b7cea3ebbcb..70269002e2fe 100644 --- a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix +++ b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fdk-aac-${version}"; + pname = "fdk-aac"; version = "2.0.0"; src = fetchurl { - url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; + url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp"; }; diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/1.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/1.nix index eae0326c832f..4a276db12c02 100644 --- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/1.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "1.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index a67210e860cd..858bc2093916 100644 --- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,7 +2,6 @@ , gmpxx }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "2.4.0"; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 28ab53feebdd..3b1aeeebaabd 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -237,7 +237,7 @@ assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { - name = "ffmpeg-full-${version}"; + pname = "ffmpeg-full"; version = "4.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix index 4607d3e2f197..439342a50b85 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "ffmpeg-sixel-${version}"; + pname = "ffmpeg-sixel"; version = "nightly-2.3.x"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 72929e127bcc..84260f3f57c7 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -65,11 +65,11 @@ assert openglSupport -> libGLU_combined != null; stdenv.mkDerivation rec { - name = "ffmpeg-${version}"; + pname = "ffmpeg"; inherit version; src = fetchurl { - url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; + url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix index a1cc11fb8c1e..45238690fe03 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "ffmpegthumbnailer-${version}"; + pname = "ffmpegthumbnailer"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/ffms/default.nix b/nixpkgs/pkgs/development/libraries/ffms/default.nix index 1ad861fc63d8..c404a12f3dfd 100644 --- a/nixpkgs/pkgs/development/libraries/ffms/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-${version}"; + pname = "ffms"; version = "2.23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/filter-audio/default.nix b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix index 4a2bed6b4979..07f1c7ec917a 100644 --- a/nixpkgs/pkgs/development/libraries/filter-audio/default.nix +++ b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "filter-audio-${version}"; + pname = "filter-audio"; version = "0.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix index 504b58b6aa4d..d96ceb5d26b8 100644 --- a/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "flatbuffers-${version}"; + pname = "flatbuffers"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/flint/default.nix b/nixpkgs/pkgs/development/libraries/flint/default.nix index d92a0c61aab8..20a80119b136 100644 --- a/nixpkgs/pkgs/development/libraries/flint/default.nix +++ b/nixpkgs/pkgs/development/libraries/flint/default.nix @@ -12,7 +12,7 @@ assert withBlas -> openblas != null; stdenv.mkDerivation rec { - name = "flint-${version}"; + pname = "flint"; version = "2.5.2"; # remove libflint.so.MAJOR patch when updating src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/fltk/1.4.nix b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix index cad4419a26cc..eebe119d142f 100644 --- a/nixpkgs/pkgs/development/libraries/fltk/1.4.nix +++ b/nixpkgs/pkgs/development/libraries/fltk/1.4.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/fltk/default.nix b/nixpkgs/pkgs/development/libraries/fltk/default.nix index bb9f8fe76c9d..a22b5eef8d2e 100644 --- a/nixpkgs/pkgs/development/libraries/fltk/default.nix +++ b/nixpkgs/pkgs/development/libraries/fltk/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 2cfc87d6a2e5..6ade5eb833a9 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.3.0"; - name = "fmt-${version}"; + pname = "fmt"; src = fetchFromGitHub { owner = "fmtlib"; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index a2c3d41d35d1..b072df506a99 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -2,7 +2,7 @@ , gflags, libiberty, openssl }: stdenv.mkDerivation rec { - name = "folly-${version}"; + pname = "folly"; version = "2019.08.05.00"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/fontconfig-ultimate/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig-ultimate/default.nix index 9aeb12344ece..b95d6dd559d4 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -2,7 +2,8 @@ let version = "2016-04-23"; in stdenv.mkDerivation { - name = "fontconfig-ultimate-${version}"; + pname = "fontconfig-ultimate"; + inherit version; src = fetchFromGitHub { sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498"; diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index f730e3e3408f..186560ae101f 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -17,11 +17,11 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-${version}"; + pname = "fontconfig"; version = "2.12.6"; src = fetchurl { - url = "http://fontconfig.org/release/${name}.tar.bz2"; + url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2"; sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; }; diff --git a/nixpkgs/pkgs/development/libraries/fox/default.nix b/nixpkgs/pkgs/development/libraries/fox/default.nix index 40430f34334c..fa4a8c23e2fb 100644 --- a/nixpkgs/pkgs/development/libraries/fox/default.nix +++ b/nixpkgs/pkgs/development/libraries/fox/default.nix @@ -2,11 +2,11 @@ , CoreServices ? null }: stdenv.mkDerivation rec { - name = "fox-${version}"; + pname = "fox"; version = "1.7.9"; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; diff --git a/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix index 4f1e0eaee7fb..af387b7232f4 100644 --- a/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix +++ b/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix @@ -7,10 +7,11 @@ let in stdenv.mkDerivation rec { - name = "fox-${version}"; + pname = "fox"; + inherit version; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5"; }; diff --git a/nixpkgs/pkgs/development/libraries/fplll/20160331.nix b/nixpkgs/pkgs/development/libraries/fplll/20160331.nix index 952ecb0eadeb..1fd18254e10f 100644 --- a/nixpkgs/pkgs/development/libraries/fplll/20160331.nix +++ b/nixpkgs/pkgs/development/libraries/fplll/20160331.nix @@ -2,7 +2,6 @@ , gmp, mpfr }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fplll"; version = "20160331"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/fplll/default.nix b/nixpkgs/pkgs/development/libraries/fplll/default.nix index 063217a45047..f06f7bf4a02f 100644 --- a/nixpkgs/pkgs/development/libraries/fplll/default.nix +++ b/nixpkgs/pkgs/development/libraries/fplll/default.nix @@ -2,7 +2,6 @@ , gmp, mpfr }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fplll"; version = "5.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/frame/default.nix b/nixpkgs/pkgs/development/libraries/frame/default.nix index e15626a160e2..feccfd1bfd2b 100644 --- a/nixpkgs/pkgs/development/libraries/frame/default.nix +++ b/nixpkgs/pkgs/development/libraries/frame/default.nix @@ -2,10 +2,10 @@ , stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "frame-${version}"; + pname = "frame"; version = "2.5.0"; src = fetchurl { - url = "https://launchpad.net/frame/trunk/v${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/frame/trunk/v${version}/+download/${pname}-${version}.tar.xz"; sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a"; }; diff --git a/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/nixpkgs/pkgs/development/libraries/freeglut/default.nix index c34d9591d386..8412248b6170 100644 --- a/nixpkgs/pkgs/development/libraries/freeglut/default.nix +++ b/nixpkgs/pkgs/development/libraries/freeglut/default.nix @@ -2,7 +2,8 @@ let version = "3.0.0"; in stdenv.mkDerivation { - name = "freeglut-${version}"; + pname = "freeglut"; + inherit version; src = fetchurl { url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/freenect/default.nix b/nixpkgs/pkgs/development/libraries/freenect/default.nix index 3771880d3608..41480789a08a 100644 --- a/nixpkgs/pkgs/development/libraries/freenect/default.nix +++ b/nixpkgs/pkgs/development/libraries/freenect/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "freenect-${version}"; + pname = "freenect"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index ee63ce2f2f9e..0ff9cea3d27c 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -7,11 +7,11 @@ assert odbcSupport -> unixODBC != null; # Work is in progress to move to cmake so revisit that later stdenv.mkDerivation rec { - name = "freetds-${version}"; + pname = "freetds"; version = "1.1.6"; src = fetchurl { - url = "https://www.freetds.org/files/stable/${name}.tar.bz2"; + url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; }; diff --git a/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/nixpkgs/pkgs/development/libraries/frei0r/default.nix index cdeddd82b71d..560855c908b1 100644 --- a/nixpkgs/pkgs/development/libraries/frei0r/default.nix +++ b/nixpkgs/pkgs/development/libraries/frei0r/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: stdenv.mkDerivation rec { - name = "frei0r-plugins-${version}"; + pname = "frei0r-plugins"; version = "1.6.1"; src = fetchurl { - url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz"; sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0"; }; diff --git a/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/nixpkgs/pkgs/development/libraries/fribidi/default.nix index b60f4be245e2..9798347eaddf 100644 --- a/nixpkgs/pkgs/development/libraries/fribidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/fribidi/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , fetchpatch - , meson , ninja , pkgconfig @@ -10,7 +9,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fribidi"; version = "1.0.5"; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { # NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; }; @@ -33,10 +31,11 @@ stdenv.mkDerivation rec { patchShebangs test ''; - nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - checkInptus = [ python3 ]; + doCheck = true; + checkInputs = [ python3 ]; meta = with stdenv.lib; { homepage = https://github.com/fribidi/fribidi; diff --git a/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix index 68f3c9d0ee59..5e8197d5e81a 100644 --- a/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, libtool, ghostscript, groff }: stdenv.mkDerivation rec { - name = "fstrcmp-${version}"; + pname = "fstrcmp"; version = "0.7"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/fstrm/default.nix b/nixpkgs/pkgs/development/libraries/fstrm/default.nix index 3fcf218d6b56..380f64cf523f 100644 --- a/nixpkgs/pkgs/development/libraries/fstrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/fstrm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }: stdenv.mkDerivation rec { - name = "fstrm-${version}"; + pname = "fstrm"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index 7e35ed2e5309..a990da4b010e 100644 --- a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { - name = "gbenchmark-${version}"; + pname = "gbenchmark"; version = "1.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix index 4762d1fb119f..2589b6cfa16b 100644 --- a/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/nixpkgs/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, flex, bison, file }: stdenv.mkDerivation rec { - name = "libstdc++5-${version}"; + pname = "libstdc++5"; version = "3.3.6"; src = [ diff --git a/nixpkgs/pkgs/development/libraries/gd/default.nix b/nixpkgs/pkgs/development/libraries/gd/default.nix index 5ceded0546c5..6f57d735980d 100644 --- a/nixpkgs/pkgs/development/libraries/gd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gd/default.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation rec { - name = "gd-${version}"; + pname = "gd"; version = "2.2.5"; src = fetchurl { - url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; + url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"; }; diff --git a/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix b/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix index 14113d8b87eb..baf847d4e0a2 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/2.4.0.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "2.4.0"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; }; diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 0db16e2efe3a..413d4e19dde7 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "3.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix b/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix index 40308a957915..a65740534146 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -3,11 +3,11 @@ , libpng }: stdenv.mkDerivation rec { - name = "gdal-${version}"; + pname = "gdal"; version = "1.11.5"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; }; diff --git a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix index a9b79dac7b88..b7043b61c8a6 100644 --- a/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdata-sharp/default.nix @@ -3,7 +3,7 @@ let newtonsoft-json = dotnetPackages.NewtonsoftJson; in stdenv.mkDerivation rec { - name = "gdata-sharp-${version}"; + pname = "gdata-sharp"; version = "2.2.0.0"; src = fetchsvn { diff --git a/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/nixpkgs/pkgs/development/libraries/gdcm/default.nix index fa99dbe1d9fa..29a30a1b157d 100644 --- a/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.1"; - name = "gdcm-${version}"; + pname = "gdcm"; src = fetchurl { - url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; + url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq"; }; diff --git a/nixpkgs/pkgs/development/libraries/gecode/3.nix b/nixpkgs/pkgs/development/libraries/gecode/3.nix index 32e1163e0f07..0d96b9b5a924 100644 --- a/nixpkgs/pkgs/development/libraries/gecode/3.nix +++ b/nixpkgs/pkgs/development/libraries/gecode/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { - name = "gecode-${version}"; + pname = "gecode"; version = "3.7.3"; src = fetchurl { - url = "http://www.gecode.org/download/${name}.tar.gz"; + url = "http://www.gecode.org/download/${pname}-${version}.tar.gz"; sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; }; diff --git a/nixpkgs/pkgs/development/libraries/gecode/default.nix b/nixpkgs/pkgs/development/libraries/gecode/default.nix index 9a6b5d9cf273..454e811447a1 100644 --- a/nixpkgs/pkgs/development/libraries/gecode/default.nix +++ b/nixpkgs/pkgs/development/libraries/gecode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: stdenv.mkDerivation rec { - name = "gecode-${version}"; + pname = "gecode"; version = "6.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/geis/default.nix b/nixpkgs/pkgs/development/libraries/geis/default.nix index 4b9f67b7aaf8..97b9ba087e28 100644 --- a/nixpkgs/pkgs/development/libraries/geis/default.nix +++ b/nixpkgs/pkgs/development/libraries/geis/default.nix @@ -21,11 +21,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "geis-${version}"; + pname = "geis"; version = "2.2.17"; src = fetchurl { - url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; diff --git a/nixpkgs/pkgs/development/libraries/getdata/default.nix b/nixpkgs/pkgs/development/libraries/getdata/default.nix index 22e7d216e6cd..0e0477cd24da 100644 --- a/nixpkgs/pkgs/development/libraries/getdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "getdata-${version}"; + pname = "getdata"; version = "0.10.0"; src = fetchurl { - url = "mirror://sourceforge/getdata/${name}.tar.xz"; + url = "mirror://sourceforge/getdata/${pname}-${version}.tar.xz"; sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; diff --git a/nixpkgs/pkgs/development/libraries/getdns/default.nix b/nixpkgs/pkgs/development/libraries/getdns/default.nix index 0493071ee228..3a6c4ee1dbda 100644 --- a/nixpkgs/pkgs/development/libraries/getdns/default.nix +++ b/nixpkgs/pkgs/development/libraries/getdns/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "getdns"; - name = "${pname}-${version}"; version = "1.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index 6eb8bae435be..9547c6c31ada 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -2,11 +2,11 @@ let allowBisonDependency = !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gettext-${version}"; + pname = "gettext"; version = "0.19.8.1"; src = fetchurl { - url = "mirror://gnu/gettext/${name}.tar.gz"; + url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gf2x/default.nix b/nixpkgs/pkgs/development/libraries/gf2x/default.nix index a00e07376c7b..b1a2524065a5 100644 --- a/nixpkgs/pkgs/development/libraries/gf2x/default.nix +++ b/nixpkgs/pkgs/development/libraries/gf2x/default.nix @@ -4,7 +4,7 @@ , optimize ? false # impure hardware optimizations }: stdenv.mkDerivation rec { - name = "gf2x-${version}"; + pname = "gf2x"; version = "1.2"; # remember to also update the url src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix index b0a115eb4a51..86c5b7949a1b 100644 --- a/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gio-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { - name = "gio-sharp-${version}"; + pname = "gio-sharp"; version = "0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/givaro/3.7.nix b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix index 3101bc64333e..debddc6723fb 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/3.7.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/3.7.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "3.7.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/givaro/3.nix b/nixpkgs/pkgs/development/libraries/givaro/3.nix index d73a448f1662..efed0926bb32 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/3.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/3.nix @@ -1,6 +1,5 @@ {stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "3.8.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index 1a97150aa48c..79fb7a8d738f 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "givaro"; version = "4.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gl2ps/default.nix b/nixpkgs/pkgs/development/libraries/gl2ps/default.nix index aadc6986f5ad..8b522c6e92b0 100644 --- a/nixpkgs/pkgs/development/libraries/gl2ps/default.nix +++ b/nixpkgs/pkgs/development/libraries/gl2ps/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.4.0"; - name = "gl2ps-${version}"; + pname = "gl2ps"; src = fetchurl { - url = "http://geuz.org/gl2ps/src/${name}.tgz"; + url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; }; diff --git a/nixpkgs/pkgs/development/libraries/glbinding/default.nix b/nixpkgs/pkgs/development/libraries/glbinding/default.nix index d12b8a7c11d0..6498419bc27d 100644 --- a/nixpkgs/pkgs/development/libraries/glbinding/default.nix +++ b/nixpkgs/pkgs/development/libraries/glbinding/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "glbinding"; version = "3.1.0"; diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 6944d5b9292c..2ee36d405b31 100644 --- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "glfw-${version}"; + pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index ecbcbea13941..48e65cc063b0 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -46,15 +46,16 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.60.4"; + version = "2.60.6"; in stdenv.mkDerivation rec { - name = "glib-${version}"; + pname = "glib"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b"; + url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -98,8 +99,12 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP") - ++ [ "-Wno-error=nonnull" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=nonnull" + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; postPatch = '' # substitute fix-gio-launch-desktop-path.patch @@ -135,7 +140,7 @@ stdenv.mkDerivation rec { sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc @@ -144,7 +149,7 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" diff --git a/nixpkgs/pkgs/development/libraries/glm/default.nix b/nixpkgs/pkgs/development/libraries/glm/default.nix index 319a0359c581..e7d4c934db81 100644 --- a/nixpkgs/pkgs/development/libraries/glm/default.nix +++ b/nixpkgs/pkgs/development/libraries/glm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.8.5"; - name = "glm-${version}"; + pname = "glm"; src = fetchzip { - url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip"; + url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip"; sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2"; }; diff --git a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix index 269071434d57..9cb5dda507d2 100644 --- a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix +++ b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix @@ -6,7 +6,8 @@ let version = "5.7"; in stdenv.mkDerivation { - name = "globalarrays-${version}"; + pname = "globalarrays"; + inherit version; src = fetchFromGitHub { owner = "GlobalArrays"; diff --git a/nixpkgs/pkgs/development/libraries/globalplatform/default.nix b/nixpkgs/pkgs/development/libraries/globalplatform/default.nix index f01fb13c3c3e..b3cf36107afa 100644 --- a/nixpkgs/pkgs/development/libraries/globalplatform/default.nix +++ b/nixpkgs/pkgs/development/libraries/globalplatform/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { - name = "globalplatform-${version}"; + pname = "globalplatform"; version = "6.0.0"; src = fetchurl { - url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy"; }; diff --git a/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index 87addaa99919..e01deea11752 100644 --- a/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/nixpkgs/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }: stdenv.mkDerivation rec { - name = "gppcscconnectionplugin-${version}"; + pname = "gppcscconnectionplugin"; version = "1.1.0"; src = fetchurl { - url = "mirror://sourceforge/globalplatform/${name}.tar.gz"; + url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz"; sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad"; }; diff --git a/nixpkgs/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix index 9ae181e94530..6aa300e2b627 100644 --- a/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, perl }: stdenv.mkDerivation rec { - name = "glog-${version}"; + pname = "glog"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gloox/default.nix b/nixpkgs/pkgs/development/libraries/gloox/default.nix index d532e906a510..d44bcdda9aed 100644 --- a/nixpkgs/pkgs/development/libraries/gloox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gloox/default.nix @@ -14,7 +14,8 @@ let version = "1.0.22"; in stdenv.mkDerivation rec { - name = "gloox-${version}"; + pname = "gloox"; + inherit version; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/glpk/default.nix b/nixpkgs/pkgs/development/libraries/glpk/default.nix index 1d35c0696d27..84a7aff71076 100644 --- a/nixpkgs/pkgs/development/libraries/glpk/default.nix +++ b/nixpkgs/pkgs/development/libraries/glpk/default.nix @@ -14,10 +14,10 @@ assert withGmp -> gmp != null; stdenv.mkDerivation rec { version = "4.65"; - name = "glpk-${version}"; + pname = "glpk"; src = fetchurl { - url = "mirror://gnu/glpk/${name}.tar.gz"; + url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; }; diff --git a/nixpkgs/pkgs/development/libraries/gmime/2.nix b/nixpkgs/pkgs/development/libraries/gmime/2.nix index b373095a8148..3b4ad1393d0e 100644 --- a/nixpkgs/pkgs/development/libraries/gmime/2.nix +++ b/nixpkgs/pkgs/development/libraries/gmime/2.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.23"; - name = "gmime-${version}"; + pname = "gmime"; src = fetchurl { - url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; + url = "mirror://gnome/sources/gmime/2.6/${pname}-${version}.tar.xz"; sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi"; }; diff --git a/nixpkgs/pkgs/development/libraries/gmime/3.nix b/nixpkgs/pkgs/development/libraries/gmime/3.nix index 699d2854f3db..81546e5c1272 100644 --- a/nixpkgs/pkgs/development/libraries/gmime/3.nix +++ b/nixpkgs/pkgs/development/libraries/gmime/3.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.2.3"; - name = "gmime-${version}"; + pname = "gmime"; src = fetchurl { - url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz"; + url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a"; }; diff --git a/nixpkgs/pkgs/development/libraries/gmm/default.nix b/nixpkgs/pkgs/development/libraries/gmm/default.nix index 6423e1fce981..63d9d8c27626 100644 --- a/nixpkgs/pkgs/development/libraries/gmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gmm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gmm-${version}"; + pname = "gmm"; version = "5.3"; src = fetchurl { - url = "mirror://savannah/getfem/stable/${name}.tar.gz"; + url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46"; }; diff --git a/nixpkgs/pkgs/development/libraries/gmtk/default.nix b/nixpkgs/pkgs/development/libraries/gmtk/default.nix index 0fac97aaa439..10d584c6ccb0 100644 --- a/nixpkgs/pkgs/development/libraries/gmtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/gmtk/default.nix @@ -2,7 +2,7 @@ , libpulseaudio, mplayer, gnome_mplayer }: stdenv.mkDerivation rec { - name = "gmtk-${version}"; + pname = "gmtk"; version = "1.0.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix index 5e525ad46af4..36d42644e0b5 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-sharp/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "gnome-sharp-${version}"; + pname = "gnome-sharp"; version = "2.24.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index 7918fb7b9c4b..e914f9d78eef 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -14,7 +14,7 @@ let }; in stdenv.mkDerivation rec { - name = "gnu-config-${version}"; + pname = "gnu-config"; version = "2019-04-15"; buildCommand = '' diff --git a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix index 036863c9c0bf..af225cc50f24 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pciutils }: with stdenv.lib; stdenv.mkDerivation rec { - name = "gnu-efi-${version}"; + pname = "gnu-efi"; version = "3.0.9"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; + url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7"; }; diff --git a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix index 75c71632aebc..cb81b52b7301 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -15,7 +15,8 @@ let doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { - name = "gnutls-kdh-${version}"; + pname = "gnutls-kdh"; + inherit version; inherit src patches; diff --git a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index 99b1307179a5..c7556276dc39 100644 --- a/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -3,12 +3,13 @@ let version = "2.0.4"; in stdenv.mkDerivation rec { - name = "goocanvas-${version}"; + pname = "goocanvas"; + inherit version; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz"; sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index c462f2e685a2..26d5e9c88c75 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "gpgme-${version}"; + pname = "gpgme"; version = "1.13.1"; src = fetchurl { - url = "mirror://gnupg/gpgme/${name}.tar.bz2"; + url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4"; }; diff --git a/nixpkgs/pkgs/development/libraries/grail/default.nix b/nixpkgs/pkgs/development/libraries/grail/default.nix index a48490ffae57..722fb79d5d61 100644 --- a/nixpkgs/pkgs/development/libraries/grail/default.nix +++ b/nixpkgs/pkgs/development/libraries/grail/default.nix @@ -2,11 +2,11 @@ stdenv, fetchurl, pkgconfig, xorg, python3, frame }: stdenv.mkDerivation rec { - name = "grail-${version}"; + pname = "grail"; version = "3.1.1"; src = fetchurl { - url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/grail/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay"; }; diff --git a/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix index 52c087b19147..45096e031d37 100644 --- a/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix +++ b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix @@ -1,15 +1,14 @@ { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: mkDerivation rec { - name = "grantlee-${version}"; + pname = "grantlee"; version = "5.1.0"; - grantleeCompatVersion = "5.1"; - grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}"; + grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; buildInputs = [ qtbase qtscript ]; diff --git a/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch new file mode 100644 index 000000000000..d049d6c96f81 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch @@ -0,0 +1,24 @@ +From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Sat, 20 Jul 2019 17:35:30 +0200 +Subject: [PATCH] Fix compile with newer Qt/cmake combination + +Without this i get huge errors about Qt needing C++11 support +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d51110..0859788 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,6 +11,9 @@ endif() + + project(Grantlee) + ++set (CMAKE_CXX_STANDARD 11) ++set (CMAKE_CXX_EXTENSIONS OFF) ++ + # Workaround for http://public.kitware.com/Bug/view.php?id=12301 + if (MINGW) + if(NOT CMAKE_BUILD_TYPE) diff --git a/nixpkgs/pkgs/development/libraries/grantlee/5/series b/nixpkgs/pkgs/development/libraries/grantlee/5/series index 9c4015a1c197..19850b2e7e43 100644 --- a/nixpkgs/pkgs/development/libraries/grantlee/5/series +++ b/nixpkgs/pkgs/development/libraries/grantlee/5/series @@ -1,2 +1,3 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch +grantlee-cxx11.patch diff --git a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 3e21f3c229fa..66c5d8eb061a 100644 --- a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "graphene-hardened-malloc-${version}"; + pname = "graphene-hardened-malloc"; version = "2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/grib-api/default.nix b/nixpkgs/pkgs/development/libraries/grib-api/default.nix index 224cd125dce6..38243ce5a6d8 100644 --- a/nixpkgs/pkgs/development/libraries/grib-api/default.nix +++ b/nixpkgs/pkgs/development/libraries/grib-api/default.nix @@ -3,7 +3,7 @@ enablePython ? false, pythonPackages }: stdenv.mkDerivation rec{ - name = "grib-api-${version}"; + pname = "grib-api"; version = "1.28.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 78335e073edc..d45aba1cb378 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too - name = "grpc-${version}"; + pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index d454ca63fd7f..ffb8be85d3ac 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -6,11 +6,11 @@ , gnome3 }: stdenv.mkDerivation rec { - name = "gsettings-desktop-schemas-${version}"; + pname = "gsettings-desktop-schemas"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; }; diff --git a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix index 744d9eb6de90..812128fb12fb 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gsettings-qt-${version}"; + pname = "gsettings-qt"; version = "0.1.20170824"; src = fetchbzr { diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 7c15e10620a5..0ba3bf354235 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-lastfm-${version}"; + pname = "gsignond-plugin-lastfm"; version = "2018-05-07"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix index 887376d31874..d9afecc6d0c1 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -3,7 +3,7 @@ , docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-oauth-${version}"; + pname = "gsignond-plugin-oauth"; version = "2018-10-15"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix index 655f73931f67..b9eecaf0946f 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { - name = "gsignond-plugin-sasl-${version}"; + pname = "gsignond-plugin-sasl"; version = "2018-10-15"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/development/libraries/gsm/default.nix b/nixpkgs/pkgs/development/libraries/gsm/default.nix index 33583a4c6bb3..1405d4782ad3 100644 --- a/nixpkgs/pkgs/development/libraries/gsm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsm/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "gsm-${version}"; + pname = "gsm"; version = "1.0.18"; src = fetchurl { - url = "http://www.quut.com/gsm/${name}.tar.gz"; + url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; }; diff --git a/nixpkgs/pkgs/development/libraries/gsoap/default.nix b/nixpkgs/pkgs/development/libraries/gsoap/default.nix index f099d3fabc04..a1a0da51017b 100644 --- a/nixpkgs/pkgs/development/libraries/gsoap/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsoap/default.nix @@ -4,7 +4,7 @@ let majorVersion = "2.8"; in stdenv.mkDerivation rec { - name = "gsoap-${version}"; + pname = "gsoap"; version = "${majorVersion}.53"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 2ae0ad2b453b..735ab4e6e18e 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -51,7 +51,7 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-${version}"; + pname = "gst-plugins-bad"; version = "1.16.0"; meta = with stdenv.lib; { @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz"; sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 87bbef227de8..fb1d627d7b12 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -14,7 +14,7 @@ , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: stdenv.mkDerivation rec { - name = "gst-plugins-base-${version}"; + pname = "gst-plugins-base"; version = "1.16.0"; meta = with lib; { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz"; sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index fa838d5ff773..f0f01a977fd1 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-${version}"; + pname = "gstreamer"; version = "1.16.0"; meta = with lib ;{ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; + url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz"; sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 703fcb58898a..810cee650ca8 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-${version}"; + pname = "gstreamer-editing-services"; version = "1.16.0"; meta = with stdenv.lib; { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; + url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz"; sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 557e3caa7220..c801684b0659 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -25,7 +25,7 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-good-${version}"; + pname = "gst-plugins-good"; version = "1.16.0"; meta = with stdenv.lib; { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz"; sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 297c8ada884e..1847b8d0c12b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-${version}"; + pname = "gst-libav"; version = "1.16.0"; meta = { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz"; sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index c4620a29e945..5c571fa4a1e7 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-rtsp-server-${version}"; + pname = "gst-rtsp-server"; version = "1.16.0"; meta = with stdenv.lib; { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz"; sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 5c3a56814bad..552ab1ec2921 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-${version}"; + pname = "gst-plugins-ugly"; version = "1.16.0"; meta = with lib; { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz"; sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index c0541857e8b7..7e64636d96d3 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-vaapi-${version}"; + pname = "gst-vaapi"; version = "1.16.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix index 06d275078f30..ad013d1570e1 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-${version}"; + pname = "gst-validate"; version = "1.16.0"; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; + url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz"; sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtest/default.nix b/nixpkgs/pkgs/development/libraries/gtest/default.nix index 9ceb571983e2..5fecd45b7da1 100644 --- a/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -2,7 +2,7 @@ , static ? false }: stdenv.mkDerivation rec { - name = "gtest-${version}"; + pname = "gtest"; version = "1.8.1"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix index 94b745794f1e..40be17fcac7c 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix @@ -77,6 +77,13 @@ stdenv.mkDerivation rec { "-Dtests=false" ]; + # These are the defines that'd you'd get with --enable-debug=minimum (default). + # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options + NIX_CFLAGS_COMPILE = [ + "-DG_ENABLE_DEBUG" + "-DG_DISABLE_CAST_CHECKS" + ]; + postPatch = '' files=( build-aux/meson/post-install.py diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix index 7f35f088da2b..1e3b7d45edda 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { - name = "gtk-sharp-beans-${version}"; + pname = "gtk-sharp-beans"; version = "2.14.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix index 659dc14800e1..615ea66f4d99 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -23,7 +23,7 @@ }: stdenv.mkDerivation rec { - name = "gtk-sharp-${version}"; + pname = "gtk-sharp"; version = "2.12.45"; builder = ./builder.sh; diff --git a/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix index c2f05b51a65e..d26cc9692596 100644 --- a/nixpkgs/pkgs/development/libraries/gtkd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix @@ -4,7 +4,7 @@ let inherit (gst_all_1) gstreamer gst-plugins-base; in stdenv.mkDerivation rec { - name = "gtkd-${version}"; + pname = "gtkd"; version = "3.8.5"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index 9d1751afaf91..1b35221f066b 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -2,11 +2,11 @@ , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "3.24.11"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index 553e9fd9cbb6..fde94e79f056 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -2,11 +2,11 @@ , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "4.2.0"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix index 455cc4d4b81e..1b66bfd031fc 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { - name = "gtksourceviewmm-${version}"; + pname = "gtksourceviewmm"; version = "3.21.3"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtkspell/3.nix b/nixpkgs/pkgs/development/libraries/gtkspell/3.nix index f0baecb19904..54b4b001d817 100644 --- a/nixpkgs/pkgs/development/libraries/gtkspell/3.nix +++ b/nixpkgs/pkgs/development/libraries/gtkspell/3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}: stdenv.mkDerivation rec { - name = "gtkspell-${version}"; + pname = "gtkspell"; version = "3.0.10"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix b/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix index cb141f8c5569..97f1a12c1785 100644 --- a/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "gtkspellmm-${version}"; + pname = "gtkspellmm"; version = "3.0.5"; src = fetchurl { url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" + - "${name}.tar.xz"; + "${pname}-${version}.tar.xz"; sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv"; }; diff --git a/nixpkgs/pkgs/development/libraries/gts/default.nix b/nixpkgs/pkgs/development/libraries/gts/default.nix index d0da7f8cef61..9cc079d61030 100644 --- a/nixpkgs/pkgs/development/libraries/gts/default.nix +++ b/nixpkgs/pkgs/development/libraries/gts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "gts-${version}"; + pname = "gts"; version = "0.7.6"; src = fetchurl { - url = "mirror://sourceforge/gts/${name}.tar.gz"; + url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz"; sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; diff --git a/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/nixpkgs/pkgs/development/libraries/gumbo/default.nix index 17ca323a5fef..2db8c1e67398 100644 --- a/nixpkgs/pkgs/development/libraries/gumbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/gumbo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "gumbo-${version}"; + pname = "gumbo"; version = "0.10.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/gusb/default.nix b/nixpkgs/pkgs/development/libraries/gusb/default.nix index 78a2d365033e..2f39b03898d1 100644 --- a/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -3,7 +3,7 @@ , glib, systemd, libusb1, vala, hwdata }: stdenv.mkDerivation rec { - name = "gusb-${version}"; + pname = "gusb"; version = "0.3.0"; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/half/default.nix b/nixpkgs/pkgs/development/libraries/half/default.nix index d235c6cb0869..063d416a8fc5 100644 --- a/nixpkgs/pkgs/development/libraries/half/default.nix +++ b/nixpkgs/pkgs/development/libraries/half/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.12.0"; - name = "half-${version}"; + pname = "half"; src = fetchzip { url = "mirror://sourceforge/half/${version}/half-${version}.zip"; diff --git a/nixpkgs/pkgs/development/libraries/hamlib/default.nix b/nixpkgs/pkgs/development/libraries/hamlib/default.nix index b9cd31432fc3..000af7fd74e4 100644 --- a/nixpkgs/pkgs/development/libraries/hamlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/hamlib/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "hamlib"; version = "3.3"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; diff --git a/nixpkgs/pkgs/development/libraries/herqq/default.nix b/nixpkgs/pkgs/development/libraries/herqq/default.nix index a5f8f00a6bfd..ec86db036e98 100644 --- a/nixpkgs/pkgs/development/libraries/herqq/default.nix +++ b/nixpkgs/pkgs/development/libraries/herqq/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.1.0"; - name = "herqq-${version}"; + pname = "herqq"; nativeBuildInputs = [ qt5.qmake ]; buildInputs = [ qt5.qtbase unzip qtmultimedia ]; diff --git a/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/nixpkgs/pkgs/development/libraries/hidapi/default.nix index 05e180161c0b..28e96244ba5c 100644 --- a/nixpkgs/pkgs/development/libraries/hidapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/hidapi/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb , darwin }: stdenv.mkDerivation rec { - name = "hidapi-0.8.0-rc1"; + pname = "hidapi"; + version = "0.9.0"; src = fetchFromGitHub { - owner = "signal11"; + owner = "libusb"; repo = "hidapi"; - rev = name; - sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; + rev = "${pname}-${version}"; + sha256 = "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ udev libusb ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ]; + + enableParallelBuilding = true; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit Cocoa ]); meta = with stdenv.lib; { - homepage = https://github.com/signal11/hidapi; description = "Library for communicating with USB and Bluetooth HID devices"; + homepage = "https://github.com/libusb/hidapi"; # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/hiredis/default.nix b/nixpkgs/pkgs/development/libraries/hiredis/default.nix index 13f7c4219069..6dc3871e1c18 100644 --- a/nixpkgs/pkgs/development/libraries/hiredis/default.nix +++ b/nixpkgs/pkgs/development/libraries/hiredis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hiredis-${version}"; + pname = "hiredis"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/hivex/default.nix b/nixpkgs/pkgs/development/libraries/hivex/default.nix index 37f01372005c..ca547faa2abb 100644 --- a/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -2,11 +2,11 @@ , perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { - name = "hivex-${version}"; + pname = "hivex"; version = "1.3.18"; src = fetchurl { - url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; + url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la"; }; diff --git a/nixpkgs/pkgs/development/libraries/hpx/default.nix b/nixpkgs/pkgs/development/libraries/hpx/default.nix index 99777bbd6f0f..a3a8c7baa092 100644 --- a/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }: stdenv.mkDerivation rec { - name = "hpx-${version}"; + pname = "hpx"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix index 1537f9cc480b..f0968c47822c 100644 --- a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "htmlcxx-${version}"; + pname = "htmlcxx"; version = "0.86"; src = fetchurl { - url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz"; sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; diff --git a/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/nixpkgs/pkgs/development/libraries/http-parser/default.nix index 68bf4ebec347..76173bc5b998 100644 --- a/nixpkgs/pkgs/development/libraries/http-parser/default.nix +++ b/nixpkgs/pkgs/development/libraries/http-parser/default.nix @@ -3,7 +3,8 @@ let version = "2.9.2"; in stdenv.mkDerivation { - name = "http-parser-${version}"; + pname = "http-parser"; + inherit version; src = fetchFromGitHub { owner = "nodejs"; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/default.nix b/nixpkgs/pkgs/development/libraries/hunspell/default.nix index 18e32585ce2a..a8dcea0059a2 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; - name = "hunspell-${version}"; + pname = "hunspell"; src = fetchurl { url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/idnkit/default.nix b/nixpkgs/pkgs/development/libraries/idnkit/default.nix index d4ebb5534d9c..3d00d20f1700 100644 --- a/nixpkgs/pkgs/development/libraries/idnkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/idnkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "idnkit-${version}"; + pname = "idnkit"; version = "2.3"; src = fetchurl { - url = "https://jprs.co.jp/idn/${name}.tar.bz2"; + url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2"; sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16"; }; diff --git a/nixpkgs/pkgs/development/libraries/ignition-math/default.nix b/nixpkgs/pkgs/development/libraries/ignition-math/default.nix index 867ce024d2fe..297365be8749 100644 --- a/nixpkgs/pkgs/development/libraries/ignition-math/default.nix +++ b/nixpkgs/pkgs/development/libraries/ignition-math/default.nix @@ -4,7 +4,8 @@ let version = "2.6.0"; in stdenv.mkDerivation rec { - name = "ign-math2-${version}"; + pname = "ign-math2"; + inherit version; src = fetchurl { url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix b/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix index 8abff4c5f059..31b9a4b0e9f7 100644 --- a/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "ign-transport-${version}"; + pname = "ign-transport"; + inherit version; inherit src; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/iksemel/default.nix b/nixpkgs/pkgs/development/libraries/iksemel/default.nix index b97f62dcf25c..6330347cd275 100644 --- a/nixpkgs/pkgs/development/libraries/iksemel/default.nix +++ b/nixpkgs/pkgs/development/libraries/iksemel/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }: stdenv.mkDerivation rec { - name = "iksemel-${version}"; + pname = "iksemel"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix index 2d22788e1ecd..5cc0f7c1f46d 100644 --- a/nixpkgs/pkgs/development/libraries/ilmbase/default.nix +++ b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-${version}"; + pname = "ilmbase"; version = "2.3.0"; src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; }; diff --git a/nixpkgs/pkgs/development/libraries/iml/default.nix b/nixpkgs/pkgs/development/libraries/iml/default.nix index b55d13ecc3f4..5ad3e249fc32 100644 --- a/nixpkgs/pkgs/development/libraries/iml/default.nix +++ b/nixpkgs/pkgs/development/libraries/iml/default.nix @@ -1,6 +1,6 @@ {stdenv, autoreconfHook, fetchurl, gmp, openblas}: stdenv.mkDerivation rec { - name = "iml-${version}"; + pname = "iml"; version = "1.0.5"; src = fetchurl { url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index a4a009c66580..2beff09d0b4e 100644 --- a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, tcl}: stdenv.mkDerivation rec { - name = "incrtcl-${version}"; + pname = "incrtcl"; version = "4.0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix index 36b637c62bb2..f97f8b7d82d5 100644 --- a/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix @@ -6,7 +6,7 @@ with lib; stdenv.mkDerivation rec { - name = "indicator-application-gtk2-${version}"; + pname = "indicator-application-gtk2"; version = "12.10.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/iniparser/default.nix b/nixpkgs/pkgs/development/libraries/iniparser/default.nix index 8beda8663c5c..51c6728e8b00 100644 --- a/nixpkgs/pkgs/development/libraries/iniparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/iniparser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "iniparser-${version}"; + pname = "iniparser"; version = "4.1"; src = fetchFromGitHub { @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { mkdir -p $out/include cp src/*.h $out/include - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} for i in AUTHORS INSTALL LICENSE README.md; do - bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; + bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2; done; - cp -r html $out/share/doc/${name} + cp -r html $out/share/doc/${pname}-${version} cp libiniparser.a $out/lib cp libiniparser.so.1 $out/lib diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 1212d3817d4c..53b89f17ea5c 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "intel-gmmlib-${version}"; + pname = "intel-gmmlib"; version = "19.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb"; }; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index e549067b11f0..e3dbfa52db22 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "intel-media-driver-${version}"; + pname = "intel-media-driver"; version = "19.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 274058b7ec99..67bee86bfa93 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "intel-media-sdk-${version}"; + pname = "intel-media-sdk"; version = "19.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix index a48908f41dd4..50ae63f2d0d6 100644 --- a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "ip2location-c-${version}"; + pname = "ip2location-c"; version = "7.0.2"; # meta.homepage might change after a major update src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix index d28ae012e574..35ef14cbc135 100644 --- a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix +++ b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "irrlicht-${version}"; + pname = "irrlicht"; version = "1.8.4"; src = fetchzip { - url = "mirror://sourceforge/irrlicht/${name}.zip"; + url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip"; sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f"; }; diff --git a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix index 43ab20da8ae0..599e8dcc5975 100644 --- a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix +++ b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gettext, python3}: stdenv.mkDerivation rec { - name = "iso-codes-${version}"; + pname = "iso-codes"; version = "3.79"; src = fetchurl { - url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${pname}-${version}.tar.xz"; sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; }; diff --git a/nixpkgs/pkgs/development/libraries/jama/default.nix b/nixpkgs/pkgs/development/libraries/jama/default.nix index 29fabdbb3b63..26ec06fad7bf 100644 --- a/nixpkgs/pkgs/development/libraries/jama/default.nix +++ b/nixpkgs/pkgs/development/libraries/jama/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip, tnt}: stdenv.mkDerivation rec { - name = "jama-${version}"; + pname = "jama"; version = "1.2.5"; src = fetchurl { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ tnt ]; unpackPhase = '' - mkdir "${name}" + mkdir "${pname}-${version}" unzip "$src" ''; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/jasper/default.nix b/nixpkgs/pkgs/development/libraries/jasper/default.nix index 946bc17e7643..1bad3394b6ac 100644 --- a/nixpkgs/pkgs/development/libraries/jasper/default.nix +++ b/nixpkgs/pkgs/development/libraries/jasper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-${version}"; + pname = "jasper"; version = "2.0.16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix index 8d9b4e54fe8d..4a2b030a3dbf 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.2"; - name = "commons-bcel-${version}"; + pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix index 3c729f42320a..d418145e1b5f 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.18"; - name = "commons-compress-${version}"; + pname = "commons-compress"; src = fetchurl { - url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1"; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix index 6fddc3cfe0c3..0aca6bf8baaa 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.3.1"; - name = "commons-fileupload-${version}"; + pname = "commons-fileupload"; src = fetchurl { - url = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix index 03b083328da4..c545ad68e727 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6"; - name = "commons-io-${version}"; + pname = "commons-io"; src = fetchurl { - url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn"; }; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix index 322cb486e93e..675265ed4e32 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.9"; - name = "commons-lang-${version}"; + pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix index 10c39f037890..7c4fc5c632e2 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/math/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.6.1"; - name = "commons-math-${version}"; + pname = "commons-math"; src = fetchurl { url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/java/cup/default.nix b/nixpkgs/pkgs/development/libraries/java/cup/default.nix index de031a08fe8c..e485eabe1cbf 100644 --- a/nixpkgs/pkgs/development/libraries/java/cup/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/cup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jdk, ant } : stdenv.mkDerivation rec { - name = "java-cup-${version}"; + pname = "java-cup"; version = "11b-20160615"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 7d1fac39b1cb..68e2a7377919 100644 --- a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, ant, jdk }: stdenv.mkDerivation rec { - name = "hydra-ant-logger-${version}"; + pname = "hydra-ant-logger"; version = "2010.2"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix b/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix index 402f893034b6..e25106e22c6c 100644 --- a/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }: stdenv.mkDerivation rec { - name = "jzmq-${version}"; + pname = "jzmq"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/java/lucene/default.nix b/nixpkgs/pkgs/development/libraries/java/lucene/default.nix index 691b9905b04f..c0eabe51657d 100644 --- a/nixpkgs/pkgs/development/libraries/java/lucene/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/lucene/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl} : stdenv.mkDerivation rec { - name = "lucene-${version}"; + pname = "lucene"; version = "1.4.3"; builder = ./builder.sh; src = fetchurl { - url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz"; + url = "https://archive.apache.org/dist/jakarta/lucene/${pname}-${version}.tar.gz"; sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; diff --git a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix index 544f0f4c4e91..0fdce1bceed0 100644 --- a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "rhino-${version}"; + pname = "rhino"; + inherit version; src = fetchurl { url = "mirror://mozilla/js/rhino1_7R2.zip"; diff --git a/nixpkgs/pkgs/development/libraries/java/swt/default.nix b/nixpkgs/pkgs/development/libraries/java/swt/default.nix index c2acd2348938..591de48d3195 100644 --- a/nixpkgs/pkgs/development/libraries/java/swt/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/swt/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "4.5"; fullVersion = "${version}-201506032000"; - name = "swt-${version}"; + pname = "swt"; hardeningDisable = [ "format" ]; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/jemalloc/common.nix b/nixpkgs/pkgs/development/libraries/jemalloc/common.nix index c14ac7c65abd..c41455a65441 100644 --- a/nixpkgs/pkgs/development/libraries/jemalloc/common.nix +++ b/nixpkgs/pkgs/development/libraries/jemalloc/common.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jemalloc-${version}"; + pname = "jemalloc"; inherit version; src = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix index 175097ef7855..726e00b58bba 100644 --- a/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix +++ b/nixpkgs/pkgs/development/libraries/jitterentropy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jitterentropy-${version}"; + pname = "jitterentropy"; version = "2.1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index fa2b45ae948e..c62f1e2de3f3 100644 --- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9"; + sha256 = "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj"; }; /* During darwin bootstrap, we have a cp that doesn't understand the diff --git a/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/nixpkgs/pkgs/development/libraries/jxrlib/default.nix index 47c87da065ba..bc5be3172ec8 100644 --- a/nixpkgs/pkgs/development/libraries/jxrlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/jxrlib/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "jxrlib"; version = "1.1"; diff --git a/nixpkgs/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix index 0cd8ab503566..4a403a19964e 100644 --- a/nixpkgs/pkgs/development/libraries/kdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix @@ -7,10 +7,9 @@ mkDerivation rec { pname = "kdb"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg"; }; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix index 7745d78f8fca..e8a7aa7322f3 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix @@ -77,7 +77,7 @@ let license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; platforms = lib.platforms.linux; } // (args.meta or {}); diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index afab8a4e9a43..096376ca6712 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.61/ ) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix index b7dcfb7fe64c..9f682b449752 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -8,4 +8,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kio kparts ]; propagatedBuildInputs = [ qtwebkit ]; outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DBUILD_DESIGNERPLUGIN=OFF" + ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch index 75e632d41292..89145e3e1dde 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch @@ -2,15 +2,13 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp =================================================================== --- kinit-5.32.0.orig/src/kdeinit/kinit.cpp +++ kinit-5.32.0/src/kdeinit/kinit.cpp -@@ -96,11 +96,9 @@ static const char *extra_libs[] = { +@@ -96,9 +96,9 @@ static const char *extra_libs[] = { "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" #else - "libKF5KIOCore.so.5", - "libKF5Parts.so.5", --//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see. - "libKF5Plasma.so.5" --//#endif + NIXPKGS_KF5_KIOCORE, + NIXPKGS_KF5_PARTS, + NIXPKGS_KF5_PLASMA diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix index ee19b39bd159..c19836ed7a72 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, propagateBin, extra-cmake-modules, - qtbase, wayland + qtbase, wayland, wayland-protocols }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ wayland ]; + buildInputs = [ wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; setupHook = propagateBin; # XDG_CONFIG_DIRS } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix index 147c4123a105..1484b2d04891 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, extra-cmake-modules, qtbase -, qtdeclarative, kconfig, kcoreaddons, ki18n, kio +, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2 }: mkDerivation { @@ -9,6 +9,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtdeclarative kconfig kcoreaddons - ki18n kio + ki18n kio kirigami2 ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 17473db9eebd..549f99a55886 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz"; - sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a"; - name = "attica-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/attica-5.61.0.tar.xz"; + sha256 = "9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde"; + name = "attica-5.61.0.tar.xz"; }; }; baloo = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz"; - sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227"; - name = "baloo-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/baloo-5.61.0.tar.xz"; + sha256 = "dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1"; + name = "baloo-5.61.0.tar.xz"; }; }; bluez-qt = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz"; - sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0"; - name = "bluez-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/bluez-qt-5.61.0.tar.xz"; + sha256 = "0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27"; + name = "bluez-qt-5.61.0.tar.xz"; }; }; breeze-icons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz"; - sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491"; - name = "breeze-icons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/breeze-icons-5.61.0.tar.xz"; + sha256 = "1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30"; + name = "breeze-icons-5.61.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz"; - sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7"; - name = "extra-cmake-modules-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/extra-cmake-modules-5.61.0.tar.xz"; + sha256 = "a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c"; + name = "extra-cmake-modules-5.61.0.tar.xz"; }; }; frameworkintegration = { - version = "5.58.1"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz"; - sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274"; - name = "frameworkintegration-5.58.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/frameworkintegration-5.61.0.tar.xz"; + sha256 = "a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb"; + name = "frameworkintegration-5.61.0.tar.xz"; }; }; kactivities = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz"; - sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b"; - name = "kactivities-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kactivities-5.61.0.tar.xz"; + sha256 = "0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5"; + name = "kactivities-5.61.0.tar.xz"; }; }; kactivities-stats = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz"; - sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611"; - name = "kactivities-stats-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kactivities-stats-5.61.0.tar.xz"; + sha256 = "9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068"; + name = "kactivities-stats-5.61.0.tar.xz"; }; }; kapidox = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz"; - sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165"; - name = "kapidox-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kapidox-5.61.0.tar.xz"; + sha256 = "3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f"; + name = "kapidox-5.61.0.tar.xz"; }; }; karchive = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz"; - sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad"; - name = "karchive-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/karchive-5.61.0.tar.xz"; + sha256 = "457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387"; + name = "karchive-5.61.0.tar.xz"; }; }; kauth = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz"; - sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f"; - name = "kauth-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kauth-5.61.0.tar.xz"; + sha256 = "b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1"; + name = "kauth-5.61.0.tar.xz"; }; }; kbookmarks = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz"; - sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02"; - name = "kbookmarks-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kbookmarks-5.61.0.tar.xz"; + sha256 = "24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377"; + name = "kbookmarks-5.61.0.tar.xz"; }; }; kcmutils = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz"; - sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d"; - name = "kcmutils-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcmutils-5.61.0.tar.xz"; + sha256 = "b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7"; + name = "kcmutils-5.61.0.tar.xz"; }; }; kcodecs = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz"; - sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef"; - name = "kcodecs-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcodecs-5.61.0.tar.xz"; + sha256 = "4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee"; + name = "kcodecs-5.61.0.tar.xz"; }; }; kcompletion = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz"; - sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd"; - name = "kcompletion-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcompletion-5.61.0.tar.xz"; + sha256 = "68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec"; + name = "kcompletion-5.61.0.tar.xz"; }; }; kconfig = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz"; - sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e"; - name = "kconfig-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kconfig-5.61.0.tar.xz"; + sha256 = "94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372"; + name = "kconfig-5.61.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz"; - sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0"; - name = "kconfigwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kconfigwidgets-5.61.0.tar.xz"; + sha256 = "4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165"; + name = "kconfigwidgets-5.61.0.tar.xz"; }; }; kcoreaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz"; - sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e"; - name = "kcoreaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcoreaddons-5.61.0.tar.xz"; + sha256 = "6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813"; + name = "kcoreaddons-5.61.0.tar.xz"; }; }; kcrash = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz"; - sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44"; - name = "kcrash-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kcrash-5.61.0.tar.xz"; + sha256 = "83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8"; + name = "kcrash-5.61.0.tar.xz"; }; }; kdbusaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz"; - sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1"; - name = "kdbusaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdbusaddons-5.61.0.tar.xz"; + sha256 = "f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d"; + name = "kdbusaddons-5.61.0.tar.xz"; }; }; kdeclarative = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz"; - sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec"; - name = "kdeclarative-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdeclarative-5.61.0.tar.xz"; + sha256 = "464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa"; + name = "kdeclarative-5.61.0.tar.xz"; }; }; kded = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz"; - sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1"; - name = "kded-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kded-5.61.0.tar.xz"; + sha256 = "ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc"; + name = "kded-5.61.0.tar.xz"; }; }; kdelibs4support = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz"; - sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a"; - name = "kdelibs4support-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kdelibs4support-5.61.0.tar.xz"; + sha256 = "ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c"; + name = "kdelibs4support-5.61.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz"; - sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b"; - name = "kdesignerplugin-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdesignerplugin-5.61.0.tar.xz"; + sha256 = "6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33"; + name = "kdesignerplugin-5.61.0.tar.xz"; }; }; kdesu = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz"; - sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b"; - name = "kdesu-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdesu-5.61.0.tar.xz"; + sha256 = "398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888"; + name = "kdesu-5.61.0.tar.xz"; }; }; kdewebkit = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz"; - sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc"; - name = "kdewebkit-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kdewebkit-5.61.0.tar.xz"; + sha256 = "1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211"; + name = "kdewebkit-5.61.0.tar.xz"; }; }; kdnssd = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz"; - sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05"; - name = "kdnssd-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdnssd-5.61.0.tar.xz"; + sha256 = "02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d"; + name = "kdnssd-5.61.0.tar.xz"; }; }; kdoctools = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz"; - sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4"; - name = "kdoctools-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kdoctools-5.61.0.tar.xz"; + sha256 = "e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f"; + name = "kdoctools-5.61.0.tar.xz"; }; }; kemoticons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz"; - sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd"; - name = "kemoticons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kemoticons-5.61.0.tar.xz"; + sha256 = "cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380"; + name = "kemoticons-5.61.0.tar.xz"; }; }; kfilemetadata = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz"; - sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c"; - name = "kfilemetadata-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kfilemetadata-5.61.0.tar.xz"; + sha256 = "15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e"; + name = "kfilemetadata-5.61.0.tar.xz"; }; }; kglobalaccel = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz"; - sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf"; - name = "kglobalaccel-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kglobalaccel-5.61.0.tar.xz"; + sha256 = "ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e"; + name = "kglobalaccel-5.61.0.tar.xz"; }; }; kguiaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz"; - sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3"; - name = "kguiaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kguiaddons-5.61.0.tar.xz"; + sha256 = "40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520"; + name = "kguiaddons-5.61.0.tar.xz"; }; }; kholidays = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz"; - sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef"; - name = "kholidays-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kholidays-5.61.0.tar.xz"; + sha256 = "ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1"; + name = "kholidays-5.61.0.tar.xz"; }; }; khtml = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz"; - sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff"; - name = "khtml-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/khtml-5.61.0.tar.xz"; + sha256 = "5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b"; + name = "khtml-5.61.0.tar.xz"; }; }; ki18n = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz"; - sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977"; - name = "ki18n-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ki18n-5.61.0.tar.xz"; + sha256 = "d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9"; + name = "ki18n-5.61.0.tar.xz"; }; }; kiconthemes = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz"; - sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480"; - name = "kiconthemes-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kiconthemes-5.61.0.tar.xz"; + sha256 = "341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7"; + name = "kiconthemes-5.61.0.tar.xz"; }; }; kidletime = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz"; - sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90"; - name = "kidletime-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kidletime-5.61.0.tar.xz"; + sha256 = "8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2"; + name = "kidletime-5.61.0.tar.xz"; }; }; kimageformats = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz"; - sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9"; - name = "kimageformats-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kimageformats-5.61.0.tar.xz"; + sha256 = "5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207"; + name = "kimageformats-5.61.0.tar.xz"; }; }; kinit = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz"; - sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53"; - name = "kinit-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kinit-5.61.0.tar.xz"; + sha256 = "1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f"; + name = "kinit-5.61.0.tar.xz"; }; }; kio = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz"; - sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069"; - name = "kio-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kio-5.61.0.tar.xz"; + sha256 = "1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e"; + name = "kio-5.61.0.tar.xz"; }; }; kirigami2 = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz"; - sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3"; - name = "kirigami2-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kirigami2-5.61.0.tar.xz"; + sha256 = "afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30"; + name = "kirigami2-5.61.0.tar.xz"; }; }; kitemmodels = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz"; - sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491"; - name = "kitemmodels-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kitemmodels-5.61.0.tar.xz"; + sha256 = "47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68"; + name = "kitemmodels-5.61.0.tar.xz"; }; }; kitemviews = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz"; - sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6"; - name = "kitemviews-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kitemviews-5.61.0.tar.xz"; + sha256 = "0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da"; + name = "kitemviews-5.61.0.tar.xz"; }; }; kjobwidgets = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz"; - sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133"; - name = "kjobwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kjobwidgets-5.61.0.tar.xz"; + sha256 = "5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378"; + name = "kjobwidgets-5.61.0.tar.xz"; }; }; kjs = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz"; - sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c"; - name = "kjs-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kjs-5.61.0.tar.xz"; + sha256 = "968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17"; + name = "kjs-5.61.0.tar.xz"; }; }; kjsembed = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz"; - sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d"; - name = "kjsembed-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kjsembed-5.61.0.tar.xz"; + sha256 = "d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44"; + name = "kjsembed-5.61.0.tar.xz"; }; }; kmediaplayer = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz"; - sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea"; - name = "kmediaplayer-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kmediaplayer-5.61.0.tar.xz"; + sha256 = "ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181"; + name = "kmediaplayer-5.61.0.tar.xz"; }; }; knewstuff = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz"; - sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd"; - name = "knewstuff-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knewstuff-5.61.0.tar.xz"; + sha256 = "87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b"; + name = "knewstuff-5.61.0.tar.xz"; }; }; knotifications = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz"; - sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469"; - name = "knotifications-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knotifications-5.61.0.tar.xz"; + sha256 = "f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac"; + name = "knotifications-5.61.0.tar.xz"; }; }; knotifyconfig = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz"; - sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01"; - name = "knotifyconfig-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/knotifyconfig-5.61.0.tar.xz"; + sha256 = "bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee"; + name = "knotifyconfig-5.61.0.tar.xz"; }; }; kpackage = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz"; - sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90"; - name = "kpackage-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpackage-5.61.0.tar.xz"; + sha256 = "8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f"; + name = "kpackage-5.61.0.tar.xz"; }; }; kparts = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz"; - sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4"; - name = "kparts-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kparts-5.61.0.tar.xz"; + sha256 = "f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436"; + name = "kparts-5.61.0.tar.xz"; }; }; kpeople = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz"; - sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32"; - name = "kpeople-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpeople-5.61.0.tar.xz"; + sha256 = "549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298"; + name = "kpeople-5.61.0.tar.xz"; }; }; kplotting = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz"; - sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b"; - name = "kplotting-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kplotting-5.61.0.tar.xz"; + sha256 = "95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba"; + name = "kplotting-5.61.0.tar.xz"; }; }; kpty = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz"; - sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017"; - name = "kpty-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kpty-5.61.0.tar.xz"; + sha256 = "b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c"; + name = "kpty-5.61.0.tar.xz"; }; }; kross = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz"; - sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872"; - name = "kross-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/portingAids/kross-5.61.0.tar.xz"; + sha256 = "103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e"; + name = "kross-5.61.0.tar.xz"; }; }; krunner = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz"; - sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c"; - name = "krunner-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/krunner-5.61.0.tar.xz"; + sha256 = "f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be"; + name = "krunner-5.61.0.tar.xz"; }; }; kservice = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz"; - sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395"; - name = "kservice-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kservice-5.61.0.tar.xz"; + sha256 = "4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9"; + name = "kservice-5.61.0.tar.xz"; }; }; ktexteditor = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz"; - sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e"; - name = "ktexteditor-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ktexteditor-5.61.0.tar.xz"; + sha256 = "ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb"; + name = "ktexteditor-5.61.0.tar.xz"; }; }; ktextwidgets = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz"; - sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7"; - name = "ktextwidgets-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/ktextwidgets-5.61.0.tar.xz"; + sha256 = "a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a"; + name = "ktextwidgets-5.61.0.tar.xz"; }; }; kunitconversion = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz"; - sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa"; - name = "kunitconversion-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kunitconversion-5.61.0.tar.xz"; + sha256 = "e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24"; + name = "kunitconversion-5.61.0.tar.xz"; }; }; kwallet = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz"; - sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030"; - name = "kwallet-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwallet-5.61.0.tar.xz"; + sha256 = "628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8"; + name = "kwallet-5.61.0.tar.xz"; }; }; kwayland = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz"; - sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1"; - name = "kwayland-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwayland-5.61.0.tar.xz"; + sha256 = "42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07"; + name = "kwayland-5.61.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz"; - sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0"; - name = "kwidgetsaddons-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwidgetsaddons-5.61.0.tar.xz"; + sha256 = "5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891"; + name = "kwidgetsaddons-5.61.0.tar.xz"; }; }; kwindowsystem = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz"; - sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129"; - name = "kwindowsystem-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kwindowsystem-5.61.0.tar.xz"; + sha256 = "17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984"; + name = "kwindowsystem-5.61.0.tar.xz"; }; }; kxmlgui = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz"; - sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f"; - name = "kxmlgui-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kxmlgui-5.61.0.tar.xz"; + sha256 = "867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b"; + name = "kxmlgui-5.61.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz"; - sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3"; - name = "kxmlrpcclient-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/kxmlrpcclient-5.61.0.tar.xz"; + sha256 = "382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a"; + name = "kxmlrpcclient-5.61.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz"; - sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb"; - name = "modemmanager-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/modemmanager-qt-5.61.0.tar.xz"; + sha256 = "c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a"; + name = "modemmanager-qt-5.61.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz"; - sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe"; - name = "networkmanager-qt-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/networkmanager-qt-5.61.0.tar.xz"; + sha256 = "1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3"; + name = "networkmanager-qt-5.61.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz"; - sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7"; - name = "oxygen-icons5-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/oxygen-icons5-5.61.0.tar.xz"; + sha256 = "1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26"; + name = "oxygen-icons5-5.61.0.tar.xz"; }; }; plasma-framework = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz"; - sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad"; - name = "plasma-framework-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/plasma-framework-5.61.0.tar.xz"; + sha256 = "873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe"; + name = "plasma-framework-5.61.0.tar.xz"; }; }; prison = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz"; - sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d"; - name = "prison-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/prison-5.61.0.tar.xz"; + sha256 = "9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab"; + name = "prison-5.61.0.tar.xz"; }; }; purpose = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz"; - sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df"; - name = "purpose-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/purpose-5.61.0.tar.xz"; + sha256 = "810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08"; + name = "purpose-5.61.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz"; - sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3"; - name = "qqc2-desktop-style-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/qqc2-desktop-style-5.61.0.tar.xz"; + sha256 = "26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4"; + name = "qqc2-desktop-style-5.61.0.tar.xz"; }; }; solid = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz"; - sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00"; - name = "solid-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/solid-5.61.0.tar.xz"; + sha256 = "c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf"; + name = "solid-5.61.0.tar.xz"; }; }; sonnet = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz"; - sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823"; - name = "sonnet-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/sonnet-5.61.0.tar.xz"; + sha256 = "4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29"; + name = "sonnet-5.61.0.tar.xz"; }; }; syndication = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz"; - sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643"; - name = "syndication-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/syndication-5.61.0.tar.xz"; + sha256 = "2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576"; + name = "syndication-5.61.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz"; - sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76"; - name = "syntax-highlighting-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/syntax-highlighting-5.61.0.tar.xz"; + sha256 = "475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721"; + name = "syntax-highlighting-5.61.0.tar.xz"; }; }; threadweaver = { - version = "5.58.0"; + version = "5.61.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz"; - sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d"; - name = "threadweaver-5.58.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.61/threadweaver-5.61.0.tar.xz"; + sha256 = "e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843"; + name = "threadweaver-5.61.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix index d2283f5c1d57..2eb9262d189e 100644 --- a/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix +++ b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "heimdal-${version}"; + pname = "heimdal"; version = "7.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/keybinder/default.nix b/nixpkgs/pkgs/development/libraries/keybinder/default.nix index abbb2457f6ae..0a130c017c09 100644 --- a/nixpkgs/pkgs/development/libraries/keybinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/keybinder/default.nix @@ -5,11 +5,11 @@ let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "keybinder-${version}"; + pname = "keybinder"; version = "0.3.0"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz"; sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf"; }; diff --git a/nixpkgs/pkgs/development/libraries/keybinder3/default.nix b/nixpkgs/pkgs/development/libraries/keybinder3/default.nix index 91ad59ad27a0..ed2dd341f45e 100644 --- a/nixpkgs/pkgs/development/libraries/keybinder3/default.nix +++ b/nixpkgs/pkgs/development/libraries/keybinder3/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "keybinder3-${version}"; + pname = "keybinder3"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix index d3733ea5f720..3f84706bffb3 100644 --- a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "kmsxx"; version = "2018-10-23"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; diff --git a/nixpkgs/pkgs/development/libraries/kproperty/default.nix b/nixpkgs/pkgs/development/libraries/kproperty/default.nix index c49402b74e86..991fd4d27a74 100644 --- a/nixpkgs/pkgs/development/libraries/kproperty/default.nix +++ b/nixpkgs/pkgs/development/libraries/kproperty/default.nix @@ -8,10 +8,9 @@ mkDerivation rec { pname = "kproperty"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; }; diff --git a/nixpkgs/pkgs/development/libraries/kreport/default.nix b/nixpkgs/pkgs/development/libraries/kreport/default.nix index fc9c77e8fd61..46d55b1f550d 100644 --- a/nixpkgs/pkgs/development/libraries/kreport/default.nix +++ b/nixpkgs/pkgs/development/libraries/kreport/default.nix @@ -7,10 +7,9 @@ mkDerivation rec { pname = "kreport"; version = "3.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92"; }; diff --git a/nixpkgs/pkgs/development/libraries/lame/default.nix b/nixpkgs/pkgs/development/libraries/lame/default.nix index 2f713cb59775..933d51b9575c 100644 --- a/nixpkgs/pkgs/development/libraries/lame/default.nix +++ b/nixpkgs/pkgs/development/libraries/lame/default.nix @@ -22,11 +22,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "lame-${version}"; + pname = "lame"; version = "3.100"; src = fetchurl { - url = "mirror://sourceforge/lame/${name}.tar.gz"; + url = "mirror://sourceforge/lame/${pname}-${version}.tar.gz"; sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; diff --git a/nixpkgs/pkgs/development/libraries/lasso/default.nix b/nixpkgs/pkgs/development/libraries/lasso/default.nix index e93467fba0a2..f401f231de2e 100644 --- a/nixpkgs/pkgs/development/libraries/lasso/default.nix +++ b/nixpkgs/pkgs/development/libraries/lasso/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "lasso-${version}"; + pname = "lasso"; version = "2.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix index 839f0a75156b..ae8fc1e22dbc 100644 --- a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ldacBT-${version}"; + pname = "ldacBT"; version = "2.0.2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/ldns/default.nix b/nixpkgs/pkgs/development/libraries/ldns/default.nix index 82496a54aea7..1aa208c2044f 100644 --- a/nixpkgs/pkgs/development/libraries/ldns/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldns/default.nix @@ -4,10 +4,8 @@ stdenv.mkDerivation rec { pname = "ldns"; version = "1.7.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; + url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz"; sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1"; }; diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix index a085899d6e2b..f91612caca1f 100644 --- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: stdenv.mkDerivation rec { - name = "leatherman-${version}"; + pname = "leatherman"; version = "1.7.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/lensfun/default.nix b/nixpkgs/pkgs/development/libraries/lensfun/default.nix index f4018cbf9614..6137638222ef 100644 --- a/nixpkgs/pkgs/development/libraries/lensfun/default.nix +++ b/nixpkgs/pkgs/development/libraries/lensfun/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.95"; - name = "lensfun-${version}"; + pname = "lensfun"; src = fetchurl { - url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz"; sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2"; }; diff --git a/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/nixpkgs/pkgs/development/libraries/leptonica/default.nix index dd3c42e8b7f5..62c01e4f3560 100644 --- a/nixpkgs/pkgs/development/libraries/leptonica/default.nix +++ b/nixpkgs/pkgs/development/libraries/leptonica/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "leptonica-${version}"; + pname = "leptonica"; version = "1.78.0"; src = fetchurl { - url = "http://www.leptonica.org/source/${name}.tar.gz"; + url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2"; }; diff --git a/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/nixpkgs/pkgs/development/libraries/leveldb/default.nix index b18af4cf8344..17a754a027ab 100644 --- a/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/leveldb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "leveldb-${version}"; + pname = "leveldb"; version = "1.20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/nixpkgs/pkgs/development/libraries/libaacs/default.nix index 0d67c6b4dcb2..bda7d560fcde 100644 --- a/nixpkgs/pkgs/development/libraries/libaacs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaacs/default.nix @@ -8,11 +8,11 @@ # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libaacs-${version}"; + pname = "libaacs"; version = "0.9.0"; src = fetchurl { - url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"; }; diff --git a/nixpkgs/pkgs/development/libraries/libaal/default.nix b/nixpkgs/pkgs/development/libraries/libaal/default.nix index 6df7bc22772f..11b31d62b5d6 100644 --- a/nixpkgs/pkgs/development/libraries/libaal/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaal/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.6"; - name = "libaal-${version}"; + pname = "libaal"; src = fetchurl { - url = "mirror://sourceforge/reiser4/${name}.tar.gz"; + url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz"; sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di"; }; diff --git a/nixpkgs/pkgs/development/libraries/libabw/default.nix b/nixpkgs/pkgs/development/libraries/libabw/default.nix index aa4a40cf32dd..f953c170ab50 100644 --- a/nixpkgs/pkgs/development/libraries/libabw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libabw/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }: stdenv.mkDerivation rec { - name = "libabw-${version}"; + pname = "libabw"; version = "0.1.2"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz"; sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; diff --git a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix index 525ec6e35f60..7f9dbf3a21fc 100644 --- a/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { - name = "libaccounts-glib-${version}"; + pname = "libaccounts-glib"; version = "1.24"; outputs = [ "out" "dev" "devdoc" "py" ]; diff --git a/nixpkgs/pkgs/development/libraries/libagar/default.nix b/nixpkgs/pkgs/development/libraries/libagar/default.nix index 49e5bcdd9058..a8ddab2978d1 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/default.nix @@ -5,7 +5,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation rec { - name = "libagar-${version}"; + pname = "libagar"; inherit (srcs) version src; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix index c1e9ba7d1c73..43d66b8251cf 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix @@ -2,7 +2,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation rec { - name = "libagar-test-${version}"; + pname = "libagar-test"; inherit (srcs) version src; sourceRoot = "agar-1.5.0/tests"; diff --git a/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix index cc6c9464de36..325a7d71598b 100644 --- a/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "libamqpcpp-${version}"; + pname = "libamqpcpp"; version = "4.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libao/default.nix b/nixpkgs/pkgs/development/libraries/libao/default.nix index 826f72b1f5fb..698182dbd4ed 100644 --- a/nixpkgs/pkgs/development/libraries/libao/default.nix +++ b/nixpkgs/pkgs/development/libraries/libao/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.2.2"; - name = "libao-${version}"; + pname = "libao"; # the github mirror is more up to date than downloads.xiph.org src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 62e0a850bad3..2d9a9f18fa27 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: stdenv.mkDerivation rec { - name = "libaom-${version}"; + pname = "libaom"; version = "1.0.0-errata1"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/libaosd/default.nix b/nixpkgs/pkgs/development/libraries/libaosd/default.nix index dd3320005a41..5b9647d275cb 100644 --- a/nixpkgs/pkgs/development/libraries/libaosd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaosd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.2.7-9-g177589f"; - name = "libaosd-${version}"; + pname = "libaosd"; src = fetchFromGitHub { owner = "atheme-legacy"; diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index 3cf8a6da7367..e3927f34fab9 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -9,7 +9,7 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { - name = "libarchive-${version}"; + pname = "libarchive"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libasr/default.nix b/nixpkgs/pkgs/development/libraries/libasr/default.nix index a06ae978d515..0c8f82138e7f 100644 --- a/nixpkgs/pkgs/development/libraries/libasr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libasr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl }: stdenv.mkDerivation rec { - name = "libasr-${version}"; + pname = "libasr"; version= "1.0.2"; src = fetchurl { - url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6"; }; diff --git a/nixpkgs/pkgs/development/libraries/libass/default.nix b/nixpkgs/pkgs/development/libraries/libass/default.nix index d7ebf781a049..41406ce18eae 100644 --- a/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -18,11 +18,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libass-${version}"; + pname = "libass"; version = "0.14.0"; src = fetchurl { - url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; }; diff --git a/nixpkgs/pkgs/development/libraries/libast/default.nix b/nixpkgs/pkgs/development/libraries/libast/default.nix index 313cb7f8d5dc..348cfa9ed5b4 100644 --- a/nixpkgs/pkgs/development/libraries/libast/default.nix +++ b/nixpkgs/pkgs/development/libraries/libast/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "libast-${version}"; + pname = "libast"; version = "0.7.1"; src = fetchurl { - url = "http://www.eterm.org/download/${name}.tar.gz"; + url = "http://www.eterm.org/download/${pname}-${version}.tar.gz"; sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; }; diff --git a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix index 0df8ed0f9699..b576896876e4 100644 --- a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix +++ b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libatomic_ops-${version}"; + pname = "libatomic_ops"; version = "7.6.10"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libav/default.nix b/nixpkgs/pkgs/development/libraries/libav/default.nix index 1ef453f24cdb..feeb4de15e1b 100644 --- a/nixpkgs/pkgs/development/libraries/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libav/default.nix @@ -33,10 +33,11 @@ let }; libavFun = version : sha1 : stdenv.mkDerivation rec { - name = "libav-${version}"; + pname = "libav"; + inherit version; src = fetchurl { - url = "${meta.homepage}/releases/${name}.tar.xz"; + url = "${meta.homepage}/releases/${pname}-${version}.tar.xz"; inherit sha1; # upstream directly provides sha1 of releases over https }; diff --git a/nixpkgs/pkgs/development/libraries/libb2/default.nix b/nixpkgs/pkgs/development/libraries/libb2/default.nix index 6a7720b99bcc..d39c12d58d55 100644 --- a/nixpkgs/pkgs/development/libraries/libb2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libb2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { - name = "libb2-${version}"; + pname = "libb2"; version = "0.98.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libb64/default.nix b/nixpkgs/pkgs/development/libraries/libb64/default.nix index 09c5444a6446..3c9a97684275 100644 --- a/nixpkgs/pkgs/development/libraries/libb64/default.nix +++ b/nixpkgs/pkgs/development/libraries/libb64/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libb64-${version}"; + pname = "libb64"; version = "1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix index 2a129bc648f0..b20850e88ff0 100644 --- a/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -2,7 +2,7 @@ which }: stdenv.mkDerivation rec { - name = "libbap-${version}"; + pname = "libbap"; version = "master-2019-04-05"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libbdplus/default.nix b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix index 3a1b77525143..3af98a578f20 100644 --- a/nixpkgs/pkgs/development/libraries/libbdplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbdplus/default.nix @@ -8,11 +8,11 @@ # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libbdplus-${version}"; + pname = "libbdplus"; version = "0.1.2"; src = fetchurl { - url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2"; sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"; }; diff --git a/nixpkgs/pkgs/development/libraries/libbfd/default.nix b/nixpkgs/pkgs/development/libraries/libbfd/default.nix index 64b3832d3353..5af8acb5ed76 100644 --- a/nixpkgs/pkgs/development/libraries/libbfd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbfd/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libbfd-${version}"; + pname = "libbfd"; inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix index d22518e96d42..c8c58315b648 100644 --- a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix @@ -13,7 +13,8 @@ let version = "2.2.0"; in stdenv.mkDerivation { - name = "libbladeRF-${version}"; + pname = "libbladeRF"; + inherit version; src = fetchFromGitHub { owner = "Nuand"; diff --git a/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix b/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix index d8f2426e477b..d9639cf5c145 100644 --- a/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluedevil/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libbluedevil"; # bluedevil must have the same major version (x.y) as libbluedevil! # do not update this package without checking bluedevil version = "2.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c"; }; diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix index b7ca9dda1ea7..517251e137ef 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -18,11 +18,11 @@ assert withFonts -> freetype != null; # https://wiki.archlinux.org/index.php/BluRay stdenv.mkDerivation rec { - name = "libbluray-${version}"; + pname = "libbluray"; version = "1.1.2"; src = fetchurl { - url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3"; }; diff --git a/nixpkgs/pkgs/development/libraries/libbsd/default.nix b/nixpkgs/pkgs/development/libraries/libbsd/default.nix index a8d1925e5c0d..fe4af163a542 100644 --- a/nixpkgs/pkgs/development/libraries/libbsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbsd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "libbsd-${version}"; + pname = "libbsd"; version = "0.9.1"; src = fetchurl { - url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz"; + url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n"; }; diff --git a/nixpkgs/pkgs/development/libraries/libbson/default.nix b/nixpkgs/pkgs/development/libraries/libbson/default.nix index 6244c3a351e7..5bd6b11ac7af 100644 --- a/nixpkgs/pkgs/development/libraries/libbson/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbson/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, perl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "libbson-${version}"; + pname = "libbson"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix index f68141ef3b47..01588187936c 100644 --- a/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libburn-${version}"; + pname = "libburn"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq"; }; diff --git a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix index 18593f80799c..4fea84723f99 100644 --- a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix @@ -6,7 +6,8 @@ let version = "2.1"; in stdenv.mkDerivation rec { - name = "libbytesize-${version}"; + pname = "libbytesize"; + inherit version; src = fetchFromGitHub { owner = "storaged-project"; diff --git a/nixpkgs/pkgs/development/libraries/libcacard/default.nix b/nixpkgs/pkgs/development/libraries/libcacard/default.nix index 62d709733759..2e134c5bb639 100644 --- a/nixpkgs/pkgs/development/libraries/libcacard/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcacard/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, nss }: stdenv.mkDerivation rec { - name = "libcacard-${version}"; + pname = "libcacard"; version = "2.7.0"; src = fetchurl { - url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz"; + url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz"; sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"; }; diff --git a/nixpkgs/pkgs/development/libraries/libcangjie/default.nix b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix index 6838362c7942..42a49713a0b4 100644 --- a/nixpkgs/pkgs/development/libraries/libcangjie/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcangjie/default.nix @@ -1,7 +1,7 @@ { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: stdenv.mkDerivation rec { - name = "libcangjie-${version}"; + pname = "libcangjie"; version = "1.4_rev_${rev}"; rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; diff --git a/nixpkgs/pkgs/development/libraries/libcec/default.nix b/nixpkgs/pkgs/development/libraries/libcec/default.nix index e016484e6779..2688881e66d3 100644 --- a/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -3,7 +3,8 @@ let version = "4.0.4"; in stdenv.mkDerivation { - name = "libcec-${version}"; + pname = "libcec"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libcec/platform.nix b/nixpkgs/pkgs/development/libraries/libcec/platform.nix index 0005525a7cd2..e43cfb10a378 100644 --- a/nixpkgs/pkgs/development/libraries/libcec/platform.nix +++ b/nixpkgs/pkgs/development/libraries/libcec/platform.nix @@ -3,7 +3,8 @@ let version = "2.1.0.1"; in stdenv.mkDerivation { - name = "p8-platform-${version}"; + pname = "p8-platform"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index ecba18cd58c8..e161948db404 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -13,7 +13,7 @@ let ]; in stdenv.mkDerivation rec { - name = "cef-binary-${version}"; + pname = "cef-binary"; version = "3.3497.1833.g13f506f"; src = fetchurl { url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/libchardet/default.nix b/nixpkgs/pkgs/development/libraries/libchardet/default.nix index 410c83953aa9..11617a0107cf 100644 --- a/nixpkgs/pkgs/development/libraries/libchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libchardet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "libchardet-${version}"; + pname = "libchardet"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libchewing/default.nix b/nixpkgs/pkgs/development/libraries/libchewing/default.nix index d3ef799ef605..3c234d780eff 100644 --- a/nixpkgs/pkgs/development/libraries/libchewing/default.nix +++ b/nixpkgs/pkgs/development/libraries/libchewing/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sqlite }: stdenv.mkDerivation rec{ - name = "libchewing-${version}"; + pname = "libchewing"; version = "0.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libcli/default.nix b/nixpkgs/pkgs/development/libraries/libcli/default.nix index f101eb223106..d896cf637330 100644 --- a/nixpkgs/pkgs/development/libraries/libcli/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "libcli-${version}"; + pname = "libcli"; version = "1.9.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libclthreads/default.nix b/nixpkgs/pkgs/development/libraries/libclthreads/default.nix index a2f6858a05c9..325afc56ae79 100644 --- a/nixpkgs/pkgs/development/libraries/libclthreads/default.nix +++ b/nixpkgs/pkgs/development/libraries/libclthreads/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libclthreads-${version}"; + pname = "libclthreads"; version = "2.4.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libclxclient/default.nix b/nixpkgs/pkgs/development/libraries/libclxclient/default.nix index 49bc2347ba77..d6e2ad398d77 100644 --- a/nixpkgs/pkgs/development/libraries/libclxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libclxclient/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: stdenv.mkDerivation rec { - name = "libclxclient-${version}"; + pname = "libclxclient"; version = "3.9.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix index f247c48821f7..8eb7ff303de7 100644 --- a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libcommuni-${version}"; + pname = "libcommuni"; version = "3.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libconfuse/default.nix b/nixpkgs/pkgs/development/libraries/libconfuse/default.nix index ee3f511d4359..cfef09c480a2 100644 --- a/nixpkgs/pkgs/development/libraries/libconfuse/default.nix +++ b/nixpkgs/pkgs/development/libraries/libconfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, flex }: stdenv.mkDerivation rec { - name = "libconfuse-${version}"; + pname = "libconfuse"; version = "3.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index 894faf0b9102..23b39bca1f3a 100644 --- a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: stdenv.mkDerivation rec { - name = "libcouchbase-${version}"; + pname = "libcouchbase"; version = "2.10.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libcrafter/default.nix b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix index fff31a96ce77..ba9a6325b07d 100644 --- a/nixpkgs/pkgs/development/libraries/libcrafter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcrafter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoconf, automake, libtool, libpcap }: stdenv.mkDerivation rec { - name = "libcrafter-${version}"; + pname = "libcrafter"; version = "0.3"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix index 3d32f4d0b953..4bf26bde228d 100644 --- a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libcsptr-${version}"; + pname = "libcsptr"; version = "2.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libctemplate/default.nix b/nixpkgs/pkgs/development/libraries/libctemplate/default.nix index 94dc733a69b0..f4e2e621c286 100644 --- a/nixpkgs/pkgs/development/libraries/libctemplate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libctemplate/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "ctemplate-${version}"; + pname = "ctemplate"; version = "2.3"; diff --git a/nixpkgs/pkgs/development/libraries/libcue/default.nix b/nixpkgs/pkgs/development/libraries/libcue/default.nix index e50b8a13b950..8ebab123524b 100644 --- a/nixpkgs/pkgs/development/libraries/libcue/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, bison, flex }: stdenv.mkDerivation rec { - name = "libcue-${version}"; + pname = "libcue"; version = "2.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libdap/default.nix b/nixpkgs/pkgs/development/libraries/libdap/default.nix index 86d14fe79740..df2e4c367bfb 100644 --- a/nixpkgs/pkgs/development/libraries/libdap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { version = "3.20.4"; - name = "libdap-${version}"; + pname = "libdap"; nativeBuildInputs = [ bison flex ]; buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { - url = "https://www.opendap.org/pub/source/${name}.tar.gz"; + url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i"; }; diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 32b0c9758f73..2ae4eec99ecc 100644 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, qtbase }: stdenv.mkDerivation rec { - name = "libdbusmenu-qt-${version}"; + pname = "libdbusmenu-qt"; version = "0.9.3+16"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix index 86b9fcd0bef3..0f2ba019d3fe 100644 --- a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix @@ -2,11 +2,11 @@ , libusb1, CoreServices }: stdenv.mkDerivation rec { - name = "libdc1394-${version}"; + pname = "libdc1394"; version = "2.2.6"; src = fetchurl { - url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; + url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz"; sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; }; diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix index 6c9fabf5cae7..3c31ba805d89 100644 --- a/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libde265-${version}"; + pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; diff --git a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index a5b178caf825..b06a0a9450ab 100644 --- a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libdeflate-${version}"; + pname = "libdeflate"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/nixpkgs/pkgs/development/libraries/libdevil/default.nix index 78e7490cd992..afbff3dc0cff 100644 --- a/nixpkgs/pkgs/development/libraries/libdevil/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdevil/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "libdevil-${version}"; + pname = "libdevil"; version = "1.7.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix b/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix index 7fe7319ff15e..06ba10904a7d 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidoc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.10.4"; - name = "libdigidoc-${version}"; + pname = "libdigidoc"; src = fetchurl { url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index e3172c2fc1f8..4aec6fdef917 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.13.7"; - name = "libdigidocpp-${version}"; + pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libdiscid/default.nix b/nixpkgs/pkgs/development/libraries/libdiscid/default.nix index 287494b6b1fd..d7d88b383865 100644 --- a/nixpkgs/pkgs/development/libraries/libdiscid/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdiscid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin }: stdenv.mkDerivation rec { - name = "libdiscid-${version}"; + pname = "libdiscid"; version = "0.6.2"; nativeBuildInputs = [ cmake pkgconfig ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; src = fetchurl { - url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; + url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz"; sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; diff --git a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix index c94806b50c10..5598e6b2fa78 100644 --- a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdivecomputer-${version}"; + pname = "libdivecomputer"; version = "0.6.0"; src = fetchurl { - url = "https://www.libdivecomputer.org/releases/${name}.tar.gz"; + url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; diff --git a/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch new file mode 100644 index 000000000000..478534e65e51 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdrm/cross-build-nm-path.patch @@ -0,0 +1,48 @@ +From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Fri, 2 Aug 2019 10:26:37 +0100 +Subject: [PATCH] meson: support for custom nm path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When cross-compiling target toolchains i.e. binutils are often +prefixed by its target architecture. This patch gives the user +to option to specify the nm used during the build process. + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + meson.build | 2 +- + meson_options.txt | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e292554a..64607139 100644 +--- a/meson.build ++++ b/meson.build +@@ -327,7 +327,7 @@ pkg.generate( + ) + + env_test = environment() +-env_test.set('NM', find_program('nm').path()) ++env_test.set('NM', find_program(get_option('nm-path')).path()) + + if with_libkms + subdir('libkms') +diff --git a/meson_options.txt b/meson_options.txt +index 8af33f1c..b4f46a52 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -141,3 +141,9 @@ option( + value : false, + description : 'Enable support for using udev instead of mknod.', + ) ++option( ++ 'nm-path', ++ type : 'string', ++ description : 'path to nm', ++ value : 'nm' ++) +-- +2.22.0 + diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index bdc191fe8a38..29d59659f90d 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja ]; buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; + patches = [ ./cross-build-nm-path.patch ]; + postPatch = '' for a in */*-symbol-check ; do patchShebangs $a @@ -21,7 +23,9 @@ stdenv.mkDerivation rec { ''; mesonFlags = - [ "-Dinstall-test-programs=true" ] + [ + "-Dnm-path=${stdenv.cc.targetPrefix}nm" + "-Dinstall-test-programs=true" ] ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "-Dtegra=true" "-Detnaviv=true" ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false" diff --git a/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix b/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix index 0984eb6e00bf..aed6f05fec4f 100644 --- a/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdvbpsi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libdvbpsi-${version}"; + pname = "libdvbpsi"; version = "1.3.2"; src = fetchurl { - url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2"; sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc"; }; diff --git a/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix b/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix index f18e0622d0cc..fd89077a256a 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdcss/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, IOKit}: stdenv.mkDerivation rec { - name = "libdvdcss-${version}"; + pname = "libdvdcss"; version = "1.4.2"; buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; src = fetchurl { - url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2"; sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq"; }; diff --git a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix index b0dfd1e8fc12..45a73a624883 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libdvdread}: stdenv.mkDerivation rec { - name = "libdvdnav-${version}"; + pname = "libdvdnav"; version = "6.0.0"; src = fetchurl { - url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2"; sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph"; }; diff --git a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix index 5f0f08275035..c133c0ba6f92 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation rec { - name = "libdvdread-${version}"; + pname = "libdvdread"; version = "6.0.1"; src = fetchurl { - url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2"; + url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; sha256 = "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8"; }; diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix index 1a4da7713af4..3fd2a328558e 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix @@ -17,7 +17,8 @@ let in rec { libdwarf = stdenv.mkDerivation rec { - name = "libdwarf-${version}"; + pname = "libdwarf"; + inherit version; configureFlags = [ "--enable-shared" "--disable-nonshared" ]; @@ -37,7 +38,8 @@ in rec { }; dwarfdump = stdenv.mkDerivation rec { - name = "dwarfdump-${version}"; + pname = "dwarfdump"; + inherit version; preConfigure = '' cd dwarfdump diff --git a/nixpkgs/pkgs/development/libraries/libdynd/default.nix b/nixpkgs/pkgs/development/libraries/libdynd/default.nix index 93ece69cf056..f8baa347914c 100644 --- a/nixpkgs/pkgs/development/libraries/libdynd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdynd/default.nix @@ -2,7 +2,8 @@ let version = "0.7.2"; in stdenv.mkDerivation { - name = "libdynd-${version}"; + pname = "libdynd"; + inherit version; src = fetchFromGitHub { owner = "libdynd"; diff --git a/nixpkgs/pkgs/development/libraries/libeb/default.nix b/nixpkgs/pkgs/development/libraries/libeb/default.nix index 293b1c28e932..2fdb1d071b62 100644 --- a/nixpkgs/pkgs/development/libraries/libeb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libeb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libeb-${version}"; + pname = "libeb"; version = "4.4.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libebur128/default.nix b/nixpkgs/pkgs/development/libraries/libebur128/default.nix index 6a4078f92cf3..16624a780797 100644 --- a/nixpkgs/pkgs/development/libraries/libebur128/default.nix +++ b/nixpkgs/pkgs/development/libraries/libebur128/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.4"; - name = "libebur128-${version}"; + pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; diff --git a/nixpkgs/pkgs/development/libraries/libechonest/default.nix b/nixpkgs/pkgs/development/libraries/libechonest/default.nix index be9f5e772d91..855386114c1c 100644 --- a/nixpkgs/pkgs/development/libraries/libechonest/default.nix +++ b/nixpkgs/pkgs/development/libraries/libechonest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }: stdenv.mkDerivation rec { - name = "libechonest-${version}"; + pname = "libechonest"; version = "2.3.0"; src = fetchurl { - url = "http://files.lfranchi.com/${name}.tar.bz2"; + url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2"; sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db"; }; diff --git a/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix index 26fe2d90963a..1835b924ec1a 100644 --- a/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { version = "3258"; - name = "libelf-freebsd-${version}"; + pname = "libelf-freebsd"; src = fetchsvn { url = svn://svn.code.sf.net/p/elftoolchain/code/trunk; diff --git a/nixpkgs/pkgs/development/libraries/libesmtp/default.nix b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix index 980cee2e6879..8555449f28bd 100644 --- a/nixpkgs/pkgs/development/libraries/libesmtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libesmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libESMTP-${version}"; + pname = "libESMTP"; version = "1.0.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libev/default.nix b/nixpkgs/pkgs/development/libraries/libev/default.nix index 365c128239d8..56710945ecb1 100644 --- a/nixpkgs/pkgs/development/libraries/libev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libev-${version}"; + pname = "libev"; version="4.27"; src = fetchurl { - url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; + url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d"; }; diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix index 611287b9aaa8..5fb46bff0756 100644 --- a/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -5,7 +5,7 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { - name = "libevent-${version}"; + pname = "libevent"; version = "2.1.10"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libewf/default.nix b/nixpkgs/pkgs/development/libraries/libewf/default.nix index d150d4a00330..fd1e203ed37f 100644 --- a/nixpkgs/pkgs/development/libraries/libewf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libewf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "20171104"; - name = "libewf-${version}"; + pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix index a61d51aa6b72..2eee9bafe44b 100644 --- a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "libexecinfo-${version}"; + pname = "libexecinfo"; version = "1.1"; src = fetchurl { - url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2"; + url = "http://distcache.freebsd.org/local-distfiles/itetcu/${pname}-${version}.tar.bz2"; sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9"; }; diff --git a/nixpkgs/pkgs/development/libraries/libfakekey/default.nix b/nixpkgs/pkgs/development/libraries/libfakekey/default.nix index e36c4ee12b94..196f0e50bef8 100644 --- a/nixpkgs/pkgs/development/libraries/libfakekey/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfakekey/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: stdenv.mkDerivation rec { - name = "libfakekey-${version}"; + pname = "libfakekey"; version = "0.1"; src = fetchurl { - url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz"; sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; diff --git a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix index f553afdfc709..62f1b087de5b 100644 --- a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "libfaketime-${version}"; + pname = "libfaketime"; version = "0.9.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libfann/default.nix b/nixpkgs/pkgs/development/libraries/libfann/default.nix index 5ac7a244df20..5e1c985fe2c4 100644 --- a/nixpkgs/pkgs/development/libraries/libfann/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfann/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libfann-${version}"; + pname = "libfann"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libffcall/default.nix b/nixpkgs/pkgs/development/libraries/libffcall/default.nix index 513a4dc3d384..8d11cd86c45f 100644 --- a/nixpkgs/pkgs/development/libraries/libffcall/default.nix +++ b/nixpkgs/pkgs/development/libraries/libffcall/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libffcall-${version}"; + pname = "libffcall"; version = "2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix index 4b02d651929b..0c8a7084e095 100644 --- a/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -3,7 +3,7 @@ zlib, libpng, boost, qt5, guile }: stdenv.mkDerivation rec { - name = "libfive-${version}"; + pname = "libfive"; version = "2018-07-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libfixposix/default.nix b/nixpkgs/pkgs/development/libraries/libfixposix/default.nix index 2d2d56dda4f2..9c9b6c8034c4 100644 --- a/nixpkgs/pkgs/development/libraries/libfixposix/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfixposix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name="libfixposix-${version}"; + pname = "libfixposix"; version="0.4.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libfreefare/default.nix b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix index cfae74b4b9e3..c0595ac93d1c 100644 --- a/nixpkgs/pkgs/development/libraries/libfreefare/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfreefare/default.nix @@ -2,7 +2,7 @@ , libobjc ? null }: stdenv.mkDerivation rec { - name = "libfreefare-${version}"; + pname = "libfreefare"; version = "0.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libfsm/default.nix b/nixpkgs/pkgs/development/libraries/libfsm/default.nix index 5491fab3edf2..ce7d615f4d31 100644 --- a/nixpkgs/pkgs/development/libraries/libfsm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfsm/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libfsm-${version}"; + pname = "libfsm"; version = "0.1pre1869_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix b/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix index a6fe2bc1435f..d83b43a782e9 100644 --- a/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgaminggear/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libgaminggear-${version}"; + pname = "libgaminggear"; version = "0.15.1"; src = fetchurl { - url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2"; + url = "mirror://sourceforge/libgaminggear/${pname}-${version}.tar.bz2"; sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz"; }; diff --git a/nixpkgs/pkgs/development/libraries/libgap/default.nix b/nixpkgs/pkgs/development/libraries/libgap/default.nix index 42e812ec1f53..b6a8ae3c8dfe 100644 --- a/nixpkgs/pkgs/development/libraries/libgap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgap/default.nix @@ -7,7 +7,7 @@ # - https://github.com/markuspf/gap/issues/2 # - https://trac.sagemath.org/ticket/22626 stdenv.mkDerivation rec { - name = "libgap-${version}"; + pname = "libgap"; # Has to be the same version as "gap" version = "4.8.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 4d8a7eac27c8..36a1b7d37208 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -5,11 +5,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { - name = "libgcrypt-${version}"; + pname = "libgcrypt"; version = "1.8.4"; src = fetchurl { - url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; + url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"; }; diff --git a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix index 51520eb0fe38..db75ff1784f5 100644 --- a/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; - name = "libgeotiff-${version}"; + pname = "libgeotiff"; src = fetchFromGitHub { owner = "OSGeo"; diff --git a/nixpkgs/pkgs/development/libraries/libgig/default.nix b/nixpkgs/pkgs/development/libraries/libgig/default.nix index 56f160838e66..279392382785 100644 --- a/nixpkgs/pkgs/development/libraries/libgig/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "libgig-${version}"; + pname = "libgig"; version = "4.2.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; }; diff --git a/nixpkgs/pkgs/development/libraries/libgksu/default.nix b/nixpkgs/pkgs/development/libraries/libgksu/default.nix index 9bec00b9f52d..24052ea40585 100644 --- a/nixpkgs/pkgs/development/libraries/libgksu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgksu/default.nix @@ -6,10 +6,9 @@ stdenv.mkDerivation rec { version = "2.0.12"; pname = "libgksu"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${name}.tar.gz"; + url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; }; diff --git a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index 62c6b45c5d45..ed6139d48f6f 100644 --- a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: stdenv.mkDerivation rec { - name = "libglvnd-${version}"; + pname = "libglvnd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libgringotts/default.nix b/nixpkgs/pkgs/development/libraries/libgringotts/default.nix index 89fcfdfde8da..76d7ebcc8cc2 100644 --- a/nixpkgs/pkgs/development/libraries/libgringotts/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgringotts/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }: stdenv.mkDerivation rec { - name = "libgringotts-${version}"; + pname = "libgringotts"; version = "1.2.1"; src = fetchurl { - url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2"; + url = "https://sourceforge.net/projects/gringotts.berlios/files/${pname}-${version}.tar.bz2"; sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7"; }; diff --git a/nixpkgs/pkgs/development/libraries/libgroove/default.nix b/nixpkgs/pkgs/development/libraries/libgroove/default.nix index bd5a5f068515..fd34f28c1e81 100644 --- a/nixpkgs/pkgs/development/libraries/libgroove/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgroove/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.3.0"; - name = "libgroove-${version}"; + pname = "libgroove"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/nixpkgs/pkgs/development/libraries/libgudev/default.nix index d3dea766cbbb..b52a2b1e0fa9 100644 --- a/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }: +{ stdenv +, fetchurl +, pkgconfig +, udev +, glib +, gobject-introspection +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "libgudev"; -in stdenv.mkDerivation rec { - name = "libgudev-${version}"; - version = "232"; + version = "233"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q"; }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index e3d7741ba869..9b50ddd4b7f4 100644 --- a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -10,7 +10,7 @@ assert appliance == null || stdenv.lib.isDerivation appliance; assert javaSupport -> jdk != null; stdenv.mkDerivation rec { - name = "libguestfs-${version}"; + pname = "libguestfs"; version = "1.38.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libgumath/default.nix b/nixpkgs/pkgs/development/libraries/libgumath/default.nix index d5d35678b4fb..b82c547fb331 100644 --- a/nixpkgs/pkgs/development/libraries/libgumath/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgumath/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libgumath-${version}"; + pname = "libgumath"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 9c3d9faf1f4f..4883b39b7cf7 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.10"; + version = "0.0.11"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs"; + sha256 = "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix index 3182345bfd48..7e1bb2daa9e1 100644 --- a/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.0"; - name = "libheif-${version}"; + pname = "libheif"; src = fetchFromGitHub { owner = "strukturag"; diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix index b86a48ecd1ba..d8881b929a05 100644 --- a/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -2,7 +2,7 @@ , python3, tzdata, glib, libxml2, icu }: stdenv.mkDerivation rec { - name = "libical-${version}"; + pname = "libical"; version = "3.0.4"; outputs = [ "out" "dev" ]; #"devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/nixpkgs/pkgs/development/libraries/libiconv/default.nix index c5379692ad30..7dc90d9ae3e4 100644 --- a/nixpkgs/pkgs/development/libraries/libiconv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiconv/default.nix @@ -6,11 +6,11 @@ # assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross stdenv.mkDerivation rec { - name = "libiconv-${version}"; + pname = "libiconv"; version = "1.16"; src = fetchurl { - url = "mirror://gnu/libiconv/${name}.tar.gz"; + url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz"; sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6"; }; diff --git a/nixpkgs/pkgs/development/libraries/libid3tag/default.nix b/nixpkgs/pkgs/development/libraries/libid3tag/default.nix index 4b7d9bdc2e32..674862d694c7 100644 --- a/nixpkgs/pkgs/development/libraries/libid3tag/default.nix +++ b/nixpkgs/pkgs/development/libraries/libid3tag/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, gperf}: stdenv.mkDerivation rec { - name = "libid3tag-${version}"; + pname = "libid3tag"; version = "0.15.1b"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/nixpkgs/pkgs/development/libraries/libidn2/default.nix index 5ec5b8e04dd0..7e7b691e3c19 100644 --- a/nixpkgs/pkgs/development/libraries/libidn2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libidn2/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libidn2-${version}"; + pname = "libidn2"; version = "2.2.0"; src = fetchurl { - url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; + url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz"; sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw"; }; diff --git a/nixpkgs/pkgs/development/libraries/libiec61883/default.nix b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix index 4fa3addc0a66..936d165a6cfc 100644 --- a/nixpkgs/pkgs/development/libraries/libiec61883/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; - name = "libiec61883-${version}"; + pname = "libiec61883"; src = fetchurl { url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libiio/default.nix b/nixpkgs/pkgs/development/libraries/libiio/default.nix index df5035461afd..9392061a269e 100644 --- a/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiio/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libiio-${version}"; + pname = "libiio"; version = "0.18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index 6464e4e58201..7eccfc37363c 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -5,8 +5,6 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; version = "2019-04-04"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = pname; repo = pname; diff --git a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix index c57590aad218..9be58ac537ad 100644 --- a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix @@ -12,10 +12,10 @@ let mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; self = stdenv.mkDerivation rec { - name = "libinfinity-${version}"; + pname = "libinfinity"; version = "0.7.1"; src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; + url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz"; sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; }; diff --git a/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix b/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix index 6fc507daf641..75cd1a005072 100644 --- a/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { - name = "libinotify-kqueue-${version}"; + pname = "libinotify-kqueue"; version = "20180201"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index 0c759835183b..c1ee68a2470b 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -26,11 +26,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-${version}"; + pname = "libinput"; version = "1.13.4"; src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; }; diff --git a/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/nixpkgs/pkgs/development/libraries/libipfix/default.nix index fea5a86da446..c4dca659d366 100644 --- a/nixpkgs/pkgs/development/libraries/libipfix/default.nix +++ b/nixpkgs/pkgs/development/libraries/libipfix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libipfix-${version}"; + pname = "libipfix"; version = "110209"; src = fetchurl { url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; diff --git a/nixpkgs/pkgs/development/libraries/libircclient/default.nix b/nixpkgs/pkgs/development/libraries/libircclient/default.nix index 71238dda1620..561a52482788 100644 --- a/nixpkgs/pkgs/development/libraries/libircclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libircclient/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.10"; pname = "libircclient"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv"; }; diff --git a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix index ce2028e805dc..cefce19d4659 100644 --- a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: stdenv.mkDerivation rec { - name = "libisoburn-${version}"; + pname = "libisoburn"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs"; }; diff --git a/nixpkgs/pkgs/development/libraries/libisofs/default.nix b/nixpkgs/pkgs/development/libraries/libisofs/default.nix index d52814483870..59726094c4ae 100644 --- a/nixpkgs/pkgs/development/libraries/libisofs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisofs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, acl, attr, zlib }: stdenv.mkDerivation rec { - name = "libisofs-${version}"; + pname = "libisofs"; version = "1.5.0"; src = fetchurl { - url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; + url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys"; }; diff --git a/nixpkgs/pkgs/development/libraries/libite/default.nix b/nixpkgs/pkgs/development/libraries/libite/default.nix index 0b00cf90ba00..73801102ba38 100644 --- a/nixpkgs/pkgs/development/libraries/libite/default.nix +++ b/nixpkgs/pkgs/development/libraries/libite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: stdenv.mkDerivation rec { - name = "libite-${version}"; + pname = "libite"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libivykis/default.nix b/nixpkgs/pkgs/development/libraries/libivykis/default.nix index 51b2dd7c7bd6..bd1432b8a21b 100644 --- a/nixpkgs/pkgs/development/libraries/libivykis/default.nix +++ b/nixpkgs/pkgs/development/libraries/libivykis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }: stdenv.mkDerivation rec { - name = "libivykis-${version}"; + pname = "libivykis"; version = "0.42.3"; diff --git a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix index 68835c1414c3..1790f3f68b2a 100644 --- a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "148"; version = "hg-2012-12-02"; - name = "libixp-${version}"; + pname = "libixp"; src = fetchurl { url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip; diff --git a/nixpkgs/pkgs/development/libraries/libjreen/default.nix b/nixpkgs/pkgs/development/libraries/libjreen/default.nix index 2167b4477034..9e81c9324057 100644 --- a/nixpkgs/pkgs/development/libraries/libjreen/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjreen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }: stdenv.mkDerivation rec { - name = "libjreen-${version}"; + pname = "libjreen"; version = "1.2.0"; src = fetchurl { - url = "https://qutim.org/dwnl/73/${name}.tar.bz2"; + url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2"; sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; }; diff --git a/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix index f352c8e9ed19..a7c9427080d8 100644 --- a/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libjson-rpc-cpp-${version}"; + pname = "libjson-rpc-cpp"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libjson/default.nix b/nixpkgs/pkgs/development/libraries/libjson/default.nix index c83143dd6b13..ba92bdd51655 100644 --- a/nixpkgs/pkgs/development/libraries/libjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjson/default.nix @@ -2,7 +2,8 @@ let version = "7.6.1"; in stdenv.mkDerivation rec { - name = "libjson-${version}"; + pname = "libjson"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libjson/libjson_${version}.zip"; sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; diff --git a/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix index 93f3b2a4f84d..12205a6a63b3 100644 --- a/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fftw, qtbase, qmake }: stdenv.mkDerivation rec { - name = "libkeyfinder-${version}"; + pname = "libkeyfinder"; version = "2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix index 24dd34d7a6a3..67d525112ccb 100644 --- a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liblangtag"; version = "0.6.1"; diff --git a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix index 767485a75154..ff1a39fc2049 100644 --- a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix @@ -4,12 +4,13 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "liblastfm-${version}"; + pname = "liblastfm"; + inherit version; # Upstream does not package git tags as tarballs. Get tarball from github. src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; diff --git a/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix b/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix index cafd6a66aa00..dd999db27599 100644 --- a/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblaxjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.5"; - name = "liblaxjson-${version}"; + pname = "liblaxjson"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/nixpkgs/pkgs/development/libraries/liblcf/default.nix index 9870e024687c..fe513d378cd8 100644 --- a/nixpkgs/pkgs/development/libraries/liblcf/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblcf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }: stdenv.mkDerivation rec { - name = "liblcf-${version}"; + pname = "liblcf"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 1a177dc22374..e8d8e971bc54 100644 --- a/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "liblinear-${version}"; + pname = "liblinear"; version = "2.30"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index c2731e44efbc..a61c21ffec5f 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -5,7 +5,8 @@ let version = "3.10.0"; in stdenv.mkDerivation rec { - name = "liblouis-${version}"; + pname = "liblouis"; + inherit version; src = fetchFromGitHub { owner = "liblouis"; diff --git a/nixpkgs/pkgs/development/libraries/liblscp/default.nix b/nixpkgs/pkgs/development/libraries/liblscp/default.nix index 1a5a4baf8086..471f277fb523 100644 --- a/nixpkgs/pkgs/development/libraries/liblscp/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblscp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - name = "liblscp-${version}"; + pname = "liblscp"; version = "0.6.0"; src = fetchurl { - url = "https://download.linuxsampler.org/packages/${name}.tar.gz"; + url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k"; }; diff --git a/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix b/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix index 8ff02b49e584..3786c5e77d3a 100644 --- a/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmatchbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}: stdenv.mkDerivation rec { - name = "libmatchbox-${version}"; + pname = "libmatchbox"; version = "1.11"; buildInputs = [ libXft libICE pango libjpeg ]; diff --git a/nixpkgs/pkgs/development/libraries/libmatheval/default.nix b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix index 0f43c0d46164..7f5c8b4c4c25 100644 --- a/nixpkgs/pkgs/development/libraries/libmatheval/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmatheval/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { version = "1.1.11"; - name = "libmatheval-${version}"; + pname = "libmatheval"; nativeBuildInputs = [ pkgconfig autoconf flex ]; buildInputs = [ guile ]; src = fetchurl { - url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; + url = "https://ftp.gnu.org/gnu/libmatheval/${pname}-${version}.tar.gz"; sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab"; }; diff --git a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix index f1b15a91ccac..46ed250b7b19 100644 --- a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmaxminddb-${version}"; + pname = "libmaxminddb"; version = "1.3.2"; src = fetchurl { - url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; + url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76"; }; diff --git a/nixpkgs/pkgs/development/libraries/libmd/default.nix b/nixpkgs/pkgs/development/libraries/libmd/default.nix index de8baa7ad198..a38e71bb540e 100644 --- a/nixpkgs/pkgs/development/libraries/libmd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmd/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libmd"; version = "1.0.1"; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index bf6aa0d23fb7..adf856544c48 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "19.07"; - name = "libmediainfo-${version}"; + pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss"; diff --git a/nixpkgs/pkgs/development/libraries/libmesode/default.nix b/nixpkgs/pkgs/development/libraries/libmesode/default.nix index e46eb9208de6..7ec06b51e8cb 100644 --- a/nixpkgs/pkgs/development/libraries/libmesode/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmesode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: stdenv.mkDerivation rec { - name = "libmesode-${version}"; + pname = "libmesode"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libmhash/default.nix b/nixpkgs/pkgs/development/libraries/libmhash/default.nix index d3f30a752732..598f0b7f7898 100644 --- a/nixpkgs/pkgs/development/libraries/libmhash/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmhash/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "mhash"; version = "0.9.9.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; }; diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix index f75d32c4313e..719053e7ecf1 100644 --- a/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: stdenv.mkDerivation rec { - name = "libmicrohttpd-${version}"; + pname = "libmicrohttpd"; version = "0.9.64"; src = fetchurl { - url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; + url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7"; }; diff --git a/nixpkgs/pkgs/development/libraries/libmilter/default.nix b/nixpkgs/pkgs/development/libraries/libmilter/default.nix index aa606e2a177e..3eb688f95721 100644 --- a/nixpkgs/pkgs/development/libraries/libmilter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmilter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { - name = "libmilter-${version}"; + pname = "libmilter"; version = "8.15.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libmkv/default.nix b/nixpkgs/pkgs/development/libraries/libmkv/default.nix index 9c89d2e8d7b8..8b659c46792f 100644 --- a/nixpkgs/pkgs/development/libraries/libmkv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmkv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libtool, autoconf, automake }: stdenv.mkDerivation rec { - name = "libmkv-${version}"; + pname = "libmkv"; version = "0.6.5.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/libmodplug/default.nix b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix index 858004910160..231f18377e48 100644 --- a/nixpkgs/pkgs/development/libraries/libmodplug/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix @@ -3,7 +3,8 @@ let version = "0.8.9.0"; in stdenv.mkDerivation rec { - name = "libmodplug-${version}"; + pname = "libmodplug"; + inherit version; meta = with stdenv.lib; { description = "MOD playing library"; @@ -14,7 +15,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz"; sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; } diff --git a/nixpkgs/pkgs/development/libraries/libmowgli/default.nix b/nixpkgs/pkgs/development/libraries/libmowgli/default.nix index 512add5616a0..99f04bc09de7 100644 --- a/nixpkgs/pkgs/development/libraries/libmowgli/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmowgli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmowgli-${version}"; + pname = "libmowgli"; version = "2.1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libmpack/default.nix b/nixpkgs/pkgs/development/libraries/libmpack/default.nix index 4df38a9cc3c9..e8392f88ac7a 100644 --- a/nixpkgs/pkgs/development/libraries/libmpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmpack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtool }: stdenv.mkDerivation rec { - name = "libmpack-${version}"; + pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { owner = "tarruda"; diff --git a/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/nixpkgs/pkgs/development/libraries/libmpc/default.nix index 106f6fe6c37c..e4010280f4bd 100644 --- a/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -6,7 +6,8 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "libmpc-${version}"; # to avoid clash with the MPD client + pname = "libmpc"; + inherit version; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix b/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix index dac7cf48aac7..4c886078aa8b 100644 --- a/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.5.1"; - name = "libmpeg2-${version}"; + pname = "libmpeg2"; src = fetchurl { - url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz"; + url = "http://libmpeg2.sourceforge.net/files/${pname}-${version}.tar.gz"; sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; diff --git a/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix index 2b59adf8f922..05532df1abd4 100644 --- a/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.1.0"; - name = "libmusicbrainz-${version}"; + pname = "libmusicbrainz"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake neon libdiscid libxml2 ]; diff --git a/nixpkgs/pkgs/development/libraries/libmx/default.nix b/nixpkgs/pkgs/development/libraries/libmx/default.nix index 6653025eb056..483c5ff1ff7f 100644 --- a/nixpkgs/pkgs/development/libraries/libmx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmx/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libmx-${version}"; + pname = "libmx"; version = "1.4.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix index 8719f19acc1d..cde4251e2c69 100644 --- a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix @@ -3,7 +3,8 @@ let version = "1.3.0"; in stdenv.mkDerivation rec { - name = "libmypaint-${version}"; + pname = "libmypaint"; + inherit version; src = fetchFromGitHub { owner = "mypaint"; diff --git a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 2b7258031c33..166ff2ef5a02 100644 --- a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, boost, mysql }: stdenv.mkDerivation rec { - name = "libmysqlconnectorcpp-${version}"; + pname = "libmysqlconnectorcpp"; version = "1.1.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libnabo/default.nix b/nixpkgs/pkgs/development/libraries/libnabo/default.nix index b461bfb3ddfe..9414ebdcc2a0 100644 --- a/nixpkgs/pkgs/development/libraries/libnabo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnabo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.7"; - name = "libnabo-${version}"; + pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; diff --git a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index 17626bb23e13..695d46ba38ff 100644 --- a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnatpmp-${version}"; + pname = "libnatpmp"; version = "20150609"; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix index 38c6bb008634..bfff0c845225 100644 --- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libndctl-${version}"; + pname = "libndctl"; version = "66"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix index 51e4deed462c..6c4fc798f335 100644 --- a/nixpkgs/pkgs/development/libraries/libndtypes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndtypes/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libndtypes-${version}"; + pname = "libndtypes"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libnet/default.nix b/nixpkgs/pkgs/development/libraries/libnet/default.nix index ba116e20177f..75cea0041435 100644 --- a/nixpkgs/pkgs/development/libraries/libnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnet-${version}"; + pname = "libnet"; version = "1.2-rc3"; src = fetchurl { - url = "mirror://sourceforge/libnet-dev/${name}.tar.gz"; + url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz"; sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix index 95533696ddf2..328688612b63 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libnetfilter_acct-${version}"; + pname = "libnetfilter_acct"; src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${pname}-${version}.tar.bz2"; sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; }; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 41245e6539f4..85fbf458ac20 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_conntrack-${version}"; + pname = "libnetfilter_conntrack"; version = "1.0.7"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k"; }; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix index a680e009ab6a..563843cca469 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_cthelper-${version}"; + pname = "libnetfilter_cthelper"; version = "1.0.0"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2"; sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index d16155374ca8..9f706d619c3a 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_cttimeout-${version}"; + pname = "libnetfilter_cttimeout"; version = "1.0.0"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2"; sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"; }; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix index 0d8de14513ed..2b932bc08097 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_log/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_log-${version}"; + pname = "libnetfilter_log"; version = "1.0.1"; src = fetchurl { - url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2"; sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l"; }; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix index 94b3dc90a0b6..5f84bc03f82f 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "libnetfilter_queue-${version}"; + pname = "libnetfilter_queue"; src = fetchurl { - url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; }; diff --git a/nixpkgs/pkgs/development/libraries/libnfc/default.nix b/nixpkgs/pkgs/development/libraries/libnfc/default.nix index bef977caa28e..695ddadb5f39 100644 --- a/nixpkgs/pkgs/development/libraries/libnfc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnfc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libusb, readline }: stdenv.mkDerivation rec { - name = "libnfc-${version}"; + pname = "libnfc"; version = "1.7.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libnfs/default.nix b/nixpkgs/pkgs/development/libraries/libnfs/default.nix index 8ed6dfa8ac0d..d2848d9a1e9b 100644 --- a/nixpkgs/pkgs/development/libraries/libnfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libnfs-${version}"; + pname = "libnfs"; version = "4.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix index c6348b7b2e67..d9b2df6148aa 100644 --- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -3,7 +3,7 @@ # Note that this does not provide the ngspice command-line utility. For that see # the ngspice derivation. stdenv.mkDerivation rec { - name = "libngspice-${version}"; + pname = "libngspice"; version = "30"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libnih/default.nix b/nixpkgs/pkgs/development/libraries/libnih/default.nix index a4b0b26a345b..c0c66bc1a4a0 100644 --- a/nixpkgs/pkgs/development/libraries/libnih/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnih/default.nix @@ -3,7 +3,8 @@ let version = "1.0.3"; in stdenv.mkDerivation rec { - name = "libnih-${version}"; + pname = "libnih"; + inherit version; src = fetchurl { url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libofa/default.nix b/nixpkgs/pkgs/development/libraries/libofa/default.nix index 8131420cfd65..7dc23aa1e8ae 100644 --- a/nixpkgs/pkgs/development/libraries/libofa/default.nix +++ b/nixpkgs/pkgs/development/libraries/libofa/default.nix @@ -5,10 +5,11 @@ let deb_patch = "5"; in stdenv.mkDerivation rec { - name = "libofa-${version}"; + pname = "libofa"; + inherit version; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; diff --git a/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix index d53b1dc08308..7c14d8102fbe 100644 --- a/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libomxil-bellagio-${version}"; + pname = "libomxil-bellagio"; version = "0.9.3"; src = fetchurl { - url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz"; + url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${pname}-${version}.tar.gz"; sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r"; }; diff --git a/nixpkgs/pkgs/development/libraries/libopcodes/default.nix b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix index 450b9058d0b9..c42cd3206b41 100644 --- a/nixpkgs/pkgs/development/libraries/libopcodes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopcodes/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "libopcodes-${version}"; + pname = "libopcodes"; inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix index a29f8dc4a804..4ad1e2b77358 100644 --- a/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libopenaptx-${version}"; + pname = "libopenaptx"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libopus/default.nix b/nixpkgs/pkgs/development/libraries/libopus/default.nix index 10d438500a63..752be52963cb 100644 --- a/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -5,7 +5,8 @@ let version = "1.3.1"; in stdenv.mkDerivation rec { - name = "libopus-${version}"; + pname = "libopus"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libopusenc/default.nix b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix index 4ca0849447f3..e1d70bee6c4c 100644 --- a/nixpkgs/pkgs/development/libraries/libopusenc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopusenc/default.nix @@ -4,7 +4,8 @@ let version = "0.2.1"; in stdenv.mkDerivation rec { - name = "libopusenc-${version}"; + pname = "libopusenc"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/nixpkgs/pkgs/development/libraries/libosmium/default.nix index 885880c54c36..eeb8fec5f930 100644 --- a/nixpkgs/pkgs/development/libraries/libosmium/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosmium/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }: stdenv.mkDerivation rec { - name = "libosmium-${version}"; + pname = "libosmium"; version = "2.15.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix b/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix index 952509acc2ee..47d9c4215fdf 100644 --- a/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix +++ b/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix @@ -3,7 +3,8 @@ let version = "1.6.2"; in stdenv.mkDerivation { - name = "libossp-uuid-${version}"; + pname = "libossp-uuid"; + inherit version; src = fetchurl { url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libow/default.nix b/nixpkgs/pkgs/development/libraries/libow/default.nix index 7797061a71aa..fa0db0cd4ffc 100644 --- a/nixpkgs/pkgs/development/libraries/libow/default.nix +++ b/nixpkgs/pkgs/development/libraries/libow/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.2p1"; - name = "libow-${version}"; + pname = "libow"; src = fetchFromGitHub { owner = "owfs"; diff --git a/nixpkgs/pkgs/development/libraries/libp11/default.nix b/nixpkgs/pkgs/development/libraries/libp11/default.nix index 774019de0d5b..903aa66ce60d 100644 --- a/nixpkgs/pkgs/development/libraries/libp11/default.nix +++ b/nixpkgs/pkgs/development/libraries/libp11/default.nix @@ -2,13 +2,13 @@ , openssl }: stdenv.mkDerivation rec { - name = "libp11-${version}"; + pname = "libp11"; version = "0.4.10"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz"; }; diff --git a/nixpkgs/pkgs/development/libraries/libpaper/default.nix b/nixpkgs/pkgs/development/libraries/libpaper/default.nix index b4b72e5a36d3..3c37cf824959 100644 --- a/nixpkgs/pkgs/development/libraries/libpaper/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpaper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.24"; - name = "libpaper-${version}"; + pname = "libpaper"; src = fetchurl { url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libpar2/default.nix b/nixpkgs/pkgs/development/libraries/libpar2/default.nix index cf97744069b3..bbdce71bad6a 100644 --- a/nixpkgs/pkgs/development/libraries/libpar2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpar2/default.nix @@ -3,10 +3,11 @@ let version = "0.4"; in stdenv.mkDerivation rec { - name = "libpar2-${version}"; + pname = "libpar2"; + inherit version; src = fetchurl { - url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; diff --git a/nixpkgs/pkgs/development/libraries/libpfm/default.nix b/nixpkgs/pkgs/development/libraries/libpfm/default.nix index bf1d26cf90d0..d0572de537eb 100644 --- a/nixpkgs/pkgs/development/libraries/libpfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpfm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "4.10.1"; - name = "libpfm-${version}"; + pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; diff --git a/nixpkgs/pkgs/development/libraries/libpgf/default.nix b/nixpkgs/pkgs/development/libraries/libpgf/default.nix index f8c91df64683..b3dae0c60eaa 100644 --- a/nixpkgs/pkgs/development/libraries/libpgf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpgf/default.nix @@ -6,7 +6,8 @@ let version = "6.14.12"; in stdenv.mkDerivation { - name = "libpgf-${version}"; + pname = "libpgf"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix index bf516b33d02a..63035f74ea0e 100644 --- a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation rec { - name = "libpinyin-${version}"; + pname = "libpinyin"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix index d622584c9da4..19b700ca5e30 100644 --- a/nixpkgs/pkgs/development/libraries/libplist/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { pname = "libplist"; version = "2019-04-04"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix index 3b050c3dc6a0..09bb0e4aa3f2 100644 --- a/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -3,7 +3,7 @@ , SystemConfiguration, CoreFoundation, JavaScriptCore }: stdenv.mkDerivation rec { - name = "libproxy-${version}"; + pname = "libproxy"; version = "0.4.15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libpwquality/default.nix b/nixpkgs/pkgs/development/libraries/libpwquality/default.nix index 7d697ee10f17..60c01565e63e 100644 --- a/nixpkgs/pkgs/development/libraries/libpwquality/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpwquality/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }: stdenv.mkDerivation rec { - name = "libpwquality-${version}"; + pname = "libpwquality"; version = "1.4.0"; src = fetchFromGitHub { owner = "libpwquality"; repo = "libpwquality"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd"; }; diff --git a/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix index f175bb6ea6d9..f1c7874e313e 100644 --- a/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: prefix: stdenv.mkDerivation rec { - name = "libqmatrixclient-${version}"; + pname = "libqmatrixclient"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; diff --git a/nixpkgs/pkgs/development/libraries/libqtav/default.nix b/nixpkgs/pkgs/development/libraries/libqtav/default.nix index 048ba48bb674..22245f5fa2ab 100644 --- a/nixpkgs/pkgs/development/libraries/libqtav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqtav/default.nix @@ -8,7 +8,7 @@ with lib; mkDerivation rec { - name = "libqtav-${version}"; + pname = "libqtav"; version = "1.12.0"; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix index 5eb8049437c9..360b2c15a632 100644 --- a/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lcms2, jasper, pkgconfig }: stdenv.mkDerivation rec { - name = "libraw-${version}"; + pname = "libraw"; version = "0.19.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/librdf/default.nix b/nixpkgs/pkgs/development/libraries/librdf/default.nix index d92b017712d4..5b39940bb3f7 100644 --- a/nixpkgs/pkgs/development/libraries/librdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/librdf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; - name = "liblrdf-${version}"; + pname = "liblrdf"; src = fetchurl { url = "https://github.com/swh/LRDF/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libre/default.nix b/nixpkgs/pkgs/development/libraries/libre/default.nix index c9debe61743d..e365ec7a01ac 100644 --- a/nixpkgs/pkgs/development/libraries/libre/default.nix +++ b/nixpkgs/pkgs/development/libraries/libre/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { version = "0.6.0"; - name = "libre-${version}"; + pname = "libre"; src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf"; diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 3805965d11ca..468bcfb0a18f 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}: stdenv.mkDerivation rec { - name = "librealsense-${version}"; + pname = "librealsense"; version = "2.25.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/librem/default.nix b/nixpkgs/pkgs/development/libraries/librem/default.nix index 50c20d12ccc8..aeda663342e4 100644 --- a/nixpkgs/pkgs/development/libraries/librem/default.nix +++ b/nixpkgs/pkgs/development/libraries/librem/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { version = "0.6.0"; - name = "librem-${version}"; + pname = "librem"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1"; diff --git a/nixpkgs/pkgs/development/libraries/librep/default.nix b/nixpkgs/pkgs/development/libraries/librep/default.nix index 2f78222cebb1..f11a7eb1fe54 100644 --- a/nixpkgs/pkgs/development/libraries/librep/default.nix +++ b/nixpkgs/pkgs/development/libraries/librep/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "librep-${version}"; + pname = "librep"; version = "0.92.7"; sourceName = "librep_${version}"; diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix index 7fbe25addc03..71b8d2bb20e6 100644 --- a/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -3,11 +3,11 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "libressl-${version}"; + pname = "libressl"; inherit version; src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; + url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/librsync/default.nix b/nixpkgs/pkgs/development/libraries/librsync/default.nix index e4e96df86c16..79b05619ac59 100644 --- a/nixpkgs/pkgs/development/libraries/librsync/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: stdenv.mkDerivation rec { - name = "librsync-${version}"; + pname = "librsync"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libscrypt/default.nix b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix index 479da52f8d9b..b9ae1f829a1b 100644 --- a/nixpkgs/pkgs/development/libraries/libscrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libscrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libscrypt-${version}"; + pname = "libscrypt"; version = "1.21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix index 785dac4aef29..b2a799674771 100644 --- a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - name = "libsearpc-${version}"; + pname = "libsearpc"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index 6b38bcf2c778..8c9c6ac107ce 100644 --- a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, getopt, makeWrapper, utillinux }: stdenv.mkDerivation rec { - name = "libseccomp-${version}"; + pname = "libseccomp"; version = "2.4.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 82caacf93e6a..970c4aff246e 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -9,10 +9,9 @@ stdenv.mkDerivation rec { minor = "8"; level = "7"; version = "${major}.${minor}.${level}"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz"; + url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz"; sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da"; }; diff --git a/nixpkgs/pkgs/development/libraries/libsieve/default.nix b/nixpkgs/pkgs/development/libraries/libsieve/default.nix index 2da5d68d1174..bc34318d0a91 100644 --- a/nixpkgs/pkgs/development/libraries/libsieve/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsieve/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { version = "2.3.1"; - name = "libsieve-${version}"; + pname = "libsieve"; src = fetchurl { url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libsixel/default.nix b/nixpkgs/pkgs/development/libraries/libsixel/default.nix index 34d959423a36..561b547a8d7a 100644 --- a/nixpkgs/pkgs/development/libraries/libsixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsixel/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { version = "1.8.2"; - name = "libsixel-${version}"; + pname = "libsixel"; src = fetchFromGitHub { repo = "libsixel"; diff --git a/nixpkgs/pkgs/development/libraries/libskk/default.nix b/nixpkgs/pkgs/development/libraries/libskk/default.nix index 19ebbd363e1e..d0f822a23f5a 100644 --- a/nixpkgs/pkgs/development/libraries/libskk/default.nix +++ b/nixpkgs/pkgs/development/libraries/libskk/default.nix @@ -4,7 +4,7 @@ libgee, json-glib, skk-dicts, libxkbcommon }: stdenv.mkDerivation rec { - name = "libskk-${version}"; + pname = "libskk"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libsmi/default.nix b/nixpkgs/pkgs/development/libraries/libsmi/default.nix index 25f2a1e0846b..208aa6c9d616 100644 --- a/nixpkgs/pkgs/development/libraries/libsmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsmi/default.nix @@ -1,11 +1,11 @@ { stdenv , fetchurl }: stdenv.mkDerivation rec { - name = "libsmi-${version}"; + pname = "libsmi"; version = "0.5.0"; src = fetchurl { - url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz"; + url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${pname}-${version}.tar.gz"; sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; }; diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 8ffae53be196..263623c3d37c 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "libsolv-${version}"; + pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; diff --git a/nixpkgs/pkgs/development/libraries/libsoundio/default.nix b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix index f53db7241cf7..e7ec858cc7b3 100644 --- a/nixpkgs/pkgs/development/libraries/libsoundio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "libsoundio-${version}"; + pname = "libsoundio"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 52a52e7e7324..5f88ba80cd6a 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -3,12 +3,11 @@ , libpsl, python3 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libsoup"; version = "2.66.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"; }; diff --git a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix index 8018b84a52be..bdca44dc7d03 100644 --- a/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix @@ -3,7 +3,8 @@ let version = "1.8.5"; in stdenv.mkDerivation rec { - name = "libspatialindex-${version}"; + pname = "libspatialindex"; + inherit version; src = fetchurl { url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libspiro/default.nix b/nixpkgs/pkgs/development/libraries/libspiro/default.nix index 00579600cb76..5f547a973707 100644 --- a/nixpkgs/pkgs/development/libraries/libspiro/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspiro/default.nix @@ -1,10 +1,10 @@ {stdenv, pkgconfig, fetchurl}: stdenv.mkDerivation rec { - name = "libspiro-${version}"; + pname = "libspiro"; version = "0.5.20150702"; src = fetchurl { - url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; }; diff --git a/nixpkgs/pkgs/development/libraries/libspotify/default.nix b/nixpkgs/pkgs/development/libraries/libspotify/default.nix index 5bae04a88f94..9ef3d6654138 100644 --- a/nixpkgs/pkgs/development/libraries/libspotify/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspotify/default.nix @@ -8,7 +8,8 @@ in if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux") then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here" else stdenv.mkDerivation { - name = "libspotify-${version}"; + pname = "libspotify"; + inherit version; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -61,7 +62,8 @@ else stdenv.mkDerivation { then throw '' Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly '' else stdenv.mkDerivation { - name = "libspotify-samples-${version}"; + pname = "libspotify-samples"; + inherit version; src = libspotify.src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libspotify readline ] diff --git a/nixpkgs/pkgs/development/libraries/libsrs2/default.nix b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix index 7d9ea25e9d26..f8fc6a446d18 100644 --- a/nixpkgs/pkgs/development/libraries/libsrs2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "libsrs2-${version}"; + pname = "libsrs2"; version = "1.0.18"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix index c1e6a1f7fb89..0ef96f675055 100644 --- a/nixpkgs/pkgs/development/libraries/libstrophe/default.nix +++ b/nixpkgs/pkgs/development/libraries/libstrophe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }: stdenv.mkDerivation rec { - name = "libstrophe-${version}"; + pname = "libstrophe"; version = "0.9.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libsvm/default.nix b/nixpkgs/pkgs/development/libraries/libsvm/default.nix index 6eb8b6b1a8e9..fcd010b46cc3 100644 --- a/nixpkgs/pkgs/development/libraries/libsvm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsvm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libsvm-${version}"; + pname = "libsvm"; version = "3.23"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libtap/default.nix b/nixpkgs/pkgs/development/libraries/libtap/default.nix index 29d83bcd9d70..ca0407bd0aa0 100644 --- a/nixpkgs/pkgs/development/libraries/libtap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtap/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "libtap-${version}"; + pname = "libtap"; version = "1.12.0"; src = fetchurl { - url = "https://web-cpan.shlomifish.org/downloads/${name}.tar.bz2"; + url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s"; }; diff --git a/nixpkgs/pkgs/development/libraries/libtar/default.nix b/nixpkgs/pkgs/development/libraries/libtar/default.nix index f2cb879b3e07..c4614103b3fe 100644 --- a/nixpkgs/pkgs/development/libraries/libtar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.20"; - name = "libtar-${version}"; + pname = "libtar"; # Maintenance repo for libtar (Arch Linux uses this) src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/libtcod/default.nix b/nixpkgs/pkgs/development/libraries/libtcod/default.nix index 4e859c282276..7a25980a38b9 100644 --- a/nixpkgs/pkgs/development/libraries/libtcod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtcod/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "libtcod-${version}"; + pname = "libtcod"; version = "1.5.1"; src = fetchFromBitbucket { diff --git a/nixpkgs/pkgs/development/libraries/libtelnet/default.nix b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix index 0bc619051c69..139de830972f 100644 --- a/nixpkgs/pkgs/development/libraries/libtelnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtelnet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: stdenv.mkDerivation rec { - name = "libtelnet-${version}"; + pname = "libtelnet"; version = "0.21+45f2d5c"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libtermkey/default.nix b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix index 7261fb7b6b74..38a09218dd1d 100644 --- a/nixpkgs/pkgs/development/libraries/libtermkey/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtermkey/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }: stdenv.mkDerivation rec { - name = "libtermkey-${version}"; + pname = "libtermkey"; version = "0.20"; diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 55c747540f77..093d6a185443 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.0.10"; - name = "libtiff-${version}"; + pname = "libtiff"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix index f9e7f9684bac..6520ddd0a9e2 100644 --- a/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "libtomcrypt-${version}"; + pname = "libtomcrypt"; version = "1.18.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libtommath/default.nix b/nixpkgs/pkgs/development/libraries/libtommath/default.nix index a90377dad34a..8ce82bcf07c7 100644 --- a/nixpkgs/pkgs/development/libraries/libtommath/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtommath/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { - name = "libtommath-${version}"; + pname = "libtommath"; version = "1.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 046229e8f1d7..26605eb41dbd 100644 --- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -11,7 +11,8 @@ let boostPython = boost.override { enablePython = true; inherit python; }; in stdenv.mkDerivation { - name = "libtorrent-rasterbar-${version}"; + pname = "libtorrent-rasterbar"; + inherit version; src = fetchFromGitHub { owner = "arvidn"; diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 50fdbf2a81f7..9bccff49b540 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix @@ -4,7 +4,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "libtoxcore-${version}"; + pname = "libtoxcore"; + inherit version; src = fetchFromGitHub { owner = "TokTok"; diff --git a/nixpkgs/pkgs/development/libraries/libtxc_dxtn/default.nix b/nixpkgs/pkgs/development/libraries/libtxc_dxtn/default.nix index b0be3cb3c12d..5ac456a60f61 100644 --- a/nixpkgs/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -3,10 +3,11 @@ let version = "1.0.1"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn-${version}"; + pname = "libtxc_dxtn"; + inherit version; src = fetchurl { - url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; diff --git a/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index aad8ae00c114..9a3671c32589 100644 --- a/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -3,7 +3,8 @@ let version = "1.0"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn_s2tc-${version}"; + pname = "libtxc_dxtn_s2tc"; + inherit version; src = fetchurl { url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/libuecc/default.nix b/nixpkgs/pkgs/development/libraries/libuecc/default.nix index 3b45d4de8842..7080edcd7380 100644 --- a/nixpkgs/pkgs/development/libraries/libuecc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuecc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "7"; - name = "libuecc-${version}"; + pname = "libuecc"; src = fetchgit { url = "git://git.universe-factory.net/libuecc"; diff --git a/nixpkgs/pkgs/development/libraries/libunarr/default.nix b/nixpkgs/pkgs/development/libraries/libunarr/default.nix index e21f9400848d..35ec5dfed7cd 100644 --- a/nixpkgs/pkgs/development/libraries/libunarr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunarr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "libunarr-${version}"; + pname = "libunarr"; version = "1.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libunibreak/default.nix b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix index 50bc05395895..7e75954fb45e 100644 --- a/nixpkgs/pkgs/development/libraries/libunibreak/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libunibreak-${version}"; + pname = "libunibreak"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz"; sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn"; }; diff --git a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix index b302e1d0ba03..b315d0f16b04 100644 --- a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { majorVer = "3.0"; minorVer = "2"; version = "${majorVer}.${minorVer}"; - name = "libunique3-${version}"; + pname = "libunique3"; srcName = "libunique-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libunistring/default.nix b/nixpkgs/pkgs/development/libraries/libunistring/default.nix index e066c0723679..e02e5228aa49 100644 --- a/nixpkgs/pkgs/development/libraries/libunistring/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunistring/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libunistring-${version}"; + pname = "libunistring"; version = "0.9.10"; src = fetchurl { - url = "mirror://gnu/libunistring/${name}.tar.gz"; + url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8"; }; diff --git a/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/nixpkgs/pkgs/development/libraries/libunwind/default.nix index 9bea14bd8e85..70e6b698ec5d 100644 --- a/nixpkgs/pkgs/development/libraries/libunwind/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunwind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { - name = "libunwind-${version}"; + pname = "libunwind"; version = "1.3.1"; src = fetchurl { - url = "mirror://savannah/libunwind/${name}.tar.gz"; + url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz"; sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3"; }; diff --git a/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/nixpkgs/pkgs/development/libraries/liburcu/default.nix index 90be77401141..3ed45e788c40 100644 --- a/nixpkgs/pkgs/development/libraries/liburcu/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburcu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; - name = "liburcu-${version}"; + pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index 7d595db85dd1..855c6ce280ec 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "liburing-${version}"; + pname = "liburing"; version = "0.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix index d9e008af9770..debccb9087d6 100644 --- a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; version = "2019-03-23"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/nixpkgs/pkgs/development/libraries/libutempter/default.nix b/nixpkgs/pkgs/development/libraries/libutempter/default.nix index f9703e3c5932..ff2044242b9f 100644 --- a/nixpkgs/pkgs/development/libraries/libutempter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libutempter/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "libutempter-${version}"; + pname = "libutempter"; version = "1.1.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libva-utils/default.nix b/nixpkgs/pkgs/development/libraries/libva-utils/default.nix index 9883de59feb1..c604ce71cb72 100644 --- a/nixpkgs/pkgs/development/libraries/libva-utils/default.nix +++ b/nixpkgs/pkgs/development/libraries/libva-utils/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "libva-utils-${version}"; + pname = "libva-utils"; inherit (libva) version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix b/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix index 6a0672445430..9b12f83bcb83 100644 --- a/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix +++ b/nixpkgs/pkgs/development/libraries/libva/1.0.0.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "libva-${version}"; + pname = "libva"; version = "1.7.3"; src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2"; sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; diff --git a/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix index 50b995a03568..039e3308f887 100644 --- a/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -2,7 +2,7 @@ , libXext, libvdpau, glib, libva, ffmpeg, libGLU }: stdenv.mkDerivation rec { - name = "libvdpau-va-gl-${version}"; + pname = "libvdpau-va-gl"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix index d68422260144..792a31bcf9f9 100644 --- a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg, mesa }: stdenv.mkDerivation rec { - name = "libvdpau-${version}"; + pname = "libvdpau"; version = "1.2"; src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2"; sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; }; diff --git a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index 9dd89133f4b9..1803ce1dc20a 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,12 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl -, libapparmor, vala -, xenSupport ? false, xen ? null +{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala +, libcap_ng, libvirt, libxml2 }: -let - inherit (pythonPackages) python pygobject2; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libvirt-glib-2.0.0"; outputs = [ "out" "dev" ]; @@ -16,15 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l"; }; - nativeBuildInputs = [ pkgconfig vala ]; - buildInputs = [ - libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobject-introspection libcap_ng numactl libapparmor - ] ++ stdenv.lib.optionals xenSupport [ - xen - ]; + nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; enableParallelBuilding = true; + strictDeps = true; meta = with stdenv.lib; { description = "Library for working with virtual machines"; @@ -36,7 +28,7 @@ in stdenv.mkDerivation rec { - libvirt-gconfig - GObjects for manipulating libvirt XML documents - libvirt-gobject - GObjects for managing libvirt objects ''; - homepage = http://libvirt.org/; + homepage = https://libvirt.org/; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 125259a6bee9..0556e311736a 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -16,13 +16,13 @@ with stdenv.lib; let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "libvirt-${version}"; + pname = "libvirt"; version = "5.4.0"; src = if buildFromTarball then fetchurl { - url = "http://libvirt.org/sources/${name}.tar.xz"; + url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"; } else diff --git a/nixpkgs/pkgs/development/libraries/libvisio/default.nix b/nixpkgs/pkgs/development/libraries/libvisio/default.nix index 5cb1c673be50..b807691671fd 100644 --- a/nixpkgs/pkgs/development/libraries/libvisio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvisio/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "libvisio-${version}"; + pname = "libvisio"; version = "0.1.7"; outputs = [ "out" "bin" "dev" "doc" ]; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio/${pname}-${version}.tar.xz"; sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"; }; diff --git a/nixpkgs/pkgs/development/libraries/libvmi/default.nix b/nixpkgs/pkgs/development/libraries/libvmi/default.nix index 44b2a81b2d3c..e49ab9b38a04 100644 --- a/nixpkgs/pkgs/development/libraries/libvmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvmi/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libvmi-${version}"; + pname = "libvmi"; version = "0.12.0"; libVersion = "0.0.12"; diff --git a/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/nixpkgs/pkgs/development/libraries/libvpx/default.nix index cd0cc9798fa0..ee36365c03ff 100644 --- a/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -55,7 +55,7 @@ assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { - name = "libvpx-${version}"; + pname = "libvpx"; version = "1.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index a1e10b6d003d..a4f0a44e60bf 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }: stdenv.mkDerivation rec { - name = "libwacom-${version}"; + pname = "libwacom"; version = "0.33"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/nixpkgs/pkgs/development/libraries/libwebp/default.nix index c11f70290a4a..fc9932567cfa 100644 --- a/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -26,11 +26,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libwebp-${version}"; + pname = "libwebp"; version = "1.0.3"; src = fetchurl { - url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; + url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; }; diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index 144bde9a23a9..a297bf61f786 100644 --- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: stdenv.mkDerivation rec { - name = "libwebsockets-${version}"; + pname = "libwebsockets"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix index 2af550c7d99a..18f6d37768ab 100644 --- a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: stdenv.mkDerivation rec { - name = "libwhereami-${version}"; + pname = "libwhereami"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libwps/default.nix b/nixpkgs/pkgs/development/libraries/libwps/default.nix index 76ac946d6187..e8f397548853 100644 --- a/nixpkgs/pkgs/development/libraries/libwps/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: stdenv.mkDerivation rec { - name = "libwps-${version}"; + pname = "libwps"; version = "0.4.10"; src = fetchurl { - url = "mirror://sourceforge/libwps/${name}.tar.bz2"; + url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4"; }; diff --git a/nixpkgs/pkgs/development/libraries/libx86/default.nix b/nixpkgs/pkgs/development/libraries/libx86/default.nix index d56c20cb75af..271823ace288 100644 --- a/nixpkgs/pkgs/development/libraries/libx86/default.nix +++ b/nixpkgs/pkgs/development/libraries/libx86/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libx86-${version}"; + pname = "libx86"; version = "1.1"; src = fetchurl { - url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${pname}-${version}.tar.gz"; sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; }; patches = [./constants.patch ./non-x86.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix index 2e00b5b5ab9c..f361b3e1b1f7 100644 --- a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "libx86emu-${version}"; + pname = "libx86emu"; version = "2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index 7bd89b44d889..fede13fcd9b4 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -4,7 +4,8 @@ let version = "4.3.4"; in stdenv.mkDerivation { - name = "libxc-${version}"; + pname = "libxc"; + inherit version; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; diff --git a/nixpkgs/pkgs/development/libraries/libxcomp/default.nix b/nixpkgs/pkgs/development/libraries/libxcomp/default.nix index b4ad501c2efe..fb1f4b29423f 100644 --- a/nixpkgs/pkgs/development/libraries/libxcomp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { - name = "libxcomp-${version}"; + pname = "libxcomp"; version = "3.5.99.16"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libxklavier/default.nix b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix index 773389e60f54..9408b0c45877 100644 --- a/nixpkgs/pkgs/development/libraries/libxklavier/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix @@ -5,11 +5,12 @@ let version = "5.4"; in stdenv.mkDerivation rec { - name = "libxklavier-${version}"; + pname = "libxklavier"; + inherit version; src = fetchgit { url = "git://anongit.freedesktop.org/git/libxklavier"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; diff --git a/nixpkgs/pkgs/development/libraries/libxls/default.nix b/nixpkgs/pkgs/development/libraries/libxls/default.nix index a2a576edc0f7..126589966464 100644 --- a/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "libxls-${version}"; + pname = "libxls"; version = "1.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 33f818f7d62c..04954f3e1f5f 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -10,11 +10,11 @@ let python = python2; in stdenv.mkDerivation rec { - name = "libxml2-${version}"; + pname = "libxml2"; version = "2.9.9"; src = fetchurl { - url = "http://xmlsoft.org/sources/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl"; }; diff --git a/nixpkgs/pkgs/development/libraries/libxnd/default.nix b/nixpkgs/pkgs/development/libraries/libxnd/default.nix index cb93ec63e670..9eb891544b5f 100644 --- a/nixpkgs/pkgs/development/libraries/libxnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxnd/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libxnd-${version}"; + pname = "libxnd"; version = "unstable-2018-11-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/nixpkgs/pkgs/development/libraries/libxslt/default.nix index 2dde7fe32efb..1a3efee176a0 100644 --- a/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -11,10 +11,9 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; version = "1.1.33"; - name = pname + "-" + version; src = fetchurl { - url = "http://xmlsoft.org/sources/${name}.tar.gz"; + url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; }; diff --git a/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix index af665c6d9a4a..75b377ff8d4d 100644 --- a/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "libyaml-cpp-${version}"; + pname = "libyaml-cpp"; version = "0.6.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libytnef/default.nix b/nixpkgs/pkgs/development/libraries/libytnef/default.nix index 710e7a3f0729..e46064ae56e9 100644 --- a/nixpkgs/pkgs/development/libraries/libytnef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libytnef/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "libytnef-${version}"; + pname = "libytnef"; version = "1.9.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/libzdb/default.nix b/nixpkgs/pkgs/development/libraries/libzdb/default.nix index f3cbddf1ec41..b16d897fb5f2 100644 --- a/nixpkgs/pkgs/development/libraries/libzdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzdb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.1"; - name = "libzdb-${version}"; + pname = "libzdb"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libzen/default.nix b/nixpkgs/pkgs/development/libraries/libzen/default.nix index afa7696aca99..fbbfb5364b0a 100644 --- a/nixpkgs/pkgs/development/libraries/libzen/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzen/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.37"; - name = "libzen-${version}"; + pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn"; diff --git a/nixpkgs/pkgs/development/libraries/libzip/default.nix b/nixpkgs/pkgs/development/libraries/libzip/default.nix index 50ed00711df7..43a5f7dc8413 100644 --- a/nixpkgs/pkgs/development/libraries/libzip/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libzip-${version}"; + pname = "libzip"; version = "1.3.0"; src = fetchurl { - url = "https://www.nih.at/libzip/${name}.tar.gz"; + url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; }; diff --git a/nixpkgs/pkgs/development/libraries/libzmf/default.nix b/nixpkgs/pkgs/development/libraries/libzmf/default.nix index 1413da4a18db..85b9308237fe 100644 --- a/nixpkgs/pkgs/development/libraries/libzmf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzmf/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "libzmf"; version = "0.0.2"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libzmf/${pname}-${version}.tar.xz"; sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; diff --git a/nixpkgs/pkgs/development/libraries/lightning/default.nix b/nixpkgs/pkgs/development/libraries/lightning/default.nix index 3f963c7ca19a..8a5026e307f6 100644 --- a/nixpkgs/pkgs/development/libraries/lightning/default.nix +++ b/nixpkgs/pkgs/development/libraries/lightning/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lightning-${version}"; + pname = "lightning"; version = "2.1.2"; src = fetchurl { - url = "mirror://gnu/lightning/${name}.tar.gz"; + url = "mirror://gnu/lightning/${pname}-${version}.tar.gz"; sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v"; }; diff --git a/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index ab0e51bae261..7f82d49462c5 100644 --- a/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "lightstep-tracer-cpp-${version}"; + pname = "lightstep-tracer-cpp"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix index 9af0c20d7014..f5cb197dfe5e 100644 --- a/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -9,7 +9,6 @@ , withSage ? false # sage support }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "linbox"; version = "1.6.3"; diff --git a/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix b/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix index 5fa1035868d1..b105aa64bff9 100644 --- a/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix +++ b/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "linenoise-ng-${version}"; + pname = "linenoise-ng"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/linenoise/default.nix b/nixpkgs/pkgs/development/libraries/linenoise/default.nix index 6bbcc725f22f..857f5247cd51 100644 --- a/nixpkgs/pkgs/development/libraries/linenoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/linenoise/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "linenoise-${version}"; + pname = "linenoise"; version = "1.0.10"; # Its version 1.0 plus 10 commits src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix index 99ea6343d70f..8b0aecdab168 100644 --- a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "liquid-dsp-${version}"; + pname = "liquid-dsp"; version = "20170307"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/live555/default.nix b/nixpkgs/pkgs/development/libraries/live555/default.nix index ff77cd71265e..57dcb3ee6a6a 100644 --- a/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -2,7 +2,7 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { - name = "live555-${version}"; + pname = "live555"; version = "2019.08.16"; src = fetchurl { # the upstream doesn't provide a stable URL diff --git a/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/nixpkgs/pkgs/development/libraries/lmdb/default.nix index 690a42cfb306..830ec7bdaee2 100644 --- a/nixpkgs/pkgs/development/libraries/lmdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/lmdb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "lmdb-${version}"; + pname = "lmdb"; version = "0.9.24"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix index 232a67c23f3b..f4ecba7ad1e4 100644 --- a/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix @@ -3,7 +3,7 @@ , lmdb }: stdenv.mkDerivation rec { - name = "lmdbxx-${version}"; + pname = "lmdbxx"; version = "0.9.14.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/loadcaffe/default.nix b/nixpkgs/pkgs/development/libraries/loadcaffe/default.nix index f0904726eedf..c4e55b14407c 100644 --- a/nixpkgs/pkgs/development/libraries/loadcaffe/default.nix +++ b/nixpkgs/pkgs/development/libraries/loadcaffe/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}: stdenv.mkDerivation rec { - name = "loadcaffe-${version}"; + pname = "loadcaffe"; version = "0.0pre2016.08.01"; buildInputs = [cmake torch protobuf protobufc]; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix index 8e8541564245..04b91e5d80fb 100644 --- a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "log4cxx-${version}"; + pname = "log4cxx"; version = "0.10.0"; src = fetchurl { - url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz"; + url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; diff --git a/nixpkgs/pkgs/development/libraries/log4shib/default.nix b/nixpkgs/pkgs/development/libraries/log4shib/default.nix index b2fba7df509b..ab8c2c9385f8 100644 --- a/nixpkgs/pkgs/development/libraries/log4shib/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4shib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { - name = "log4shib-${version}"; + pname = "log4shib"; version = "1.0.9"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/loki/default.nix b/nixpkgs/pkgs/development/libraries/loki/default.nix index 2ff927048ad5..631233f0ecbe 100644 --- a/nixpkgs/pkgs/development/libraries/loki/default.nix +++ b/nixpkgs/pkgs/development/libraries/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "loki-${version}"; + pname = "loki"; version = "0.1.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix index cad5d0d7ecad..e00fc07480e2 100644 --- a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix +++ b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5.3"; - name = "loudmouth-${version}"; + pname = "loudmouth"; src = fetchurl { - url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2"; + url = "https://mcabber.com/files/loudmouth/${pname}-${version}.tar.bz2"; sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; diff --git a/nixpkgs/pkgs/development/libraries/lucene++/default.nix b/nixpkgs/pkgs/development/libraries/lucene++/default.nix index c45fa6bc61aa..32eec84e69ef 100644 --- a/nixpkgs/pkgs/development/libraries/lucene++/default.nix +++ b/nixpkgs/pkgs/development/libraries/lucene++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, boost, gtest }: stdenv.mkDerivation rec { - name = "lucene++-${version}"; + pname = "lucene++"; version = "3.0.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/mac/default.nix b/nixpkgs/pkgs/development/libraries/mac/default.nix index 8a8a004a5e69..7355248b5c58 100644 --- a/nixpkgs/pkgs/development/libraries/mac/default.nix +++ b/nixpkgs/pkgs/development/libraries/mac/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, yasm }: stdenv.mkDerivation rec { - name = "mac-${version}"; + pname = "mac"; version = "4.11-u4-b5-s7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/mailcore2/default.nix b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix index c7794b1a8bfb..04f2208a35da 100644 --- a/nixpkgs/pkgs/development/libraries/mailcore2/default.nix +++ b/nixpkgs/pkgs/development/libraries/mailcore2/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mailcore2-${version}"; + pname = "mailcore2"; version = "0.6.3"; diff --git a/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/nixpkgs/pkgs/development/libraries/mapnik/default.nix index 3a90a4cdf33e..1feea915c025 100644 --- a/nixpkgs/pkgs/development/libraries/mapnik/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapnik/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "mapnik-${version}"; + pname = "mapnik"; version = "3.0.22"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/martyr/default.nix b/nixpkgs/pkgs/development/libraries/martyr/default.nix index 064f04f220cd..cec9e5adc296 100644 --- a/nixpkgs/pkgs/development/libraries/martyr/default.nix +++ b/nixpkgs/pkgs/development/libraries/martyr/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ant, jdk}: stdenv.mkDerivation rec { - name = "martyr-${version}"; + pname = "martyr"; version = "0.3.9"; src = fetchurl { - url = "mirror://sourceforge/martyr/${name}.tar.gz"; + url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index a72d5a825c6a..a06d082b2269 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { - name = "mbedtls-${version}"; + pname = "mbedtls"; version = "2.17.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw"; }; diff --git a/nixpkgs/pkgs/development/libraries/medfile/default.nix b/nixpkgs/pkgs/development/libraries/medfile/default.nix index 8f0a6317a257..04ebfced52e8 100644 --- a/nixpkgs/pkgs/development/libraries/medfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/medfile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, hdf5 }: stdenv.mkDerivation rec { - name = "medfile-${version}"; + pname = "medfile"; version = "4.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix index b8a8c64011ca..ebd68134ba55 100644 --- a/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mediastreamer-openh264-${version}"; + pname = "mediastreamer-openh264"; version = "0.0pre20160801"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index 94622b8a8f94..902fd9205681 100644 --- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: stdenv.mkDerivation rec { - name = "glu-${version}"; + pname = "glu"; version = "9.0.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${pname}-${version}.tar.bz2"; sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 7b1b5a3cfa96..7610b15296ee 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] -, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light }: diff --git a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix index 788d2c5d6188..0919ee6cd289 100644 --- a/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix @@ -5,7 +5,7 @@ let nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform; in stdenv.mkDerivation rec { - name = "microsoft_gsl-${version}"; + pname = "microsoft_gsl"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/mimetic/default.nix b/nixpkgs/pkgs/development/libraries/mimetic/default.nix index 7a06f9277c95..5f4dc5eedde5 100644 --- a/nixpkgs/pkgs/development/libraries/mimetic/default.nix +++ b/nixpkgs/pkgs/development/libraries/mimetic/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "mimetic"; version = "0.9.8"; - name = "${pname}-${version}"; src = fetchurl { url = "http://www.codesink.org/download/${pname}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/miniball/default.nix b/nixpkgs/pkgs/development/libraries/miniball/default.nix index 791cc9f3f911..3493bc5d9679 100644 --- a/nixpkgs/pkgs/development/libraries/miniball/default.nix +++ b/nixpkgs/pkgs/development/libraries/miniball/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniball-${version}"; + pname = "miniball"; version = "3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/minixml/default.nix b/nixpkgs/pkgs/development/libraries/minixml/default.nix index 972cc3e738c7..5bdacbba11d3 100644 --- a/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mxml-${version}"; + pname = "mxml"; version = "3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index a56deff66e44..5099991c117f 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "mlt-${version}"; + pname = "mlt"; version = "6.16.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index f46ec57197fb..f017e4452a64 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -6,7 +6,7 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "mlt-${version}"; + pname = "mlt"; version = "6.16.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix index 2a933ef78401..49116c349a86 100644 --- a/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mongoc-${version}"; + pname = "mongoc"; version = "1.8.0"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/mono-addins/default.nix b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix index 58905cce82ab..2bba61975f9d 100644 --- a/nixpkgs/pkgs/development/libraries/mono-addins/default.nix +++ b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { - name = "mono-addins-${version}"; + pname = "mono-addins"; version = "1.3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix b/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix index ba9e2a741e40..89db7344f995 100644 --- a/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, pkgconfig, mono }: stdenv.mkDerivation rec { - name = "mono-zeroconf-${version}"; + pname = "mono-zeroconf"; version = "0.9.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/motif/default.nix b/nixpkgs/pkgs/development/libraries/motif/default.nix index 51591c9d8e8b..ba61cb8414a1 100644 --- a/nixpkgs/pkgs/development/libraries/motif/default.nix +++ b/nixpkgs/pkgs/development/libraries/motif/default.nix @@ -8,11 +8,11 @@ # refer to the gentoo package stdenv.mkDerivation rec { - name = "motif-${version}"; + pname = "motif"; version = "2.3.6"; src = fetchurl { - url = "mirror://sourceforge/motif/${name}.tar.gz"; + url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz"; sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs"; }; diff --git a/nixpkgs/pkgs/development/libraries/movit/default.nix b/nixpkgs/pkgs/development/libraries/movit/default.nix index 96444ea4a23c..8162d3bb911d 100644 --- a/nixpkgs/pkgs/development/libraries/movit/default.nix +++ b/nixpkgs/pkgs/development/libraries/movit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }: stdenv.mkDerivation rec { - name = "movit-${version}"; + pname = "movit"; version = "1.6.3"; src = fetchurl { - url = "https://movit.sesse.net/${name}.tar.gz"; + url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; }; diff --git a/nixpkgs/pkgs/development/libraries/mpfi/default.nix b/nixpkgs/pkgs/development/libraries/mpfi/default.nix index 6b607e94bd49..baefab487e52 100644 --- a/nixpkgs/pkgs/development/libraries/mpfi/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpfi/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, mpfr}: stdenv.mkDerivation rec { - name = "mpfi-${version}"; + pname = "mpfi"; version = "1.5.3"; file_nr = "37331"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/mpfr/default.nix b/nixpkgs/pkgs/development/libraries/mpfr/default.nix index e32c83af8a75..a91d220be33e 100644 --- a/nixpkgs/pkgs/development/libraries/mpfr/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpfr/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "4.0.2"; - name = "mpfr-${version}"; + pname = "mpfr"; src = fetchurl { urls = [ #"https://www.mpfr.org/${name}/${name}.tar.xz" - "mirror://gnu/mpfr/${name}.tar.xz" + "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx"; }; diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix index 1c6b8df15114..2232bfb9a38b 100644 --- a/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -3,7 +3,7 @@ } : stdenv.mkDerivation rec { - name = "mpich-${version}"; + pname = "mpich"; version = "3.3.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/mpir/default.nix b/nixpkgs/pkgs/development/libraries/mpir/default.nix index fe9cd6f492e5..3b40f02c01c3 100644 --- a/nixpkgs/pkgs/development/libraries/mpir/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpir/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, m4, which, yasm }: stdenv.mkDerivation rec { - name = "mpir-${version}"; + pname = "mpir"; version = "3.0.0"; nativeBuildInputs = [ m4 which yasm ]; diff --git a/nixpkgs/pkgs/development/libraries/mps/default.nix b/nixpkgs/pkgs/development/libraries/mps/default.nix index 1430a3dfca15..3767b22ba0d8 100644 --- a/nixpkgs/pkgs/development/libraries/mps/default.nix +++ b/nixpkgs/pkgs/development/libraries/mps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, sqlite }: stdenv.mkDerivation rec { - name = "mps-${version}"; + pname = "mps"; version = "1.117.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/msgpack/generic.nix b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix index 29ec205d7a11..04f84d49f844 100644 --- a/nixpkgs/pkgs/development/libraries/msgpack/generic.nix +++ b/nixpkgs/pkgs/development/libraries/msgpack/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "msgpack-${version}"; + pname = "msgpack"; + inherit version; inherit src patches; diff --git a/nixpkgs/pkgs/development/libraries/msgpuck/default.nix b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix index e177694e894e..b200a12ef954 100644 --- a/nixpkgs/pkgs/development/libraries/msgpuck/default.nix +++ b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "msgpuck-${version}"; + pname = "msgpuck"; version = "2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index ef8525cf54d7..da41aceeef52 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -2,7 +2,7 @@ , boost, openssl, zlib, libsodium, olm, nlohmann_json }: stdenv.mkDerivation rec { - name = "mtxclient-${version}"; + pname = "mtxclient"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/muparser/default.nix b/nixpkgs/pkgs/development/libraries/muparser/default.nix index 53f348f93f8e..d058322660cf 100644 --- a/nixpkgs/pkgs/development/libraries/muparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/muparser/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "muparser-${version}"; + pname = "muparser"; version = "2.2.3"; url-version = stdenv.lib.replaceChars ["."] ["_"] version; diff --git a/nixpkgs/pkgs/development/libraries/mygui/default.nix b/nixpkgs/pkgs/development/libraries/mygui/default.nix index f4a869255f8c..0907f0174c99 100644 --- a/nixpkgs/pkgs/development/libraries/mygui/default.nix +++ b/nixpkgs/pkgs/development/libraries/mygui/default.nix @@ -4,7 +4,7 @@ let renderSystem = if withOgre then "3" else "4"; in stdenv.mkDerivation rec { - name = "mygui-${version}"; + pname = "mygui"; version = "3.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix index f29fb9564f31..5c0238fe41ea 100644 --- a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "nanoflann-${version}"; + pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; diff --git a/nixpkgs/pkgs/development/libraries/nanomsg/default.nix b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix index 8f72b333aa48..94bc8186f30c 100644 --- a/nixpkgs/pkgs/development/libraries/nanomsg/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanomsg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.5"; - name = "nanomsg-${version}"; + pname = "nanomsg"; src = fetchFromGitHub { owner = "nanomsg"; diff --git a/nixpkgs/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix index 55e9f44eae31..c842eac4311e 100644 --- a/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.8.1"; - name = "nco-${version}"; + pname = "nco"; buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl flex ]; diff --git a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index cbe1f9840593..7f08d0a75351 100644 --- a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -4,7 +4,8 @@ let version = "0.6.3"; in stdenv.mkDerivation { - name = "ndn-cxx-${version}"; + pname = "ndn-cxx"; + inherit version; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; diff --git a/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/nixpkgs/pkgs/development/libraries/ndpi/default.nix index 913a4a087a97..83d01f85d0a4 100644 --- a/nixpkgs/pkgs/development/libraries/ndpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndpi/default.nix @@ -3,7 +3,8 @@ let version = "2.8"; in stdenv.mkDerivation rec { - name = "ndpi-${version}"; + pname = "ndpi"; + inherit version; src = fetchFromGitHub { owner = "ntop"; diff --git a/nixpkgs/pkgs/development/libraries/neon/0.29.nix b/nixpkgs/pkgs/development/libraries/neon/0.29.nix index 87f9b5effacd..fbffb138e969 100644 --- a/nixpkgs/pkgs/development/libraries/neon/0.29.nix +++ b/nixpkgs/pkgs/development/libraries/neon/0.29.nix @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { version = "0.29.6"; - name = "neon-${version}"; + pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; + url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; }; diff --git a/nixpkgs/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix index 61a40753a56f..ffefc8e51c4d 100644 --- a/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { version = "0.30.2"; - name = "neon-${version}"; + pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; + url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv"; }; diff --git a/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix index a57884912bae..665145a92ac4 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, netcdf, hdf5, curl }: stdenv.mkDerivation rec { - name = "netcdf-cxx4-${version}"; + pname = "netcdf-cxx4"; version = "4.3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix index bb621a3eda6c..c9c52636a5b7 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { - name = "netcdf-fortran-${version}"; + pname = "netcdf-fortran"; version = "4.4.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix index cc5a115ed71e..442fcf2e7615 100644 --- a/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: let version = "6.0.0"; in stdenv.mkDerivation { - name = "nix-plugins-${version}"; + pname = "nix-plugins"; + inherit version; src = fetchFromGitHub { owner = "shlevy"; diff --git a/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix b/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix index 3c5ae8537a41..4609fd1a3769 100644 --- a/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix +++ b/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix @@ -2,7 +2,7 @@ , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { - name = "notify-sharp-${version}"; + pname = "notify-sharp"; version = "3.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix b/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix index 43732406064e..2cbf88633e7b 100644 --- a/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/npapi-sdk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npapi-sdk-${version}"; + pname = "npapi-sdk"; version = "0.27.2"; src = fetchurl { - url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${pname}-${version}.tar.bz2"; sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1"; }; diff --git a/nixpkgs/pkgs/development/libraries/nspr/default.nix b/nixpkgs/pkgs/development/libraries/nspr/default.nix index 4772f1111aca..b62fa1cb704f 100644 --- a/nixpkgs/pkgs/development/libraries/nspr/default.nix +++ b/nixpkgs/pkgs/development/libraries/nspr/default.nix @@ -5,7 +5,8 @@ let version = "4.21"; in stdenv.mkDerivation { - name = "nspr-${version}"; + pname = "nspr"; + inherit version; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix index b410686865f2..b7b4ea45d8b0 100644 --- a/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { - name = "nss-${version}"; + pname = "nss"; inherit version; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; }; diff --git a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix index dac65e1c2f9a..5ea43097b8ca 100644 --- a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ntbtls-${version}"; + pname = "ntbtls"; version = "0.1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ntl/default.nix b/nixpkgs/pkgs/development/libraries/ntl/default.nix index 12d3c9ad9420..e83fe2e7e7b6 100644 --- a/nixpkgs/pkgs/development/libraries/ntl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntl/default.nix @@ -13,7 +13,7 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { - name = "ntl-${version}"; + pname = "ntl"; version = "11.3.2"; src = fetchurl { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { perl # needed for ./configure ]; - sourceRoot = "${name}/src"; + sourceRoot = "${pname}-${version}/src"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/ntrack/default.nix b/nixpkgs/pkgs/development/libraries/ntrack/default.nix index c0a73fa984e7..b79f940affa3 100644 --- a/nixpkgs/pkgs/development/libraries/ntrack/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntrack/default.nix @@ -5,10 +5,11 @@ let in stdenv.mkDerivation rec { - name = "ntrack-${version}"; + pname = "ntrack"; + inherit version; src = fetchurl { - url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w"; }; diff --git a/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix index 91318c802d8f..db542ec93a92 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }: stdenv.mkDerivation rec { - name = "nuspell-${version}"; + pname = "nuspell"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix index 77167361ff20..73b5e3fe772e 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "nvidia-texture-tools-${version}"; + pname = "nvidia-texture-tools"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix index abdc7502052b..6cab843a22b1 100644 --- a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix +++ b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { - name = "ocl-icd-${version}"; + pname = "ocl-icd"; version = "2.2.10"; src = fetchurl { - url = "https://forge.imag.fr/frs/download.php/810/${name}.tar.gz"; + url = "https://forge.imag.fr/frs/download.php/810/${pname}-${version}.tar.gz"; sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; diff --git a/nixpkgs/pkgs/development/libraries/ode/default.nix b/nixpkgs/pkgs/development/libraries/ode/default.nix index aa1886508609..a540d89ed3b7 100644 --- a/nixpkgs/pkgs/development/libraries/ode/default.nix +++ b/nixpkgs/pkgs/development/libraries/ode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ode-${version}"; + pname = "ode"; version = "0.12"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix index 42babc32ecdb..2855d1139c3d 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/1.9.x.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { pname = "ogre"; version = "1.9.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "OGRECave"; diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index f1b6060e1663..dc3bf8cf0097 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -10,7 +10,7 @@ , withSamples ? false }: stdenv.mkDerivation rec { - name = "ogre-${version}"; + pname = "ogre"; version = "1.12.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix b/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix index e4045bcd5dc4..0844c44c8a8b 100644 --- a/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogrepaged/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }: stdenv.mkDerivation rec { - name = "ogre-paged-${version}"; + pname = "ogre-paged"; version = "1.2.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ois/default.nix b/nixpkgs/pkgs/development/libraries/ois/default.nix index 253d185fa0cd..15e83cf9d769 100644 --- a/nixpkgs/pkgs/development/libraries/ois/default.nix +++ b/nixpkgs/pkgs/development/libraries/ois/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "ois-${version}"; + pname = "ois"; version = "${majorVersion}.${minorVersion}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index 49daff30e7b5..dd3f83a0130d 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "olm-${version}"; + pname = "olm"; version = "3.0.0"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; + url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz"; sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c"; }; diff --git a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix index e64d21c87ed0..8a1e1d37c1d5 100644 --- a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix +++ b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "onig-${version}"; + pname = "onig"; version = "6.9.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/opae/default.nix b/nixpkgs/pkgs/development/libraries/opae/default.nix index b60a53e55ca1..32b131159572 100644 --- a/nixpkgs/pkgs/development/libraries/opae/default.nix +++ b/nixpkgs/pkgs/development/libraries/opae/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "opae-${version}"; + pname = "opae"; version = "1.0.0"; # the tag has a silly name for some reason. drop this in the future if diff --git a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix index 3c082926e06c..89ac85b752b7 100644 --- a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix +++ b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix @@ -11,12 +11,12 @@ assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "1.19.1"; - name = "openal-soft-${version}"; + pname = "openal-soft"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi"; }; diff --git a/nixpkgs/pkgs/development/libraries/openbabel/default.nix b/nixpkgs/pkgs/development/libraries/openbabel/default.nix index 81754ffad4d2..26bcf3d20ff6 100644 --- a/nixpkgs/pkgs/development/libraries/openbabel/default.nix +++ b/nixpkgs/pkgs/development/libraries/openbabel/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: stdenv.mkDerivation rec { - name = "openbabel-${version}"; + pname = "openbabel"; version = "2.4.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/openbr/default.nix b/nixpkgs/pkgs/development/libraries/openbr/default.nix index 4d3e9e9a04eb..5aeb07de9235 100644 --- a/nixpkgs/pkgs/development/libraries/openbr/default.nix +++ b/nixpkgs/pkgs/development/libraries/openbr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.5"; - name = "openbr-${version}"; + pname = "openbr"; src = fetchFromGitHub { owner = "biometrics"; diff --git a/nixpkgs/pkgs/development/libraries/openbsm/default.nix b/nixpkgs/pkgs/development/libraries/openbsm/default.nix index 2b2fc3ff4d5c..292b824709b2 100644 --- a/nixpkgs/pkgs/development/libraries/openbsm/default.nix +++ b/nixpkgs/pkgs/development/libraries/openbsm/default.nix @@ -2,13 +2,12 @@ stdenv.mkDerivation rec { pname = "openbsm"; - name = "${pname}-${version}"; version = "1.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}"; + rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}")}"; sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; diff --git a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix index 613aeddd77be..5ed2dd5e23d2 100644 --- a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, opencl-headers }: stdenv.mkDerivation rec { - name = "opencl-clhpp-${version}"; + pname = "opencl-clhpp"; version = "2.0.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/opencollada/default.nix b/nixpkgs/pkgs/development/libraries/opencollada/default.nix index cd3da4a7960f..9bd25bfb93a8 100644 --- a/nixpkgs/pkgs/development/libraries/opencollada/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencollada/default.nix @@ -2,7 +2,7 @@ , darwin}: stdenv.mkDerivation rec { - name = "opencollada-${version}"; + pname = "opencollada"; version = "1.6.68"; diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 3081c6c839c8..cbd05848173a 100644 --- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "opencolorio-${version}"; + pname = "opencolorio"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix b/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix index 9a8787ad7f49..e2d34ae5f07b 100644 --- a/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix @@ -4,7 +4,8 @@ let version = "0.1.5"; in stdenv.mkDerivation { - name = "opencore-amr-${version}"; + pname = "opencore-amr"; + inherit version; src = fetchurl { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; diff --git a/nixpkgs/pkgs/development/libraries/opencsg/default.nix b/nixpkgs/pkgs/development/libraries/opencsg/default.nix index 11c66f0d497b..1fdddf930cfd 100644 --- a/nixpkgs/pkgs/development/libraries/opencsg/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencsg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.4.2"; - name = "opencsg-${version}"; + pname = "opencsg"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; diff --git a/nixpkgs/pkgs/development/libraries/openct/default.nix b/nixpkgs/pkgs/development/libraries/openct/default.nix index 5ad7eecace1b..5f1c2b5c6f60 100644 --- a/nixpkgs/pkgs/development/libraries/openct/default.nix +++ b/nixpkgs/pkgs/development/libraries/openct/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "openct-${version}"; + pname = "openct"; version = "0.6.20"; src = fetchFromGitHub { owner = "OpenSC"; repo = "openct"; - rev = name; + rev = "${pname}-${version}"; sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2"; }; diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index d5dc716c4a8f..d3efb022a0e0 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false @@ -140,7 +141,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 3fdc392e92b8..205a87d78e8f 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -14,7 +14,8 @@ , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? config.cudaSupport or false, cudatoolkit +, enableCuda ? (config.cudaSupport or false) && + stdenv.hostPlatform.isx86_64, cudatoolkit , enableUnfree ? false , enableIpp ? false @@ -153,7 +154,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; inherit version src; postUnpack = lib.optionalString buildContrib '' diff --git a/nixpkgs/pkgs/development/libraries/opencv/default.nix b/nixpkgs/pkgs/development/libraries/opencv/default.nix index 784071c6e4d4..b91a1489eb69 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation rec { - name = "opencv-${version}"; + pname = "opencv"; version = "2.4.13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix index 17e2c9098a10..775695901425 100644 --- a/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "opendht-${version}"; + pname = "opendht"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/opendkim/default.nix b/nixpkgs/pkgs/development/libraries/opendkim/default.nix index 71885ba46f10..66496af12f93 100644 --- a/nixpkgs/pkgs/development/libraries/opendkim/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendkim/default.nix @@ -2,11 +2,11 @@ , autoreconfHook, perl, makeWrapper }: stdenv.mkDerivation rec { - name = "opendkim-${version}"; + pname = "opendkim"; version = "2.10.3"; src = fetchurl { - url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; + url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz"; sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; }; diff --git a/nixpkgs/pkgs/development/libraries/openexr/default.nix b/nixpkgs/pkgs/development/libraries/openexr/default.nix index 072848d7bbca..9eef138c532e 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { - name = "openexr-${version}"; + pname = "openexr"; version = lib.getVersion ilmbase; src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; }; diff --git a/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix index 099bd8d1e973..5d26063adb61 100644 --- a/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openexrid-unstable-${version}"; + pname = "openexrid-unstable"; version = "2017-09-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/openfst/default.nix b/nixpkgs/pkgs/development/libraries/openfst/default.nix index cd3210dd08b1..6554d025311b 100644 --- a/nixpkgs/pkgs/development/libraries/openfst/default.nix +++ b/nixpkgs/pkgs/development/libraries/openfst/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "openfst"; version = "1.7.2"; src = fetchurl { - url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1"; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/openfx/default.nix b/nixpkgs/pkgs/development/libraries/openfx/default.nix index 42edb1958ce0..abc60f026e57 100644 --- a/nixpkgs/pkgs/development/libraries/openfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/openfx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openfx-${version}"; + pname = "openfx"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/openh264/default.nix b/nixpkgs/pkgs/development/libraries/openh264/default.nix index c8208ce27bae..cd91a1325978 100644 --- a/nixpkgs/pkgs/development/libraries/openh264/default.nix +++ b/nixpkgs/pkgs/development/libraries/openh264/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { - name = "openh264-${version}"; + pname = "openh264"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix index e26f4160921f..55d003d2d92b 100644 --- a/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/openjpeg/generic.nix @@ -24,7 +24,8 @@ let in stdenv.mkDerivation rec { - name = "openjpeg-${version}"; + pname = "openjpeg"; + inherit version; src = fetchFromGitHub { owner = "uclouvain"; diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 760fc3e32329..06e4726054e9 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -12,10 +12,11 @@ let version = "4.0.1"; in stdenv.mkDerivation rec { - name = "openmpi-${version}"; + pname = "openmpi"; + inherit version; src = with stdenv.lib.versions; fetchurl { - url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; + url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"; }; diff --git a/nixpkgs/pkgs/development/libraries/openpa/default.nix b/nixpkgs/pkgs/development/libraries/openpa/default.nix index ed646b9e221b..6d53d23ae0e7 100644 --- a/nixpkgs/pkgs/development/libraries/openpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/openpa/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "openpa"; version = "1.0.4"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz"; + url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${pname}-${version}.tar.gz"; sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy"; }; diff --git a/nixpkgs/pkgs/development/libraries/openpam/default.nix b/nixpkgs/pkgs/development/libraries/openpam/default.nix index 339f60649997..b217527269dd 100644 --- a/nixpkgs/pkgs/development/libraries/openpam/default.nix +++ b/nixpkgs/pkgs/development/libraries/openpam/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "openpam-${version}"; + pname = "openpam"; version = "20170430"; src = fetchurl { - url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz"; + url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz"; sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; diff --git a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix index 9488ef484c6f..0edf6dfa7283 100644 --- a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "opensaml-cpp-${version}"; + pname = "opensaml-cpp"; version = "3.0.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix index f07ebad9e810..46028d3a7ea4 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/chacha.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/chacha.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openssl-chacha-${version}"; + pname = "openssl-chacha"; version = "2016-08-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 67b903970d3e..bd4802b8775b 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -8,10 +8,11 @@ with stdenv.lib; let common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { - name = "openssl-${version}"; + pname = "openssl"; + inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${name}.tar.gz"; + url = "https://www.openssl.org/source/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 72e532ae7829..81ef6a3bf5d1 100644 --- a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "opensubdiv-${version}"; + pname = "opensubdiv"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix index 00f4f45df96a..f29972a64bd9 100644 --- a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "opentracing-cpp-${version}"; + pname = "opentracing-cpp"; version = "1.5.1"; src = fetchFromGitHub { owner = "opentracing"; diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix index af88172c57a1..800acebac34c 100644 --- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "openvdb-${version}"; + pname = "openvdb"; version = "6.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/openwsman/default.nix b/nixpkgs/pkgs/development/libraries/openwsman/default.nix index a986b71bc1dd..134ec74d530a 100644 --- a/nixpkgs/pkgs/development/libraries/openwsman/default.nix +++ b/nixpkgs/pkgs/development/libraries/openwsman/default.nix @@ -2,7 +2,7 @@ , curl, libxml2, pam, sblim-sfcc }: stdenv.mkDerivation rec { - name = "openwsman-${version}"; + pname = "openwsman"; version = "2.6.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index d1a20552ff76..8013d6865855 100644 --- a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "1sif2w2vm793j6493364i6pp6s6yqi7fwa6iky5abzmzda51cg5q"; + sha256 = "11lkihykwkq0sbmijqxmn52lg6mcn6gkcpj1c7fhzm0hm1b9p9dn"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/openzwave/default.nix b/nixpkgs/pkgs/development/libraries/openzwave/default.nix index 5a5e8ffaef7c..c3407289f020 100644 --- a/nixpkgs/pkgs/development/libraries/openzwave/default.nix +++ b/nixpkgs/pkgs/development/libraries/openzwave/default.nix @@ -6,7 +6,8 @@ let version = "2018-11-13"; in stdenv.mkDerivation rec { - name = "openzwave-${version}"; + pname = "openzwave"; + inherit version; # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw. # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference. diff --git a/nixpkgs/pkgs/development/libraries/osip/default.nix b/nixpkgs/pkgs/development/libraries/osip/default.nix index ce917ccbe7f4..a243b5c0b516 100644 --- a/nixpkgs/pkgs/development/libraries/osip/default.nix +++ b/nixpkgs/pkgs/development/libraries/osip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0"; }; - name = "libosip2-${version}"; + pname = "libosip2"; meta = { license = stdenv.lib.licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix index a1e7215fd9a2..551c70cebcc2 100644 --- a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix +++ b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,7 +1,7 @@ { cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "osm-gps-map-${version}"; + pname = "osm-gps-map"; version = "1.1.0"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix index 47c6a27639d4..67c4e75c1e12 100644 --- a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix +++ b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "pagmo2-${version}"; + pname = "pagmo2"; version = "2.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/nixpkgs/pkgs/development/libraries/pangolin/default.nix index 6fb123f50949..44293d52da48 100644 --- a/nixpkgs/pkgs/development/libraries/pangolin/default.nix +++ b/nixpkgs/pkgs/development/libraries/pangolin/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "pangolin-${version}"; + pname = "pangolin"; version = "2017-08-02"; diff --git a/nixpkgs/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix index b45ed2966916..d90a27ed5458 100644 --- a/nixpkgs/pkgs/development/libraries/partio/default.nix +++ b/nixpkgs/pkgs/development/libraries/partio/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "partio-${version}"; + pname = "partio"; version = "2018-03-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 2050e5cdfe79..32fc27f9ab4d 100644 --- a/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -4,7 +4,7 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { - name = "pcaudiolib-${version}"; + pname = "pcaudiolib"; version = "2016-07-19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pcg-c/default.nix b/nixpkgs/pkgs/development/libraries/pcg-c/default.nix index 654698c1b32d..58fbb26532e2 100644 --- a/nixpkgs/pkgs/development/libraries/pcg-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcg-c/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.94"; - name = "pcg-c-${version}"; + pname = "pcg-c"; src = fetchzip { - url = "http://www.pcg-random.org/downloads/${name}.zip"; + url = "http://www.pcg-random.org/downloads/${pname}-${version}.zip"; sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv"; }; diff --git a/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/nixpkgs/pkgs/development/libraries/pcre2/default.nix index f080de82ddc2..e27c71314d97 100644 --- a/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcre2-${version}"; + pname = "pcre2"; version = "10.33"; src = fetchurl { - url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2"; sha256 = "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m"; }; diff --git a/nixpkgs/pkgs/development/libraries/phash/default.nix b/nixpkgs/pkgs/development/libraries/phash/default.nix index 4cc607345e8c..473fb3bfd482 100644 --- a/nixpkgs/pkgs/development/libraries/phash/default.nix +++ b/nixpkgs/pkgs/development/libraries/phash/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pHash"; version = "0.9.4"; diff --git a/nixpkgs/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix index 4d68d3718c0a..2dd0cc10c947 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -6,7 +6,7 @@ with lib; let - v = "4.10.2"; + v = "4.10.3"; soname = if withQt5 then "phonon4qt5" else "phonon"; buildsystemdir = "share/cmake/${soname}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; - sha256 = "02c8fyyvg5qb0lxwxmnxc5grkg6p3halakjf02vmwmvqaycb3v9l"; + sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf"; }; buildInputs = diff --git a/nixpkgs/pkgs/development/libraries/physfs/default.nix b/nixpkgs/pkgs/development/libraries/physfs/default.nix index 6edea7f51419..cf9e201b3f6a 100644 --- a/nixpkgs/pkgs/development/libraries/physfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/physfs/default.nix @@ -4,10 +4,11 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "physfs-${version}"; + pname = "physfs"; + inherit version; src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; + url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix index d542c6cf1d77..5302ad21258a 100644 --- a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }: stdenv.mkDerivation rec { - name = "apfel-${version}"; + pname = "apfel"; version = "3.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix index 983523e1f2fb..2ba87024bc51 100644 --- a/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { - name = "apfelgrid-${version}"; + pname = "apfelgrid"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix index 1ad5dcb8b25b..edda5148068a 100644 --- a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }: stdenv.mkDerivation rec { - name = "applgrid-${version}"; + pname = "applgrid"; version = "1.4.70"; src = fetchurl { - url = "https://www.hepforge.org/archive/applgrid/${name}.tgz"; + url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz"; sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; diff --git a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix index f01fab74635b..2a1846e40a64 100644 --- a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2006"; - name = "cernlib-${version}"; + pname = "cernlib"; src = fetchurl { url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index 3828cfda2aff..826362cc586b 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "fastjet-${version}"; + pname = "fastjet"; version = "3.3.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix index e3291907d31f..5ef446319a8a 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { - name = "fastnlo_toolkit-${version}"; + pname = "fastnlo_toolkit"; version = "2.3.1pre-2402"; src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; + url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 5f51c6a194c7..fb108dd7c257 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { version = "10.4.1"; - name = "geant4-${version}"; + pname = "geant4"; src = fetchurl{ url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix index 0b1f3f0490d2..dd39fbbc84b7 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit (geant4_nomt) version src; - name = "g4py-${version}"; + pname = "g4py"; sourceRoot = "geant4.10.04.p01/environments/g4py"; diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix index d61a68ebe341..665cd417dc09 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "hepmc-${version}"; + pname = "hepmc"; version = "2.06.10"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index c4717800f70d..3116c4d36bba 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, coreutils, root }: stdenv.mkDerivation rec { - name = "hepmc3-${version}"; + pname = "hepmc3"; version = "3.1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index 7a146bb7309a..d252e62286b0 100644 --- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "herwig-${version}"; + pname = "herwig"; version = "7.1.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix index 9c379f6a3474..9e68fbd3fc4d 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran, perl }: stdenv.mkDerivation rec { - name = "hoppet-${version}"; + pname = "hoppet"; version = "1.2.0"; src = fetchurl { - url = "https://hoppet.hepforge.org/downloads/${name}.tgz"; + url = "https://hoppet.hepforge.org/downloads/${pname}-${version}.tgz"; sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; }; diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix index 3ad0b3dc4cc1..dff9fb1c1dd1 100644 --- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2, makeWrapper }: stdenv.mkDerivation rec { - name = "lhapdf-${version}"; + pname = "lhapdf"; version = "6.2.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix index b287e52b2431..74b4ba4224e7 100644 --- a/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fastnlo, rivet, pkgconfig }: stdenv.mkDerivation rec { - name = "mcgrid-${version}"; + pname = "mcgrid"; version = "2.0.2"; src = fetchurl { - url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz"; sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; }; diff --git a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix index a608a7f6b0f7..1518c23718aa 100644 --- a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gfortran }: stdenv.mkDerivation rec { - name = "mela-${version}"; + pname = "mela"; version = "2.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix b/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix index 2f79a2b76ab9..20df49d9ae7f 100644 --- a/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nlojet++-${version}"; + pname = "nlojet++"; version = "4.1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index e6b351c206df..0398175a9a28 100644 --- a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: stdenv.mkDerivation rec { - name = "pythia-${version}"; + pname = "pythia"; version = "8.243"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix index 620f227250dd..ad5f994620ff 100644 --- a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { - name = "QCDNUM-${version}"; + pname = "QCDNUM"; version = "17-01-13"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index c068424e416e..914eee5c286b 100644 --- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { - name = "rivet-${version}"; + pname = "rivet"; version = "2.7.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix index 272761977bae..fa293eab3500 100644 --- a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }: stdenv.mkDerivation rec { - name = "thepeg-${version}"; + pname = "thepeg"; version = "2.1.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index 08afe6d64522..c6c6f742d0bf 100644 --- a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { - name = "yoda-${version}"; + pname = "yoda"; version = "1.7.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index d3bbb8679746..1f9996ec2134 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-${version}"; + pname = "pixman"; version = "0.38.4"; src = fetchurl { - url = "mirror://xorg/individual/lib/${name}.tar.bz2"; + url = "mirror://xorg/individual/lib/${pname}-${version}.tar.bz2"; sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; diff --git a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix index 5cf5d34b9aff..ce511544a42d 100644 --- a/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix +++ b/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: stdenv.mkDerivation rec { - name = "pkcs11-helper-${version}"; + pname = "pkcs11-helper"; version = "1.25.1"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; - rev = "${name}"; + rev = "${pname}-${version}"; sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns"; }; diff --git a/nixpkgs/pkgs/development/libraries/pmdk/default.nix b/nixpkgs/pkgs/development/libraries/pmdk/default.nix index ceb49fc01538..e945154c0034 100644 --- a/nixpkgs/pkgs/development/libraries/pmdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/pmdk/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pmdk-${version}"; + pname = "pmdk"; version = "1.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/png++/default.nix b/nixpkgs/pkgs/development/libraries/png++/default.nix index 3f6a609121a1..8509468f59a2 100644 --- a/nixpkgs/pkgs/development/libraries/png++/default.nix +++ b/nixpkgs/pkgs/development/libraries/png++/default.nix @@ -4,7 +4,7 @@ assert docSupport -> doxygen != null; stdenv.mkDerivation rec { - name = "pngpp-${version}"; + pname = "pngpp"; version = "0.2.10"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix index e766657c19a4..c19e343f19ae 100644 --- a/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }: stdenv.mkDerivation rec { - name = "poco-${version}"; + pname = "poco"; version = "1.9.2"; src = fetchurl { - url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; + url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz"; sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd"; }; diff --git a/nixpkgs/pkgs/development/libraries/podofo/default.nix b/nixpkgs/pkgs/development/libraries/podofo/default.nix index 722c1cae8721..809159b8c2f1 100644 --- a/nixpkgs/pkgs/development/libraries/podofo/default.nix +++ b/nixpkgs/pkgs/development/libraries/podofo/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { version = "0.9.6"; - name = "podofo-${version}"; + pname = "podofo"; src = fetchurl { - url = "mirror://sourceforge/podofo/${name}.tar.gz"; + url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; }; diff --git a/nixpkgs/pkgs/development/libraries/portmidi/default.nix b/nixpkgs/pkgs/development/libraries/portmidi/default.nix index f790c62f5af2..ffe7f46b77d8 100644 --- a/nixpkgs/pkgs/development/libraries/portmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/portmidi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }: stdenv.mkDerivation rec { - name = "portmidi-${version}"; + pname = "portmidi"; version = "217"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/ppl/default.nix b/nixpkgs/pkgs/development/libraries/ppl/default.nix index 566d88dcdb56..8f6adaf03d9b 100644 --- a/nixpkgs/pkgs/development/libraries/ppl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ppl/default.nix @@ -3,7 +3,8 @@ let version = "1.2"; in stdenv.mkDerivation rec { - name = "ppl-${version}"; + pname = "ppl"; + inherit version; src = fetchurl { url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index a98521a2d1ee..957b59a6f662 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -7,7 +7,8 @@ let mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix index 1a20d806b968..773e31391758 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/development/libraries/protobufc/generic.nix b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix index e0c5d4db9305..91c0ae5624e8 100644 --- a/nixpkgs/pkgs/development/libraries/protobufc/generic.nix +++ b/nixpkgs/pkgs/development/libraries/protobufc/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-c-${version}"; + pname = "protobuf-c"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/development/libraries/protozero/default.nix b/nixpkgs/pkgs/development/libraries/protozero/default.nix index 25e0f14d026b..0bbfab62fcd8 100644 --- a/nixpkgs/pkgs/development/libraries/protozero/default.nix +++ b/nixpkgs/pkgs/development/libraries/protozero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "protozero-${version}"; + pname = "protozero"; version = "1.6.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/nixpkgs/pkgs/development/libraries/pugixml/default.nix index 74c6e8ef1b30..d18251715961 100644 --- a/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: stdenv.mkDerivation rec { - name = "pugixml-${version}"; + pname = "pugixml"; version = "1.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/nixpkgs/pkgs/development/libraries/pupnp/default.nix index b5a01698e5e9..66a395801b27 100644 --- a/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, stdenv, autoreconfHook }: stdenv.mkDerivation rec { - name = "libupnp-${version}"; + pname = "libupnp"; version = "1.8.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pybind11/default.nix b/nixpkgs/pkgs/development/libraries/pybind11/default.nix index aa1f8d10ba97..7dfbdc4d64a0 100644 --- a/nixpkgs/pkgs/development/libraries/pybind11/default.nix +++ b/nixpkgs/pkgs/development/libraries/pybind11/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }: stdenv.mkDerivation rec { - name = "pybind-${version}"; + pname = "pybind"; version = "2.2.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/nixpkgs/pkgs/development/libraries/python-qt/default.nix index 4b5b7ace074b..2b630de14b26 100644 --- a/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2"; - name = "python-qt-${version}"; + pname = "python-qt"; src = fetchurl { url="mirror://sourceforge/pythonqt/PythonQt${version}.zip"; diff --git a/nixpkgs/pkgs/development/libraries/qca2/default.nix b/nixpkgs/pkgs/development/libraries/qca2/default.nix index 885b7b378cc3..19b11a60e7b6 100644 --- a/nixpkgs/pkgs/development/libraries/qca2/default.nix +++ b/nixpkgs/pkgs/development/libraries/qca2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl_1_0_2, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { - name = "qca-${version}"; + pname = "qca"; version = "2.1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/qjson/default.nix b/nixpkgs/pkgs/development/libraries/qjson/default.nix index a7077c69dd8d..2156c0e5350a 100644 --- a/nixpkgs/pkgs/development/libraries/qjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/qjson/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "qjson-${version}"; + pname = "qjson"; src = fetchFromGitHub { owner = "flavio"; diff --git a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index ba62324d586e..d3f4a8e88e2e 100644 --- a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2018-11-24"; - name = "qmltermwidget-unstable-${version}"; + pname = "qmltermwidget-unstable"; src = fetchFromGitHub { repo = "qmltermwidget"; diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 5bccbf74965a..789a63bef74d 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -3,10 +3,11 @@ let version = "8.4.2"; in stdenv.mkDerivation rec { - name = "qpdf-${version}"; + pname = "qpdf"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9"; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index 1bc63d0e2b9d..7b4addd91617 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -59,7 +59,6 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch - ./qtwebengine-CVE-2019-5786.patch ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh index aa3a0fe94898..a4d2fc82ff2d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ ) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch index aa987acbe92e..87ed0ddc4d4c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -1,8 +1,7 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf 2019-07-10 09:35:08.917628566 -0500 +@@ -24,7 +24,7 @@ QMAKE_FIX_RPATH = install_name_tool -id @@ -11,11 +10,10 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ed708e085..05e60ff45f 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -21,7 +21,7 @@ # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644 contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -51,45 +51,20 @@ split_incpath { +@@ -51,45 +51,20 @@ $$cmake_extra_source_includes.output } @@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { +@@ -318,7 +293,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..4c7c8da21a 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-10 09:35:08.917628566 -0500 +@@ -3,30 +3,6 @@ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -134,7 +131,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() +@@ -52,11 +28,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -146,7 +143,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -69,11 +41,7 @@ ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -158,7 +155,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -89,24 +57,13 @@ !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -187,7 +184,7 @@ index 3ed6dd5889..4c7c8da21a 100644 ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -122,7 +79,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -195,7 +192,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -272,25 +228,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -221,7 +218,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -309,25 +253,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -247,7 +244,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -346,11 +278,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -259,19 +256,17 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 99f68b78f5..dde69cb7c2 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -63,199 +63,3 @@ qt { - } +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -64,202 +64,6 @@ } } -- + -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { -- QMAKE_RPATHDIR += @executable_path/Frameworks +- QMAKE_RPATHDIR += @executable_path/../Frameworks - equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks -} - @@ -463,10 +458,13 @@ index 99f68b78f5..dde69cb7c2 100644 - xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) + generate_xcode_project.target = xcodeproj +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf 2019-07-10 09:35:08.917628566 -0500 @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -528,11 +526,10 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 8360dd8b38..8b13789179 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -1,54 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -568,10 +565,6 @@ index 8360dd8b38..8b13789179 100644 -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) - --sysrootified = --for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val --QMAKE_INCDIR_OPENGL = $$sysrootified -- -QMAKESPEC_NAME = $$basename(QMAKESPEC) - -# Resolve SDK version of various tools @@ -591,37 +584,34 @@ index 8360dd8b38..8b13789179 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 65212b2abf..accd4c07f0 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_ - # Tools need qmldir and plugins.qmltypes always installed on the file system - qmldir.files = $$qmldir_file $$fq_aux_qml_files +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -54,7 +54,7 @@ + + qmldir.files = $$qmldir_file install_qml_files: qmldir.files += $$fq_qml_files --qmldir.path = $$instbase/$$TARGETPATH +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += qmldir - !debug_and_release|!build_all|CONFIG(release, debug|release) { -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index cd6377dcc6..e98bf98151 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -56,7 +56,7 @@ qml1_target { - instbase = $$[QT_INSTALL_QML] - } + qmlfiles.base = $$_PRO_FILE_PWD_ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -50,7 +50,7 @@ + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH --target.path = $$instbase/$$TARGETPATH +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += target # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -30,7 +30,7 @@ target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -630,11 +620,10 @@ index 8354f30eea..62028fef8e 100644 CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 3bb3823a8e..655b7b7db8 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -24,6 +24,6 @@ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -643,11 +632,10 @@ index 3bb3823a8e..655b7b7db8 100644 + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 4ad9946ae0..6d66f29c26 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -34,8 +34,8 @@ qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -658,11 +646,10 @@ index 4ad9946ae0..6d66f29c26 100644 } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3139c443c6..1b4f2fddd8 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -45,7 +45,7 @@ QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -671,7 +658,7 @@ index 3139c443c6..1b4f2fddd8 100644 PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = +@@ -64,8 +64,8 @@ DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -682,7 +669,7 @@ index 3139c443c6..1b4f2fddd8 100644 } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { +@@ -88,12 +88,12 @@ qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -697,11 +684,10 @@ index 3139c443c6..1b4f2fddd8 100644 inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -710,11 +696,10 @@ index 43b58817fe..e635b8f67a 100644 INSTALLS += sources check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -69,7 +69,7 @@ defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -723,10 +708,9 @@ index 1903e509c8..ae7b585989 100644 exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 8f98987b99..21b3bb8b32 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf 2019-07-10 09:35:08.918628595 -0500 @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -746,7 +730,7 @@ index 8f98987b99..21b3bb8b32 100644 !static: target.CONFIG = no_dll INSTALLS += target } -@@ -29,33 +23,33 @@ +@@ -29,35 +23,35 @@ #headers qt_install_headers { gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES @@ -762,6 +746,8 @@ index 8f98987b99..21b3bb8b32 100644 private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + generated_privates: \ + private_headers.CONFIG += no_check_exist INSTALLS += private_headers qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES @@ -786,11 +772,10 @@ index 8f98987b99..21b3bb8b32 100644 privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 40528a65e2..903f795284 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ } } @@ -799,11 +784,63 @@ index 40528a65e2..903f795284 100644 INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e0652fdcf9..450b2a2d28 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -2668,6 +2668,15 @@ + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h 2019-07-10 09:35:08.920628655 -0500 +@@ -212,7 +212,7 @@ + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include <os/activity.h> +@@ -290,7 +290,19 @@ + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-07-10 09:35:08.918628595 -0500 +@@ -3,7 +3,7 @@ add_executable(Qt5::qmake IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -812,7 +849,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) +@@ -18,7 +18,7 @@ add_executable(Qt5::moc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -821,7 +858,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) +@@ -35,7 +35,7 @@ add_executable(Qt5::rcc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -830,7 +867,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -116,7 +116,7 @@ !!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -839,7 +876,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -130,7 +130,7 @@ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -848,10 +885,9 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-07-10 09:35:08.918628595 -0500 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) @@ -860,10 +896,9 @@ index c357237d0e..6f0c75de3c 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-07-10 09:35:08.918628595 -0500 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) @@ -872,31 +907,10 @@ index 706304cf34..546420f6ad 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 463e30e1c3..0e1ab669e4 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths() - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index bed62a02bd..73158993f7 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -909,7 +923,7 @@ index bed62a02bd..73158993f7 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -644,12 +648,16 @@ if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -931,10 +945,9 @@ index bed62a02bd..73158993f7 100644 } } -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -948,7 +961,7 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() +@@ -17,11 +13,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -961,10 +974,9 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -974,7 +986,7 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO +@@ -17,13 +17,13 @@ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -990,11 +1002,10 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -265,12 +265,9 @@ m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1008,11 +1019,10 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 57629ac03a..8a7f219a98 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -317,10 +317,10 @@ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1025,10 +1035,10 @@ index 57629ac03a..8a7f219a98 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp +Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp 2019-07-10 09:35:08.919628625 -0500 @@ -39,6 +39,7 @@ #include <qpa/qplatformthemeplugin.h> @@ -1037,7 +1047,7 @@ index fb1c425d8e..bb8bab9795 100644 QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ public: +@@ -54,8 +55,22 @@ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1061,10 +1071,21 @@ index fb1c425d8e..bb8bab9795 100644 return 0; } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp 2019-07-10 09:35:08.920628655 -0500 +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h 2019-07-10 09:35:08.919628625 -0500 @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1081,11 +1102,10 @@ index 6498ea84ef..d821ced7fc 100644 QT_END_NAMESPACE -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) +diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 +@@ -3,7 +3,7 @@ add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -1094,63 +1114,33 @@ index 99d87e2e46..a4eab2aa72 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ENDIF -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index b14a494296..779c4eda95 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -211,7 +211,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include <os/activity.h> -@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index 2c1005ad80..244147ea7d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index 1268730cc6..a50e9b0764 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - #endif - } - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Logger that also feeds messages to AUL. It needs to wrap the existing - // logger, as it needs to be able to short circuit the existing logger - // in case AUL prints to stderr. +diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +index c40f58c987..e69de29bb2 100644 +--- a/mkspecs/features/mac/sdk.mk ++++ b/mkspecs/features/mac/sdk.mk +@@ -1,25 +0,0 @@ +- +-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) +- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) +- # We don't want to complain about out of date SDK unless the target needs to be remade. +- # This covers use-cases such as running 'make check' after moving the build to a +- # computer without Xcode or with a different Xcode version. +- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) +- ifeq ($(TARGET_UP_TO_DATE),0) +- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) +- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) +- else ifneq ($(CURRENT_MAC_SDK_VERSION),) +- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- else +- $(info Unknown error resolving current platform SDK version.) +- endif +- $(info This requires a fresh build. Please wipe the build directory completely,) +- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(error ^) +- endif +- endif +-endif diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch deleted file mode 100644 index ec9a432ea708..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -@@ -135,14 +135,16 @@ - if (!raw_data_ || error_code_) - return nullptr; - -- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -- if (finished_loading_) { -- array_buffer_result_ = result; -- AdjustReportedMemoryUsageToV8( -- -1 * static_cast<int64_t>(raw_data_->ByteLength())); -- raw_data_.reset(); -+ if (!finished_loading_) { -+ return DOMArrayBuffer::Create( -+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength())); - } -- return result; -+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -+ AdjustReportedMemoryUsageToV8(-1 * -+ static_cast<int64_t>(raw_data_->ByteLength())); -+ -+ raw_data_.reset(); -+ return array_buffer_result_; - } - - String FileReaderLoader::StringResult() { diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix index d83edc97e94f..ce567c3a2bcd 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1"; - name = "qt3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d"; + name = "qt3d-everywhere-src-5.12.3.tar.xz"; }; }; qtactiveqt = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52"; - name = "qtactiveqt-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz"; + sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f"; + name = "qtactiveqt-everywhere-src-5.12.3.tar.xz"; }; }; qtandroidextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm"; - name = "qtandroidextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f"; + name = "qtandroidextras-everywhere-src-5.12.3.tar.xz"; }; }; qtbase = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz"; - sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy"; - name = "qtbase-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz"; + sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701"; + name = "qtbase-everywhere-src-5.12.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj"; - name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea"; + name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz"; }; }; qtcharts = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz"; - sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww"; - name = "qtcharts-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz"; + sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9"; + name = "qtcharts-everywhere-src-5.12.3.tar.xz"; }; }; qtconnectivity = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz"; - sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f"; - name = "qtconnectivity-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz"; + sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661"; + name = "qtconnectivity-everywhere-src-5.12.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf"; - name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313"; + name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz"; }; }; qtdeclarative = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz"; - sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag"; - name = "qtdeclarative-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz"; + sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7"; + name = "qtdeclarative-everywhere-src-5.12.3.tar.xz"; }; }; qtdoc = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz"; - sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h"; - name = "qtdoc-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz"; + sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f"; + name = "qtdoc-everywhere-src-5.12.3.tar.xz"; }; }; qtgamepad = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz"; - sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac"; - name = "qtgamepad-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz"; + sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642"; + name = "qtgamepad-everywhere-src-5.12.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1"; - name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; + sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73"; + name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; }; }; qtimageformats = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z"; - name = "qtimageformats-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz"; + sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2"; + name = "qtimageformats-everywhere-src-5.12.3.tar.xz"; }; }; qtlocation = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz"; - sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh"; - name = "qtlocation-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz"; + sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6"; + name = "qtlocation-everywhere-src-5.12.3.tar.xz"; }; }; qtmacextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr"; - name = "qtmacextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed"; + name = "qtmacextras-everywhere-src-5.12.3.tar.xz"; }; }; qtmultimedia = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw"; - name = "qtmultimedia-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz"; + sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301"; + name = "qtmultimedia-everywhere-src-5.12.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz"; - sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1"; - name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz"; + sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332"; + name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz"; }; }; qtpurchasing = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr"; - name = "qtpurchasing-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz"; + sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e"; + name = "qtpurchasing-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz"; - sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb"; - name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz"; + sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46"; + name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; - sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9"; - name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; + sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a"; + name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09"; - name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz"; + sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42"; + name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz"; }; }; qtscript = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp"; - name = "qtscript-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz"; + sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e"; + name = "qtscript-everywhere-src-5.12.3.tar.xz"; }; }; qtscxml = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz"; - sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw"; - name = "qtscxml-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz"; + sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19"; + name = "qtscxml-everywhere-src-5.12.3.tar.xz"; }; }; qtsensors = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz"; - sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5"; - name = "qtsensors-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz"; + sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc"; + name = "qtsensors-everywhere-src-5.12.3.tar.xz"; }; }; qtserialbus = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz"; - sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb"; - name = "qtserialbus-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz"; + sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d"; + name = "qtserialbus-everywhere-src-5.12.3.tar.xz"; }; }; qtserialport = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz"; - sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r"; - name = "qtserialport-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz"; + sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51"; + name = "qtserialport-everywhere-src-5.12.3.tar.xz"; }; }; qtspeech = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz"; - sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r"; - name = "qtspeech-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz"; + sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5"; + name = "qtspeech-everywhere-src-5.12.3.tar.xz"; }; }; qtsvg = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz"; - sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb"; - name = "qtsvg-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz"; + sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2"; + name = "qtsvg-everywhere-src-5.12.3.tar.xz"; }; }; qttools = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz"; - sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p"; - name = "qttools-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz"; + sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8"; + name = "qttools-everywhere-src-5.12.3.tar.xz"; }; }; qttranslations = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz"; - sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv"; - name = "qttranslations-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz"; + sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca"; + name = "qttranslations-everywhere-src-5.12.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv"; - name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; + sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22"; + name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; }; }; qtwayland = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz"; - sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m"; - name = "qtwayland-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz"; + sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff"; + name = "qtwayland-everywhere-src-5.12.3.tar.xz"; }; }; qtwebchannel = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz"; - sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5"; - name = "qtwebchannel-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz"; + sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a"; + name = "qtwebchannel-everywhere-src-5.12.3.tar.xz"; }; }; qtwebengine = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz"; - sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x"; - name = "qtwebengine-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz"; + sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317"; + name = "qtwebengine-everywhere-src-5.12.3.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5"; - name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz"; + sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3"; + name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz"; }; }; qtwebsockets = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4"; - name = "qtwebsockets-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz"; + sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577"; + name = "qtwebsockets-everywhere-src-5.12.3.tar.xz"; }; }; qtwebview = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz"; - sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p"; - name = "qtwebview-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz"; + sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5"; + name = "qtwebview-everywhere-src-5.12.3.tar.xz"; }; }; qtwinextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6"; - name = "qtwinextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b"; + name = "qtwinextras-everywhere-src-5.12.3.tar.xz"; }; }; qtx11extras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz"; - sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06"; - name = "qtx11extras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz"; + sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613"; + name = "qtx11extras-everywhere-src-5.12.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; - sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk"; - name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; + sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61"; + name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 2c300d1c2f16..8250e42a1b6c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -234,6 +234,8 @@ stdenv.mkDerivation { "-widgets" "-opengl desktop" "-icu" + "-L" "${icu.out}/lib" + "-I" "${icu.dev}/include" "-pch" ] ++ lib.optionals (compareVersion "5.11.0" < 0) @@ -270,10 +272,18 @@ stdenv.mkDerivation { ++ [ "-system-zlib" + "-L" "${zlib.out}/lib" + "-I" "${zlib.dev}/include" "-system-libjpeg" + "-L" "${libjpeg.out}/lib" + "-I" "${libjpeg.dev}/include" "-system-harfbuzz" + "-L" "${harfbuzz.out}/lib" + "-I" "${harfbuzz.dev}/include" "-system-pcre" "-openssl-linked" + "-L" "${openssl.out}/lib" + "-I" "${openssl.dev}/include" "-system-sqlite" ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' @@ -302,10 +312,14 @@ stdenv.mkDerivation { "-system-xcb" "-xcb" "-qpa xcb" + "-L" "${libX11.out}/lib" + "-I" "${libX11.out}/include" + "-L" "${libXext.out}/lib" + "-I" "${libXext.out}/include" + "-L" "${libXrender.out}/lib" + "-I" "${libXrender.out}/include" - "-system-xkbcommon" "-libinput" - "-xkbcommon-evdev" "-no-eglfs" "-no-gbm" @@ -326,6 +340,19 @@ stdenv.mkDerivation { "-no-feature-renameat2" "-no-feature-getentropy" ] + ++ lib.optionals (compareVersion "5.12.1" < 0) [ + # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 + "-system-xkbcommon" + "-xkbcommon-evdev" + ] + ++ lib.optionals (cups != null) [ + "-L" "${cups.lib}/lib" + "-I" "${cups.dev}/include" + ] + ++ lib.optionals (mysql != null) [ + "-L" "${mysql.out}/lib" + "-I" "${mysql.out}/include" + ] ); enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix b/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix index ae99035d2267..b7857372d1cd 100644 --- a/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.2.0"; - name = "qt-mobility-${version}"; + pname = "qt-mobility"; src = fetchFromGitHub { owner = "qtproject"; repo = "qt-mobility"; diff --git a/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix index 1578593b8aea..3c4c192bd4b9 100644 --- a/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }: stdenv.mkDerivation rec { - name = "qtinstaller-${version}"; + pname = "qtinstaller"; propagatedBuildInputs = [ qtdeclarative qttools ]; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/development/libraries/quesoglc/default.nix b/nixpkgs/pkgs/development/libraries/quesoglc/default.nix index 84be9876c1cb..2e47a2135657 100644 --- a/nixpkgs/pkgs/development/libraries/quesoglc/default.nix +++ b/nixpkgs/pkgs/development/libraries/quesoglc/default.nix @@ -2,9 +2,8 @@ stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; }; buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ]; diff --git a/nixpkgs/pkgs/development/libraries/quickder/default.nix b/nixpkgs/pkgs/development/libraries/quickder/default.nix index 35d16ee5e19b..14bfd40a5932 100644 --- a/nixpkgs/pkgs/development/libraries/quickder/default.nix +++ b/nixpkgs/pkgs/development/libraries/quickder/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "quickder"; - name = "${pname}-${version}"; version = "1.2-6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/qxt/default.nix b/nixpkgs/pkgs/development/libraries/qxt/default.nix index 5ed05ec6b322..79d4d6524241 100644 --- a/nixpkgs/pkgs/development/libraries/qxt/default.nix +++ b/nixpkgs/pkgs/development/libraries/qxt/default.nix @@ -1,7 +1,7 @@ { stdenv, which, coreutils, fetchzip, qt4 }: stdenv.mkDerivation rec { - name = "qxt-${version}"; + pname = "qxt"; version = "0.6.2"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix index 286c5c868dff..fe48d99b383c 100644 --- a/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { - name = "rabbitmq-c-${version}"; + pname = "rabbitmq-c"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/nixpkgs/pkgs/development/libraries/range-v3/default.nix index 256b756ed45d..e02b22af7565 100644 --- a/nixpkgs/pkgs/development/libraries/range-v3/default.nix +++ b/nixpkgs/pkgs/development/libraries/range-v3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "range-v3-${version}"; + pname = "range-v3"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix index 9d8ce8cef202..92c42d19af62 100644 --- a/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec{ - name = "rapidcheck-${version}"; + pname = "rapidcheck"; version = "unstable-2018-09-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix index a1671aa3e0f9..ea91c1507dc3 100644 --- a/nixpkgs/pkgs/development/libraries/rapidjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidjson/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake }: stdenv.mkDerivation rec { - name = "rapidjson-${version}"; + pname = "rapidjson"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/rapidxml/default.nix b/nixpkgs/pkgs/development/libraries/rapidxml/default.nix index 99f880916907..ca072f2ca4b0 100644 --- a/nixpkgs/pkgs/development/libraries/rapidxml/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidxml/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "rapidxml"; version = "1.13"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.zip"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.zip"; sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63"; }; diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 9f4fe54e8056..165e9716a977 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: stdenv.mkDerivation rec { - name = "rdkafka-${version}"; + pname = "rdkafka"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index a6a5fbed4fc5..e36b6f9488a5 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "re2-${version}"; + pname = "re2"; version = "20190401"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/readline/7.0.nix b/nixpkgs/pkgs/development/libraries/readline/7.0.nix index e96b4f1ebe27..11d5c3780154 100644 --- a/nixpkgs/pkgs/development/libraries/readline/7.0.nix +++ b/nixpkgs/pkgs/development/libraries/readline/7.0.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "readline-${version}"; + pname = "readline"; version = "7.0p${toString (builtins.length upstreamPatches)}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/readline/8.0.nix b/nixpkgs/pkgs/development/libraries/readline/8.0.nix index eefef9727663..cdc36617c52d 100644 --- a/nixpkgs/pkgs/development/libraries/readline/8.0.nix +++ b/nixpkgs/pkgs/development/libraries/readline/8.0.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "readline-${version}"; + pname = "readline"; version = "8.0p${toString (builtins.length upstreamPatches)}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix index 681fc3a012fe..a43700ce439e 100644 --- a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "rep-gtk-${version}"; + pname = "rep-gtk"; version = "0.90.8.3"; sourceName = "rep-gtk_${version}"; diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch b/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch deleted file mode 100644 index eb532620773e..000000000000 --- a/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 132d3b0..37fec63 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - if(ZLIB_INCLUDE_DIRS) - # CMake 3 diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 05ecf0f8f257..1b6b5b1b57bf 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.1.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0gy2zjga3r8k9pbn2b0b5fzv4m0h2ip3zmyja1i7fli9n56civ3y"; + sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ]; - patches = [ ./0001-findzlib.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " + ''; cmakeFlags = [ "-DPORTABLE=1" diff --git a/nixpkgs/pkgs/development/libraries/rote/default.nix b/nixpkgs/pkgs/development/libraries/rote/default.nix index 195db9a16858..82a2998be1ef 100644 --- a/nixpkgs/pkgs/development/libraries/rote/default.nix +++ b/nixpkgs/pkgs/development/libraries/rote/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "rote-${version}"; + pname = "rote"; version = "0.2.8"; src = fetchurl { sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky"; - url = "mirror://sourceforge/rote/${name}.tar.gz"; + url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz"; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/development/libraries/safefile/default.nix b/nixpkgs/pkgs/development/libraries/safefile/default.nix index daa499061c5b..b69cd56d35d0 100644 --- a/nixpkgs/pkgs/development/libraries/safefile/default.nix +++ b/nixpkgs/pkgs/development/libraries/safefile/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "safefile"; version = "1.0.5"; src = fetchurl { - url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz"; + url = "http://research.cs.wisc.edu/mist/${pname}/releases/${pname}-${version}.tar.gz"; sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; }; diff --git a/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix b/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix index ba0b8f4e996f..9ffa2efc376c 100644 --- a/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, curl }: stdenv.mkDerivation rec { - name = "sblim-sfcc-${version}"; + pname = "sblim-sfcc"; version = "2.2.9"; # this is technically 2.2.9-preview src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix index f727728943bd..75beddcd22ca 100644 --- a/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "5.6.0"; - name = "papi-${version}"; + pname = "papi"; src = fetchurl { url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index 2ee9144b316d..367fc635c8b9 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "htslib"; version = "1.9"; src = fetchurl { - url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0"; }; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix index 22bcc56c82ab..e6c58b96e5c7 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "mirtk-${version}"; + pname = "mirtk"; src = fetchFromGitHub { owner = "BioMedIA"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 4668839ebb9c..d43331464067 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "QuadProgpp-${version}"; + pname = "QuadProgpp"; version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 05373cd1cbda..36576de05631 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -7,7 +7,8 @@ let version = "3.7.0"; in stdenv.mkDerivation { - name = "arpack-${version}"; + pname = "arpack"; + inherit version; src = fetchFromGitHub { owner = "opencollab"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix index 286be260052b..9c412f93d137 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation rec { - name = "blas-${version}"; + pname = "blas"; version = "3.8.0"; src = fetchurl { - url = "http://www.netlib.org/blas/${name}.tgz"; + url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; }; diff --git a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 16850fb1665e..bc276b9923c8 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.2.5"; - name = "brial-${version}"; + pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix index 4746f77a2164..d22858d64d0c 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix @@ -61,7 +61,7 @@ let in stdenv.mkDerivation rec { - name = "caffe2-${version}"; + pname = "caffe2"; version = "0.8.1"; src = fetchFromGitHub { owner = "caffe2"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 537fcb93a87e..52c775c9a0d0 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -5,8 +5,6 @@ in let # SuiteSparse must use the same openblas suitesparse = suitesparse_.override { inherit openblas; }; in stdenv.mkDerivation rec { - - name = "${pname}-${version}"; pname = "cholmod-extra"; version = "1.2.0"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix index 40dbfc53e2cb..8a474e06e556 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "clblas-${version}"; + pname = "clblas"; version = "2.12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix index 2441aff9fa30..5193c2db5c5b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cliquer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.21"; - name = "cliquer-${version}"; + pname = "cliquer"; # autotoolized version of the original cliquer src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix index 645a865eb955..77973a954494 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/ecos/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ecos-${version}"; + pname = "ecos"; version = "2.0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix index 4ae5ea522555..a93ede63a263 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix @@ -30,7 +30,8 @@ let version = "2017.1.0"; dijitso = pythonPackages.buildPythonPackage { - name = "dijitso-${version}"; + pname = "dijitso"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg"; @@ -54,7 +55,8 @@ let }; fiat = pythonPackages.buildPythonPackage { - name = "fiat-${version}"; + pname = "fiat"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l"; @@ -72,7 +74,8 @@ let }; ufl = pythonPackages.buildPythonPackage { - name = "ufl-${version}"; + pname = "ufl"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg"; @@ -90,7 +93,8 @@ let }; ffc = pythonPackages.buildPythonPackage { - name = "ffc-${version}"; + pname = "ffc"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0"; @@ -109,7 +113,8 @@ let }; instant = pythonPackages.buildPythonPackage { - name = "instant-${version}"; + pname = "instant"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz"; sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q"; @@ -125,7 +130,8 @@ let in stdenv.mkDerivation { - name = "dolfin-${version}"; + pname = "dolfin"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix index 2891429c8578..6fd16535459a 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.0"; pname = "flintqs"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sagemath"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index 30453086d457..1995fb9c85de 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - name = "ipopt-${version}"; + pname = "ipopt"; version = "3.12.13"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix index 51fbd9f14cb4..0f23f08145e9 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { version = "1.23"; pname = "lcalc"; - name = "${pname}-${version}"; src = fetchurl { # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available diff --git a/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix index be650f3c3ce8..c8f1138d69ff 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "libbraiding-${version}"; + pname = "libbraiding"; src = fetchFromGitHub { owner = "miguelmarco"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix index e96ee475d7d2..a2c0dd4fa177 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.02r5"; - name = "llibhomfly-${version}"; + pname = "llibhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index 46538d0022e7..2e5bb5e371f5 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -12,7 +12,8 @@ let in stdenv.mkDerivation rec { - name = "liblapack-${version}"; + pname = "liblapack"; + inherit version; src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz"; sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix index 3cf5c3619a9e..b0cfbca5aa33 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "lrs"; version = "7.0"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix index b9ee1e2a10d7..b8c4fa671484 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20140914"; - name = "m4ri-${version}"; + pname = "m4ri"; src = fetchFromBitbucket { owner = "malb"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix index 23fc03655cf3..6a664b1dffff 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20150908"; - name = "m4rie-${version}"; + pname = "m4rie"; src = fetchFromBitbucket { owner = "malb"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix index 8444d88809af..d036e39d01ae 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix @@ -5,7 +5,8 @@ with stdenv.lib; let version = "2.0.2"; in stdenv.mkDerivation { - name = "magma-${version}"; + pname = "magma"; + inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index d967bbf8c3e1..f8d392691ab2 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -86,13 +86,13 @@ let mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); in stdenv.mkDerivation rec { - name = "openblas-${version}"; - version = "0.3.6"; + pname = "openblas"; + version = "0.3.7"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1"; + sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz"; }; inherit blas64; diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 01b0faf89f90..6fc96623a33c 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openlibm-${version}"; + pname = "openlibm"; version = "0.6.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 2dd63ebfc854..c6e065320a26 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -4,7 +4,7 @@ , pythonProtobuf }: stdenv.mkDerivation rec { - name = "or-tools-${version}"; + pname = "or-tools"; version = "v7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix index ca35ce2f4134..3a9ef7704596 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/parmetis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "parmetis-${version}"; + pname = "parmetis"; version = "4.0.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index ac8129c9032f..c2eda9dac48b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -6,7 +6,7 @@ , python }: stdenv.mkDerivation rec { - name = "petsc-${version}"; + pname = "petsc"; version = "3.8.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix index 7394fb9e1b41..e7dfaecf1de0 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "planarity"; version = "3.0.0.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "graph-algorithms"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix index 3eee63dbf4f6..faa219044bd3 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "primesieve-${version}"; + pname = "primesieve"; version = "7.4"; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix index fda54fe44ab1..66c573245db1 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "rankwidth"; version = "0.7"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/rw/rw-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix index 624885c501aa..207406388e0e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "rubiks"; version = "20070912"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index b4c6574d13a6..14277c8c6318 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "scalapack-${version}"; + pname = "scalapack"; version = "2.0.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix index f9d1a84b1f03..51a72585c0cf 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }: stdenv.mkDerivation rec { - name = "scs-${version}"; + pname = "scs"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 7e71eafef697..48de128edc53 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { version = "4.2.1"; - name = "suitesparse-${version}"; + pname = "suitesparse"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix index 9938a3096a02..570c98144856 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "5.2.1"; - name = "superlu-${version}"; + pname = "superlu"; src = fetchurl { url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix index 2e543abd411b..e67f61599b57 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2.023.5"; - name = "sympow-${version}"; + pname = "sympow"; src = fetchFromGitLab { group = "rezozer"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix index ad4d4c017376..4ee6f6cb9927 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { version = "0.9.1"; pname = "zn_poly"; - name = "${pname}-${version}"; # sage has picked up the maintenance (bug fixes and building, not development) # from the original, now unmaintained project which can be found at diff --git a/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix index 5f2263d821d0..640eefbd7336 100644 --- a/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "ispike-${version}"; + pname = "ispike"; version = "2.1.1"; src = fetchurl { - url = "mirror://sourceforge/ispike/${name}.tar.gz"; + url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz"; sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp"; }; diff --git a/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix index ba291dc97ff2..eb8d17c64573 100644 --- a/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix +++ b/nixpkgs/pkgs/development/libraries/scriptaculous/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { - name = "scriptaculous-${version}"; + pname = "scriptaculous"; version = "1.9.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/serd/default.nix b/nixpkgs/pkgs/development/libraries/serd/default.nix index 533fefa9f194..63b6ae94a385 100644 --- a/nixpkgs/pkgs/development/libraries/serd/default.nix +++ b/nixpkgs/pkgs/development/libraries/serd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { - name = "serd-${version}"; + pname = "serd"; version = "0.30.0"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; }; diff --git a/nixpkgs/pkgs/development/libraries/sfml/default.nix b/nixpkgs/pkgs/development/libraries/sfml/default.nix index 1b043d33ad6a..cf73e205830b 100644 --- a/nixpkgs/pkgs/development/libraries/sfml/default.nix +++ b/nixpkgs/pkgs/development/libraries/sfml/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "sfml-${version}"; + pname = "sfml"; + inherit version; src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/sfsexp/default.nix b/nixpkgs/pkgs/development/libraries/sfsexp/default.nix index 1e9a8ba6a58b..261658b0547e 100644 --- a/nixpkgs/pkgs/development/libraries/sfsexp/default.nix +++ b/nixpkgs/pkgs/development/libraries/sfsexp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sfsexp-${version}"; + pname = "sfsexp"; version = "1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix index dd9b01a0a01e..77b9714066dd 100644 --- a/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/nixpkgs/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }: stdenv.mkDerivation rec { - name = "shibboleth-sp-${version}"; + pname = "shibboleth-sp"; version = "3.0.4.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index f795dfef9e4c..14af55c2afc1 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.6"; - name = "graphite2-${version}"; + pname = "graphite2"; src = fetchurl { url = "https://github.com/silnrsi/graphite/releases/download/" diff --git a/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix index 941e75b8ba92..14cefdea77b4 100644 --- a/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/nixpkgs/pkgs/development/libraries/smarty3-i18n/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "smarty-i18n-${version}"; + pname = "smarty-i18n"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/nixpkgs/pkgs/development/libraries/smarty3/default.nix index 66bfd601a62d..4876c39ce83c 100644 --- a/nixpkgs/pkgs/development/libraries/smarty3/default.nix +++ b/nixpkgs/pkgs/development/libraries/smarty3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { - name = "smarty3-${version}"; + pname = "smarty3"; version = "3.1.33"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix index 36077d71126a..73cc88882d0f 100644 --- a/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "snappy-${version}"; + pname = "snappy"; version = "1.1.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/sonic/default.nix b/nixpkgs/pkgs/development/libraries/sonic/default.nix index 48ee1af0e30d..edcb3549c310 100644 --- a/nixpkgs/pkgs/development/libraries/sonic/default.nix +++ b/nixpkgs/pkgs/development/libraries/sonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "sonic-${version}"; + pname = "sonic"; version = "2016-03-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/sord/default.nix b/nixpkgs/pkgs/development/libraries/sord/default.nix index 10258e791ba6..c1c22cb910d7 100644 --- a/nixpkgs/pkgs/development/libraries/sord/default.nix +++ b/nixpkgs/pkgs/development/libraries/sord/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }: stdenv.mkDerivation rec { - name = "sord-${version}"; + pname = "sord"; version = "0.16.2"; src = fetchurl { - url = "https://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; }; diff --git a/nixpkgs/pkgs/development/libraries/spandsp/default.nix b/nixpkgs/pkgs/development/libraries/spandsp/default.nix index be2fc503e390..c2dc20cc3927 100644 --- a/nixpkgs/pkgs/development/libraries/spandsp/default.nix +++ b/nixpkgs/pkgs/development/libraries/spandsp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, audiofile, libtiff}: stdenv.mkDerivation rec { version = "0.0.6"; - name = "spandsp-${version}"; + pname = "spandsp"; src=fetchurl { url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index cab0e69ad1a7..a18edc0a6dff 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }: stdenv.mkDerivation rec { - name = "spdk-${version}"; + pname = "spdk"; version = "19.04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/speechd/default.nix b/nixpkgs/pkgs/development/libraries/speechd/default.nix index b27fd0843bc0..43360d781cdb 100644 --- a/nixpkgs/pkgs/development/libraries/speechd/default.nix +++ b/nixpkgs/pkgs/development/libraries/speechd/default.nix @@ -27,11 +27,11 @@ let else throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { - name = "speech-dispatcher-${version}"; + pname = "speech-dispatcher"; version = "0.8.8"; src = fetchurl { - url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; + url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz"; sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw"; }; diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index 40d272fd07d6..9b2c0032d4e9 100644 --- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: + stdenv.mkDerivation rec { - name = "spirv-headers-${version}"; - version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit + pname = "spirv-headers"; + version = "1.4.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + rev = version; + sha256 = "1zfmvg3x0q9w652s8g5m5rcckzm6jiiw8rif2qck4vlsryl55akp"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 6cf8d97cb67c..9365ee006d14 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -3,7 +3,7 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { - name = "sqlcipher-${version}"; + pname = "sqlcipher"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix b/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix index f0390486b10e..3c5761b767ec 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { - name = "sqlite-analyzer-${version}"; + pname = "sqlite-analyzer"; version = "3.28.0"; src = assert version == sqlite.version; fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index ea1c38ea476b..9ba5da0c910c 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { - name = "sqlite-${version}"; + pname = "sqlite"; version = "3.28.0"; # NB! Make sure to update analyzer.nix src (in the same directory). diff --git a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix index e5d322330e8e..e4c1f8eb5f68 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fuse, zlib }: stdenv.mkDerivation rec { - name = "sqlar-${version}"; + pname = "sqlar"; version = "2018-01-07"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/srt/default.nix b/nixpkgs/pkgs/development/libraries/srt/default.nix index bb66174c8841..5edb2d92b551 100644 --- a/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4"; + sha256 = "1dwz7qrkdrbmsbh66rbdx36b60r8whkz0wvf47jfckzsj37d2w22"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/srtp/default.nix b/nixpkgs/pkgs/development/libraries/srtp/default.nix index c9073fc0b7e7..3940faf1d6d1 100644 --- a/nixpkgs/pkgs/development/libraries/srtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/srtp/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libsrtp-${version}"; + pname = "libsrtp"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/startup-notification/default.nix b/nixpkgs/pkgs/development/libraries/startup-notification/default.nix index fc771a493b6d..82cbce8055e8 100644 --- a/nixpkgs/pkgs/development/libraries/startup-notification/default.nix +++ b/nixpkgs/pkgs/development/libraries/startup-notification/default.nix @@ -4,7 +4,8 @@ let version = "0.12"; in stdenv.mkDerivation { - name = "libstartup-notification-${version}"; + pname = "libstartup-notification"; + inherit version; src = fetchurl { url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; diff --git a/nixpkgs/pkgs/development/libraries/stb/default.nix b/nixpkgs/pkgs/development/libraries/stb/default.nix index 4f36ac2ba1c7..440f0c22ea6f 100644 --- a/nixpkgs/pkgs/development/libraries/stb/default.nix +++ b/nixpkgs/pkgs/development/libraries/stb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "stb-${version}"; + pname = "stb"; version = "20180211"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/strigi/default.nix b/nixpkgs/pkgs/development/libraries/strigi/default.nix index 36768acd991a..8121b7a501f7 100644 --- a/nixpkgs/pkgs/development/libraries/strigi/default.nix +++ b/nixpkgs/pkgs/development/libraries/strigi/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "strigi-${version}"; + pname = "strigi"; version = "0.7.8"; src = fetchurl { - url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2"; + url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; diff --git a/nixpkgs/pkgs/development/libraries/stxxl/default.nix b/nixpkgs/pkgs/development/libraries/stxxl/default.nix index 2244803f4d32..5589a5560eb0 100644 --- a/nixpkgs/pkgs/development/libraries/stxxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/stxxl/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { - name = "stxxl-${version}"; + pname = "stxxl"; version = "1.4.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/subunit/default.nix b/nixpkgs/pkgs/development/libraries/subunit/default.nix index 35bacff0525a..9a5f4db2debb 100644 --- a/nixpkgs/pkgs/development/libraries/subunit/default.nix +++ b/nixpkgs/pkgs/development/libraries/subunit/default.nix @@ -3,11 +3,11 @@ # NOTE: for subunit python library see pkgs/top-level/python-packages.nix stdenv.mkDerivation rec { - name = "subunit-${version}"; + pname = "subunit"; version = "1.1.0"; src = fetchurl { - url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; }; diff --git a/nixpkgs/pkgs/development/libraries/svrcore/default.nix b/nixpkgs/pkgs/development/libraries/svrcore/default.nix index 2e6e2d3fbbfd..628ab7e28ef1 100644 --- a/nixpkgs/pkgs/development/libraries/svrcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/svrcore/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, nss, nspr }: stdenv.mkDerivation rec { - name = "svrcore-${version}"; + pname = "svrcore"; version = "4.0.4"; src = fetchurl { - url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; + url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; diff --git a/nixpkgs/pkgs/development/libraries/swiften/default.nix b/nixpkgs/pkgs/development/libraries/swiften/default.nix index e30da732a46c..c8c60c1f8ea6 100644 --- a/nixpkgs/pkgs/development/libraries/swiften/default.nix +++ b/nixpkgs/pkgs/development/libraries/swiften/default.nix @@ -1,6 +1,6 @@ { stdenv, python, fetchurl, openssl, boost, scons }: stdenv.mkDerivation rec { - name = "swiften-${version}"; + pname = "swiften"; version = "4.0.2"; nativeBuildInputs = [ scons]; diff --git a/nixpkgs/pkgs/development/libraries/sword/default.nix b/nixpkgs/pkgs/development/libraries/sword/default.nix index a8a110cf9b14..3d146a5a227b 100644 --- a/nixpkgs/pkgs/development/libraries/sword/default.nix +++ b/nixpkgs/pkgs/development/libraries/sword/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "sword-${version}"; + pname = "sword"; version = "1.7.4"; src = fetchurl { - url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz"; sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; diff --git a/nixpkgs/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix index 424dc116c7e9..47b93ab373a6 100644 --- a/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "symengine-${version}"; + pname = "symengine"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/szip/default.nix b/nixpkgs/pkgs/development/libraries/szip/default.nix index 6577ebeae28e..6fd1d1ca941d 100644 --- a/nixpkgs/pkgs/development/libraries/szip/default.nix +++ b/nixpkgs/pkgs/development/libraries/szip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "szip-${version}"; + pname = "szip"; version = "2.1.1"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix index 27ac0fdd5ff9..227d3c4c5476 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -12,10 +12,10 @@ assert withPngSupport -> libpng != null; assert stdenv.isDarwin -> Carbon != null; stdenv.mkDerivation rec { - name = "tachyon-${version}"; + pname = "tachyon"; version = "0.99b2"; src = fetchurl { - url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz"; + url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix b/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix index 86006806baa0..28ce5c60481c 100644 --- a/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix +++ b/nixpkgs/pkgs/development/libraries/taglib-sharp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: stdenv.mkDerivation rec { - name = "taglib-sharp-${version}"; + pname = "taglib-sharp"; version = "2.1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix index 89b163a0917c..6fe4e45521ed 100644 --- a/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: with stdenv.lib; stdenv.mkDerivation rec { - name = "tbb-${version}"; + pname = "tbb"; version = "2019_U8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/tcllib/default.nix b/nixpkgs/pkgs/development/libraries/tcllib/default.nix index 24b1d477b8a0..40e137204e26 100644 --- a/nixpkgs/pkgs/development/libraries/tcllib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tcllib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { - name = "tcllib-${version}"; + pname = "tcllib"; version = "1.19"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/tcltls/default.nix b/nixpkgs/pkgs/development/libraries/tcltls/default.nix index 4e1f0bcab035..f1fd6760c61d 100644 --- a/nixpkgs/pkgs/development/libraries/tcltls/default.nix +++ b/nixpkgs/pkgs/development/libraries/tcltls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl, openssl }: stdenv.mkDerivation rec { - name = "tcltls-${version}"; + pname = "tcltls"; version = "1.6.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/termbox/default.nix b/nixpkgs/pkgs/development/libraries/termbox/default.nix index eefc976a62b0..8ebf0156be8f 100644 --- a/nixpkgs/pkgs/development/libraries/termbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/termbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: stdenv.mkDerivation rec { - name = "termbox-${version}"; + pname = "termbox"; version = "1.1.2"; src = fetchFromGitHub { owner = "nsf"; diff --git a/nixpkgs/pkgs/development/libraries/theft/default.nix b/nixpkgs/pkgs/development/libraries/theft/default.nix index 8d72d9a7d8ec..646cc60406a5 100644 --- a/nixpkgs/pkgs/development/libraries/theft/default.nix +++ b/nixpkgs/pkgs/development/libraries/theft/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.5"; - name = "theft-${version}"; + pname = "theft"; src = fetchFromGitHub { owner = "silentbicycle"; diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index 92cc76273ba1..0fce957df229 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "thrift-${version}"; + pname = "thrift"; version = "0.12.0"; src = fetchurl { - url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3"; }; diff --git a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix index 7f1b3ebcbf5b..4fc1da1fe0a3 100644 --- a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix +++ b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "tinyxml-2-${version}"; + pname = "tinyxml-2"; version = "6.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix index d61076e569bc..cc7c996f7c3a 100644 --- a/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -4,7 +4,8 @@ let version = "2.6.2"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { - name = "tinyxml-${version}"; + pname = "tinyxml"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; diff --git a/nixpkgs/pkgs/development/libraries/tix/default.nix b/nixpkgs/pkgs/development/libraries/tix/default.nix index 232c95e6257e..61d9c710801c 100644 --- a/nixpkgs/pkgs/development/libraries/tix/default.nix +++ b/nixpkgs/pkgs/development/libraries/tix/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.4.3"; - name = "tix-${version}"; + pname = "tix"; src = fetchurl { url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz"; sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn"; diff --git a/nixpkgs/pkgs/development/libraries/tnt/default.nix b/nixpkgs/pkgs/development/libraries/tnt/default.nix index 229e4cfaa6c0..d7162067deba 100644 --- a/nixpkgs/pkgs/development/libraries/tnt/default.nix +++ b/nixpkgs/pkgs/development/libraries/tnt/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "tnt-${version}"; + pname = "tnt"; version = "3.0.12"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/tntdb/default.nix b/nixpkgs/pkgs/development/libraries/tntdb/default.nix index 9edfcc88f164..13b4e6b97a9a 100644 --- a/nixpkgs/pkgs/development/libraries/tntdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tntdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }: stdenv.mkDerivation rec { - name = "tntdb-${version}"; + pname = "tntdb"; version = "1.3"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; diff --git a/nixpkgs/pkgs/development/libraries/tntnet/default.nix b/nixpkgs/pkgs/development/libraries/tntnet/default.nix index aaff759525b6..86b0080a8242 100644 --- a/nixpkgs/pkgs/development/libraries/tntnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/tntnet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cxxtools, zlib, openssl, zip }: stdenv.mkDerivation rec { - name = "tntnet-${version}"; + pname = "tntnet"; version = "2.2.1"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}.tar.gz"; + url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; }; diff --git a/nixpkgs/pkgs/development/libraries/torch-hdf5/default.nix b/nixpkgs/pkgs/development/libraries/torch-hdf5/default.nix index e5803d644f3b..6dd519441114 100644 --- a/nixpkgs/pkgs/development/libraries/torch-hdf5/default.nix +++ b/nixpkgs/pkgs/development/libraries/torch-hdf5/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, torch, cmake, hdf5}: stdenv.mkDerivation rec { - name = "torch-hdf5-${version}"; + pname = "torch-hdf5"; version = "0.0pre2016-07-01"; buildInputs = [cmake torch hdf5]; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/torch/default.nix b/nixpkgs/pkgs/development/libraries/torch/default.nix index d4c61890afb1..ff8c26062d3c 100644 --- a/nixpkgs/pkgs/development/libraries/torch/default.nix +++ b/nixpkgs/pkgs/development/libraries/torch/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec{ version = "0.0pre20160820"; - name = "torch-${version}"; + pname = "torch"; buildInputs = [ luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 libjpeg zeromq3 ncurses openssl libpng readline pkgconfig diff --git a/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix index 552bd4c1c51d..af2fc6c879a7 100644 --- a/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix +++ b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "trompeloeil-${version}"; + pname = "trompeloeil"; version = "34"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/tsocks/default.nix b/nixpkgs/pkgs/development/libraries/tsocks/default.nix index bcc91d058f04..d5af39d3f2a1 100644 --- a/nixpkgs/pkgs/development/libraries/tsocks/default.nix +++ b/nixpkgs/pkgs/development/libraries/tsocks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tsocks-${version}"; + pname = "tsocks"; version = "1.8beta5"; src = fetchurl { - url = "mirror://sourceforge/tsocks/${name}.tar.gz"; + url = "mirror://sourceforge/tsocks/${pname}-${version}.tar.gz"; sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; }; diff --git a/nixpkgs/pkgs/development/libraries/twolame/default.nix b/nixpkgs/pkgs/development/libraries/twolame/default.nix index a752da8cb57d..46b65a08eaab 100644 --- a/nixpkgs/pkgs/development/libraries/twolame/default.nix +++ b/nixpkgs/pkgs/development/libraries/twolame/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "twolame-${version}"; + pname = "twolame"; version = "2017-09-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/udns/default.nix b/nixpkgs/pkgs/development/libraries/udns/default.nix index 9c899eb21ba7..18f270e70db5 100644 --- a/nixpkgs/pkgs/development/libraries/udns/default.nix +++ b/nixpkgs/pkgs/development/libraries/udns/default.nix @@ -4,7 +4,7 @@ # https://tracker.debian.org/media/packages/u/udns/rules-0.4-1 stdenv.mkDerivation rec { - name = "udns-${version}"; + pname = "udns"; version = "0.4"; configurePhase = "./configure --enable-ipv6"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s"; src = fetchurl { - url = "http://www.corpit.ru/mjt/udns/${name}.tar.gz"; + url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz"; sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i"; }; diff --git a/nixpkgs/pkgs/development/libraries/udunits/default.nix b/nixpkgs/pkgs/development/libraries/udunits/default.nix index 664bc29a72de..faee73fd393a 100644 --- a/nixpkgs/pkgs/development/libraries/udunits/default.nix +++ b/nixpkgs/pkgs/development/libraries/udunits/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "udunits-${version}"; + pname = "udunits"; version = "2.2.27.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix b/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix index 6eef95309aab..1b5fbe6c2cae 100644 --- a/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix +++ b/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version="0.5.0"; - name = "uhttpmock-${version}"; + pname = "uhttpmock"; src = fetchFromGitLab { repo = "uhttpmock"; diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 6a2285563064..e257088c41fb 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -3,13 +3,13 @@ , usbutils, which, python3 }: stdenv.mkDerivation rec { - name = "umockdev-${version}"; + pname = "umockdev"; version = "0.13.1"; outputs = [ "bin" "out" "dev" "doc" ]; src = fetchurl { - url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla"; }; diff --git a/nixpkgs/pkgs/development/libraries/unibilium/default.nix b/nixpkgs/pkgs/development/libraries/unibilium/default.nix index 717edda18a2b..73ca55cffd08 100644 --- a/nixpkgs/pkgs/development/libraries/unibilium/default.nix +++ b/nixpkgs/pkgs/development/libraries/unibilium/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }: stdenv.mkDerivation rec { - name = "unibilium-${version}"; + pname = "unibilium"; version = "2.0.0"; diff --git a/nixpkgs/pkgs/development/libraries/unicap/default.nix b/nixpkgs/pkgs/development/libraries/unicap/default.nix index a902b6f84514..7fa8fe81c110 100644 --- a/nixpkgs/pkgs/development/libraries/unicap/default.nix +++ b/nixpkgs/pkgs/development/libraries/unicap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { - name = "libunicap-${version}"; + pname = "libunicap"; version="0.9.12"; src = fetchurl { - url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz"; + url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; diff --git a/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix b/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix index aa4a7890b23e..96f318ff0ef5 100644 --- a/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix +++ b/nixpkgs/pkgs/development/libraries/unicorn-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python }: stdenv.mkDerivation rec { - name = "unicorn-emulator-${version}"; + pname = "unicorn-emulator"; version = "1.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix index 90a28df6a15a..0e5971945f3d 100644 --- a/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "unittest-cpp-${version}"; + pname = "unittest-cpp"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/unixODBC/default.nix b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix index 1275df69f596..3a51e2c986a7 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBC/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "unixODBC-${version}"; + pname = "unixODBC"; version = "2.3.7"; src = fetchurl { - url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; + url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"; sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; }; diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index 99535ec395ea..b9aa1696d487 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -4,11 +4,11 @@ { psql = stdenv.mkDerivation rec { - name = "psqlodbc-${version}"; + pname = "psqlodbc"; version = "10.01.0000"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz"; sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7"; }; @@ -28,11 +28,11 @@ }; mariadb = stdenv.mkDerivation rec { - name = "mariadb-connector-odbc-${version}"; + pname = "mariadb-connector-odbc"; version = "2.0.10"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${name}-ga-src.tar.gz"; + url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz"; sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz"; }; @@ -57,12 +57,12 @@ }; mysql = stdenv.mkDerivation rec { - name = "mysql-connector-odbc-${version}"; + pname = "mysql-connector-odbc"; majorVersion = "5.3"; version = "${majorVersion}.6"; src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${name}-src.tar.gz"; + url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${pname}-${version}-src.tar.gz"; sha256 = "1smi4z49i4zm7cmykjkwlxxzqvn7myngsw5bc35z6gqxmi8c55xr"; }; @@ -86,7 +86,7 @@ }; sqlite = stdenv.mkDerivation rec { - name = "sqlite-connector-odbc-${version}"; + pname = "sqlite-connector-odbc"; version = "0.9993"; src = fetchurl { @@ -121,7 +121,7 @@ }; msodbcsql17 = stdenv.mkDerivation rec { - name = "msodbcsql17-${version}"; + pname = "msodbcsql17"; version = "${versionMajor}.${versionMinor}.${versionAdditional}-1"; versionMajor = "17"; diff --git a/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/nixpkgs/pkgs/development/libraries/uriparser/default.nix index 89efdc006a54..9c48488bff8e 100644 --- a/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: stdenv.mkDerivation rec { - name = "uriparser-${version}"; + pname = "uriparser"; version = "0.9.1"; # Release tarball differs from source tarball src = fetchurl { - url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; + url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; }; diff --git a/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/nixpkgs/pkgs/development/libraries/usbredir/default.nix index 3d09545c9317..2eee80a76969 100644 --- a/nixpkgs/pkgs/development/libraries/usbredir/default.nix +++ b/nixpkgs/pkgs/development/libraries/usbredir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb }: stdenv.mkDerivation rec { - name = "usbredir-${version}"; + pname = "usbredir"; version = "0.8.0"; src = fetchurl { - url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; + url = "https://spice-space.org/download/usbredir/${pname}-${version}.tar.bz2"; sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; }; diff --git a/nixpkgs/pkgs/development/libraries/ustr/default.nix b/nixpkgs/pkgs/development/libraries/ustr/default.nix index c15259c585ad..18eae87e11c6 100644 --- a/nixpkgs/pkgs/development/libraries/ustr/default.nix +++ b/nixpkgs/pkgs/development/libraries/ustr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ustr-${version}"; + pname = "ustr"; version = "1.0.4"; src = fetchurl { - url = "http://www.and.org/ustr/${version}/${name}.tar.bz2"; + url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2"; sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx"; }; diff --git a/nixpkgs/pkgs/development/libraries/uthash/default.nix b/nixpkgs/pkgs/development/libraries/uthash/default.nix index b80984303d76..e1f3c0bd39c2 100644 --- a/nixpkgs/pkgs/development/libraries/uthash/default.nix +++ b/nixpkgs/pkgs/development/libraries/uthash/default.nix @@ -4,7 +4,8 @@ let version = "2.1.0"; in stdenv.mkDerivation rec { - name = "uthash-${version}"; + pname = "uthash"; + inherit version; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/v8/3.14.nix b/nixpkgs/pkgs/development/libraries/v8/3.14.nix index 827274251ed9..7f9e8508a657 100644 --- a/nixpkgs/pkgs/development/libraries/v8/3.14.nix +++ b/nixpkgs/pkgs/development/libraries/v8/3.14.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; inherit version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/v8/3.16.14.nix b/nixpkgs/pkgs/development/libraries/v8/3.16.14.nix index a7dddd141246..e134c9ea60f5 100644 --- a/nixpkgs/pkgs/development/libraries/v8/3.16.14.nix +++ b/nixpkgs/pkgs/development/libraries/v8/3.16.14.nix @@ -10,12 +10,12 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "3.16.14.11"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" - + "${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2"; sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj"; }; diff --git a/nixpkgs/pkgs/development/libraries/v8/5_x.nix b/nixpkgs/pkgs/development/libraries/v8/5_x.nix index 2b9fa5cc04c0..cb53765e394b 100644 --- a/nixpkgs/pkgs/development/libraries/v8/5_x.nix +++ b/nixpkgs/pkgs/development/libraries/v8/5_x.nix @@ -102,7 +102,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "5.4.232"; inherit doCheck; diff --git a/nixpkgs/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix index f7c4f34e8e6e..2d9c5d4b92a3 100644 --- a/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -44,7 +44,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "7.4.255"; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix index 8d2276def705..a72c9473d4ab 100644 --- a/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/nixpkgs/pkgs/development/libraries/v8/plv8_6_x.nix @@ -1,6 +1,8 @@ # NOTE: this expression is NOT exported from the top-level of all-packages.nix, -# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a -# very exact version. +# it is exclusively used by the 'plv8' PostgreSQL extension. +# Since plv8 2.3.2, plv8 no longer requires this specific version, but as of +# 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which +# is a bit outdated. plv8 3.x is planned to support v8 7.x { stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig , doCheck ? false @@ -109,7 +111,7 @@ let in stdenv.mkDerivation rec { - name = "v8-${version}"; + pname = "v8"; version = "6.4.388.40"; inherit doCheck; diff --git a/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 56ded2c56447..678d7dd265c4 100644 --- a/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: stdenv.mkDerivation rec { - name = "intel-hybrid-driver-${version}"; + pname = "intel-hybrid-driver"; version = "1.0.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix index 640f50eb45bf..722079ff3478 100644 --- a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix +++ b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "intel-vaapi-driver-${version}"; + pname = "intel-vaapi-driver"; # TODO: go back to stable releases with the next stable release after 2.3.0. # see: https://github.com/NixOS/nixpkgs/issues/55975 (and the libva comment v) rev = "329975c63123610fc750241654a3bd18add75beb"; # generally try to match libva version, but not required diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix index abdf9fbeed3c..8a2e3af4791c 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "vapoursynth-mvtools-${version}"; + pname = "vapoursynth-mvtools"; version = "21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/vc/0.7.nix b/nixpkgs/pkgs/development/libraries/vc/0.7.nix index 1af70056d2eb..18b2659cc5df 100644 --- a/nixpkgs/pkgs/development/libraries/vc/0.7.nix +++ b/nixpkgs/pkgs/development/libraries/vc/0.7.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "Vc-${version}"; + pname = "Vc"; version = "0.7.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/vc/default.nix b/nixpkgs/pkgs/development/libraries/vc/default.nix index 66c8e4fbc531..2194c7be38b9 100644 --- a/nixpkgs/pkgs/development/libraries/vc/default.nix +++ b/nixpkgs/pkgs/development/libraries/vc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "Vc-${version}"; + pname = "Vc"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/vcg/default.nix b/nixpkgs/pkgs/development/libraries/vcg/default.nix index b7249c8ee82c..eb37d14b532b 100644 --- a/nixpkgs/pkgs/development/libraries/vcg/default.nix +++ b/nixpkgs/pkgs/development/libraries/vcg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, eigen }: stdenv.mkDerivation rec { - name = "vcg-${version}"; + pname = "vcg"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/vid-stab/default.nix b/nixpkgs/pkgs/development/libraries/vid-stab/default.nix index e516c94866a2..eb88b36a1422 100644 --- a/nixpkgs/pkgs/development/libraries/vid-stab/default.nix +++ b/nixpkgs/pkgs/development/libraries/vid-stab/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "vid-stab-${version}"; + pname = "vid-stab"; version = "0.98b"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/vigra/default.nix b/nixpkgs/pkgs/development/libraries/vigra/default.nix index fb69d4bf63e7..625ec2cee389 100644 --- a/nixpkgs/pkgs/development/libraries/vigra/default.nix +++ b/nixpkgs/pkgs/development/libraries/vigra/default.nix @@ -5,7 +5,7 @@ let inherit (python2Packages) python numpy; # Might want to use `python2.withPackages(ps: [ps.numpy]);` here... in stdenv.mkDerivation rec { - name = "vigra-${version}"; + pname = "vigra"; version = "1.11.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index 72803e09f075..71bd608e93a1 100644 --- a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { - name = "virglrenderer-${version}"; + pname = "virglrenderer"; version = "0.7.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2"; sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; }; diff --git a/nixpkgs/pkgs/development/libraries/vmime/default.nix b/nixpkgs/pkgs/development/libraries/vmime/default.nix index e0398487abc3..a68880c2f952 100644 --- a/nixpkgs/pkgs/development/libraries/vmime/default.nix +++ b/nixpkgs/pkgs/development/libraries/vmime/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "vmime-${version}"; + pname = "vmime"; version = "0.9.2"; src = fetchFromGitHub { owner = "kisli"; diff --git a/nixpkgs/pkgs/development/libraries/vmmlib/default.nix b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix index 18b9278539fc..b9eb29422c54 100644 --- a/nixpkgs/pkgs/development/libraries/vmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/vmmlib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; - name = "vmmlib-${version}"; + pname = "vmmlib"; src = fetchFromGitHub { owner = "VMML"; diff --git a/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/nixpkgs/pkgs/development/libraries/volume-key/default.nix index f6669f2f8fea..77cd3be0cbda 100644 --- a/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -7,7 +7,8 @@ let version = "0.3.11"; in stdenv.mkDerivation rec { - name = "volume_key-${version}"; + pname = "volume_key"; + inherit version; src = fetchgit { url = https://pagure.io/volume_key.git; diff --git a/nixpkgs/pkgs/development/libraries/vrb/default.nix b/nixpkgs/pkgs/development/libraries/vrb/default.nix index 4f72cc138acf..efd60fe66fb5 100644 --- a/nixpkgs/pkgs/development/libraries/vrb/default.nix +++ b/nixpkgs/pkgs/development/libraries/vrb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "vrb-${version}"; + pname = "vrb"; version = "0.5.1"; src = fetchurl { - url = "http://vrb.sourceforge.net/download/${name}.tar.bz2"; + url = "http://vrb.sourceforge.net/download/${pname}-${version}.tar.bz2"; sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f"; }; diff --git a/nixpkgs/pkgs/development/libraries/vsqlite/default.nix b/nixpkgs/pkgs/development/libraries/vsqlite/default.nix index e706c730ddd3..fd0e90941b89 100644 --- a/nixpkgs/pkgs/development/libraries/vsqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/vsqlite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boost, sqlite }: stdenv.mkDerivation rec { - name = "vsqlite-${version}"; + pname = "vsqlite"; version = "0.3.13"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index f7c1bf9a65b9..4ea8d69a498b 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "vulkan-headers-${version}"; - version = "1.1.106"; + pname = "vulkan-headers"; + version = "1.1.114.0"; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd"; + sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index a44e91e1bf5c..5631665a6916 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -2,29 +2,27 @@ , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: let - version = "1.1.106"; + version = "1.1.114.0"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { - name = "vulkan-loader-${version}"; + pname = "vulkan-loader"; inherit version; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; + sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww"; }; nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; - patches = [ ./system-search-path.patch ]; - cmakeFlags = [ - "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share" + "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch deleted file mode 100644 index 26f83e6d534f..000000000000 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ac5ce835..cbdb0ff56 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,6 +88,12 @@ if(UNIX) - STRING - "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant." - ) -+ set( -+ SYSTEM_SEARCH_PATH "" -+ CACHE -+ STRING -+ "Search path to always use, after all other search paths." -+ ) - endif() - - if(UNIX AND NOT APPLE) # i.e.: Linux -@@ -184,6 +190,7 @@ if(UNIX) - add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}") - add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") - add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") -+ add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}") - - # Make sure /etc is searched by the loader - if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) -diff --git a/loader/loader.c b/loader/loader.c -index 0d3b5a947..abe357004 100644 ---- a/loader/loader.c -+++ b/loader/loader.c -@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e - search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size); - search_path_size += DetermineDataFilePathSize(home_root, rel_size); - } -+ search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size); - #endif - } - } -@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e - CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr); - CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr); - } -+ CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr); - } - - // Remove the last path separator diff --git a/nixpkgs/pkgs/development/libraries/wavpack/default.nix b/nixpkgs/pkgs/development/libraries/wavpack/default.nix index 8af33c10319c..f3f87b3ba604 100644 --- a/nixpkgs/pkgs/development/libraries/wavpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/wavpack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libiconv, fetchpatch }: stdenv.mkDerivation rec { - name = "wavpack-${version}"; + pname = "wavpack"; version = "5.1.0"; enableParallelBuilding = true; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; src = fetchurl { - url = "http://www.wavpack.com/${name}.tar.bz2"; + url = "http://www.wavpack.com/${pname}-${version}.tar.bz2"; sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r"; }; diff --git a/nixpkgs/pkgs/development/libraries/wayland/1.9.nix b/nixpkgs/pkgs/development/libraries/wayland/1.9.nix index 3fda417d8e1f..7572051b1de0 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/1.9.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/1.9.nix @@ -7,11 +7,11 @@ assert expat != null; stdenv.mkDerivation rec { - name = "wayland-${version}"; + pname = "wayland"; version = "1.9.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index b14dc03385cf..d2af8b084e68 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "wayland-protocols-${version}"; + pname = "wayland-protocols"; version = "1.17"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"; }; diff --git a/nixpkgs/pkgs/development/libraries/wcslib/default.nix b/nixpkgs/pkgs/development/libraries/wcslib/default.nix index 5f9015fa9609..b0c8c1edd66b 100644 --- a/nixpkgs/pkgs/development/libraries/wcslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/wcslib/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "6.4"; - name = "wcslib-${version}"; + pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { - url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; sha256 ="003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k"; }; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix index 04758ace7fa4..25868cdb886e 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/2.4.nix @@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage; with stdenv.lib; stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; + pname = "webkitgtk"; version = "2.4.11"; meta = with stdenv.lib; { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"; }; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 927301589b4c..71b30960bacd 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -14,7 +14,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; + pname = "webkitgtk"; version = "2.24.3"; meta = { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; sha256 = "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl"; }; diff --git a/nixpkgs/pkgs/development/libraries/websocket++/default.nix b/nixpkgs/pkgs/development/libraries/websocket++/default.nix index d84f30aad55b..84fbda503eac 100644 --- a/nixpkgs/pkgs/development/libraries/websocket++/default.nix +++ b/nixpkgs/pkgs/development/libraries/websocket++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "websocket++-${version}"; + pname = "websocket++"; version = "0.8.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix index bccf4f69e9d2..2ebad693de50 100644 --- a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix +++ b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix @@ -25,7 +25,7 @@ let optLeveldb = shouldUsePkg leveldb; in stdenv.mkDerivation rec { - name = "wiredtiger-${version}"; + pname = "wiredtiger"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 549e492e944c..780d7df47cb0 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "wolfssl-${version}"; + pname = "wolfssl"; version = "4.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/wt/default.nix b/nixpkgs/pkgs/development/libraries/wt/default.nix index ba77189b2a55..60f911765992 100644 --- a/nixpkgs/pkgs/development/libraries/wt/default.nix +++ b/nixpkgs/pkgs/development/libraries/wt/default.nix @@ -7,7 +7,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "wt-${version}"; + pname = "wt"; + inherit version; src = fetchFromGitHub { owner = "emweb"; diff --git a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index ce8e3f0f677c..bdc8f8c3435c 100644 --- a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "wxSVG-${version}"; + pname = "wxSVG"; srcName = "wxsvg-${version}"; version = "1.5.20"; diff --git a/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix index 49f12842533b..a528166f68a0 100644 --- a/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix @@ -2,7 +2,7 @@ , darwin }: stdenv.mkDerivation rec { - name = "wxsqlite3-${version}"; + pname = "wxsqlite3"; version = "3.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix index 998f6a9e5f69..9ca15d4977b9 100644 --- a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: stdenv.mkDerivation rec { - name = "wxsqliteplus-${version}"; + pname = "wxsqliteplus"; version = "0.3.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix index b952e8b12673..38ee4376ac2d 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.8.12.1"; - name = "wxGTK-${version}"; + pname = "wxGTK"; src = fetchurl { url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix index 369d011f9b3c..02367e18a95b 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -15,7 +15,8 @@ let version = "2.9.4"; in stdenv.mkDerivation { - name = "wxwidgets-${version}"; + pname = "wxwidgets"; + inherit version; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index b33b0b15331a..a12447562b81 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "3.0.4"; - name = "wxwidgets-${version}"; + pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix index cbe8bd8ac5ee..5236996199d6 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.0.4"; - name = "wxmac-${version}"; + pname = "wxmac"; src = fetchzip { url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix index cee967ef2aa0..8fe75153de6d 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "3.1.2"; - name = "wxwidgets-${version}"; + pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; diff --git a/nixpkgs/pkgs/development/libraries/x265/default.nix b/nixpkgs/pkgs/development/libraries/x265/default.nix index f2189cb014ec..634847941d00 100644 --- a/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation rec { - name = "x265-${version}"; + pname = "x265"; version = "3.1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/xalanc/default.nix b/nixpkgs/pkgs/development/libraries/xalanc/default.nix index aeb741dbae7b..92a932a01a4a 100644 --- a/nixpkgs/pkgs/development/libraries/xalanc/default.nix +++ b/nixpkgs/pkgs/development/libraries/xalanc/default.nix @@ -5,7 +5,7 @@ let if stdenv.isDarwin then "macosx" else throw "Unsupported platform"; in stdenv.mkDerivation rec { - name = "xalan-c-${version}"; + pname = "xalan-c"; version = "1.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 271c7adf3d98..362f704a05d8 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "xapian-${version}"; + pname = "xapian"; + inherit version; passthru = { inherit version; }; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index 1203f19d6c82..6c8eda6358b2 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }: stdenv.mkDerivation rec { - name = "xapian-omega-${version}"; + pname = "xapian-omega"; inherit (xapian) version; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/xavs/default.nix b/nixpkgs/pkgs/development/libraries/xavs/default.nix index 31c31164e010..d7ec3ae9c1e8 100644 --- a/nixpkgs/pkgs/development/libraries/xavs/default.nix +++ b/nixpkgs/pkgs/development/libraries/xavs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn }: stdenv.mkDerivation rec { - name = "xavs-${version}"; + pname = "xavs"; version = "55"; src = fetchsvn { diff --git a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index e343c301127f..705bd6b87fc6 100644 --- a/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/nixpkgs/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -2,7 +2,7 @@ , xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { - name = "xcb-util-cursor-0.1.1-3-unstable-${version}"; + pname = "xcb-util-cursor-0.1.1-3-unstable"; version = "2017-04-05"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/xercesc/default.nix b/nixpkgs/pkgs/development/libraries/xercesc/default.nix index 8ad4e6d6a8a6..704884c23f3e 100644 --- a/nixpkgs/pkgs/development/libraries/xercesc/default.nix +++ b/nixpkgs/pkgs/development/libraries/xercesc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xerces-c-${version}"; + pname = "xerces-c"; version = "3.2.2"; src = fetchurl { - url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; + url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx"; }; diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 74d263a94179..f4687bd46f85 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -7,7 +7,7 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { - name = "xgboost-${version}"; + pname = "xgboost"; version = "0.90"; # needs submodules diff --git a/nixpkgs/pkgs/development/libraries/xlslib/default.nix b/nixpkgs/pkgs/development/libraries/xlslib/default.nix index 718554b20a48..3d1b4ea74db8 100644 --- a/nixpkgs/pkgs/development/libraries/xlslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/xlslib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, unzip }: stdenv.mkDerivation rec { - name = "xlslib-${version}"; + pname = "xlslib"; version = "2.5.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix index 35ae93e79392..e6ececf8513e 100644 --- a/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "xml-security-c-${version}"; + pname = "xml-security-c"; version = "2.0.2"; src = fetchurl { - url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; + url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz"; sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3"; }; diff --git a/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix index fbe515f6217f..d5e1eb08fa49 100644 --- a/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xml-tooling-c-${version}"; + pname = "xml-tooling-c"; version = "3.0.4"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index b19bf000b0d4..3e54944a3779 100644 --- a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -5,7 +5,8 @@ let version = "1.2.28"; in stdenv.mkDerivation rec { - name = "xmlsec-${version}"; + pname = "xmlsec"; + inherit version; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/libraries/xsd/default.nix b/nixpkgs/pkgs/development/libraries/xsd/default.nix index 051a194af98e..5a267bbfe767 100644 --- a/nixpkgs/pkgs/development/libraries/xsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/xsd/default.nix @@ -4,7 +4,7 @@ let fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in stdenv.mkDerivation rec { - name = "xsd-${version}"; + pname = "xsd"; version = "4.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/xvidcore/default.nix b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix index 17d7320cb648..5ec96157a79c 100644 --- a/nixpkgs/pkgs/development/libraries/xvidcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "xvidcore-${version}"; + pname = "xvidcore"; version = "1.3.5"; src = fetchurl { - url = "http://downloads.xvid.org/downloads/${name}.tar.bz2"; + url = "http://downloads.xvid.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w"; }; diff --git a/nixpkgs/pkgs/development/libraries/xxHash/default.nix b/nixpkgs/pkgs/development/libraries/xxHash/default.nix index 70701f2d070e..51165f47a219 100644 --- a/nixpkgs/pkgs/development/libraries/xxHash/default.nix +++ b/nixpkgs/pkgs/development/libraries/xxHash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "xxHash-${version}"; + pname = "xxHash"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/xylib/default.nix b/nixpkgs/pkgs/development/libraries/xylib/default.nix index c9c84f4e1d89..155e46c8f8c6 100644 --- a/nixpkgs/pkgs/development/libraries/xylib/default.nix +++ b/nixpkgs/pkgs/development/libraries/xylib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: stdenv.mkDerivation rec { - name = "xylib-${version}"; + pname = "xylib"; version = "1.5"; src = fetchurl { - url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd"; }; diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index 82b53402fc78..a2e60eacf989 100644 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "zeroc-ice-${version}"; + pname = "zeroc-ice"; version = "3.6.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index 8a89d2ae1c74..db5d90e2f021 100644 --- a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: stdenv.mkDerivation rec { - name = "zeromq-${version}"; + pname = "zeromq"; version = "4.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 9b7a90266284..1b74b8c5388b 100644 --- a/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zimlib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lzma }: stdenv.mkDerivation rec { - name = "zimlib-${version}"; + pname = "zimlib"; version = "1.4"; src = fetchurl { - url = "http://www.openzim.org/download/${name}.tar.gz"; + url = "http://www.openzim.org/download/${pname}-${version}.tar.gz"; sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq"; }; diff --git a/nixpkgs/pkgs/development/libraries/zlog/default.nix b/nixpkgs/pkgs/development/libraries/zlog/default.nix index 330b91e995d9..5c6015757420 100644 --- a/nixpkgs/pkgs/development/libraries/zlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.14"; - name = "zlog-${version}"; + pname = "zlog"; src = fetchzip { - name = "${name}-src"; + name = "${pname}-${version}-src"; url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz"; sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5"; }; diff --git a/nixpkgs/pkgs/development/libraries/zmqpp/default.nix b/nixpkgs/pkgs/development/libraries/zmqpp/default.nix index f7e849f6a334..98211e6e3eb5 100644 --- a/nixpkgs/pkgs/development/libraries/zmqpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/zmqpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }: stdenv.mkDerivation rec { - name = "zmqpp-${version}"; + pname = "zmqpp"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix index 65509d766b96..78983f095439 100644 --- a/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zxcvbn-c-${version}"; + pname = "zxcvbn-c"; version = "2.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/nixpkgs/pkgs/development/libraries/zziplib/default.nix index 010c73336b92..8b199d3e89a2 100644 --- a/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,7 @@ { docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: stdenv.mkDerivation rec { - name = "zziplib-${version}"; + pname = "zziplib"; version = "0.13.69"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix index 083398029504..46d417fd2aac 100644 --- a/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix +++ b/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix @@ -37,7 +37,7 @@ let lispPackages = rec { }; quicklisp-to-nix-system-info = stdenv.mkDerivation rec { - name = "quicklisp-to-nix-system-info-${version}"; + pname = "quicklisp-to-nix-system-info"; version = "1.0.0"; src = ./quicklisp-to-nix; nativeBuildInputs = [sbcl]; @@ -58,7 +58,7 @@ let lispPackages = rec { }; quicklisp-to-nix = stdenv.mkDerivation rec { - name = "quicklisp-to-nix-${version}"; + pname = "quicklisp-to-nix"; version = "1.0.0"; src = ./quicklisp-to-nix; buildDependencies = [sbcl quicklisp-to-nix-system-info]; diff --git a/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix index 5ef83ed77b3b..d16f63152b84 100644 --- a/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix +++ b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.0"; - name = "amdadl-sdk-${version}"; + pname = "amdadl-sdk"; src = requireFile { name = "ADL_SDK_6.0.zip"; diff --git a/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix b/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix index 79651db23ea4..ba6d5559f26b 100644 --- a/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix +++ b/nixpkgs/pkgs/development/misc/amdapp-sdk/default.nix @@ -36,7 +36,8 @@ let }; in stdenv.mkDerivation rec { - name = "amdapp-sdk-${version}"; + pname = "amdapp-sdk"; + inherit version; src = fetchurl { url = stdenv.lib.getAttrFromPath [version "url"] src_info; diff --git a/nixpkgs/pkgs/development/misc/avr/libc/default.nix b/nixpkgs/pkgs/development/misc/avr/libc/default.nix index 4527a8700f6e..48ea088a73c9 100644 --- a/nixpkgs/pkgs/development/misc/avr/libc/default.nix +++ b/nixpkgs/pkgs/development/misc/avr/libc/default.nix @@ -4,7 +4,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "avr-libc-${version}"; + pname = "avr-libc"; + inherit version; src = fetchurl { url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; diff --git a/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix index 0456c8eae769..b84f358cbee0 100644 --- a/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix +++ b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix @@ -3,7 +3,8 @@ let version = "0.25"; in stdenv.mkDerivation { - name = "mspdebug-${version}"; + pname = "mspdebug"; + inherit version; src = fetchFromGitHub { owner = "dlbeer"; repo = "mspdebug"; diff --git a/nixpkgs/pkgs/development/misc/newlib/default.nix b/nixpkgs/pkgs/development/misc/newlib/default.nix index 4230672e12f3..df0ef999dd6a 100644 --- a/nixpkgs/pkgs/development/misc/newlib/default.nix +++ b/nixpkgs/pkgs/development/misc/newlib/default.nix @@ -2,7 +2,8 @@ let version = "3.1.0"; in stdenv.mkDerivation { - name = "newlib-${version}"; + pname = "newlib"; + inherit version; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv"; diff --git a/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix b/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix index 0ec8664dac9e..8abe4b2550e0 100644 --- a/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix +++ b/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix @@ -6,7 +6,8 @@ let version = "0.6.144"; in stdenv.mkDerivation { - name = "qmk_firmware-${version}"; + pname = "qmk_firmware"; + inherit version; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; diff --git a/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix index e66bb6fe2118..bc806410b1ea 100644 --- a/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix +++ b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "betaflight-${version}"; + pname = "betaflight"; + inherit version; src = fetchFromGitHub { owner = "betaflight"; diff --git a/nixpkgs/pkgs/development/misc/stm32/inav/default.nix b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix index 683883ddbce9..5014cdce8f37 100644 --- a/nixpkgs/pkgs/development/misc/stm32/inav/default.nix +++ b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "inav-${version}"; + pname = "inav"; + inherit version; src = fetchFromGitHub { owner = "iNavFlight"; diff --git a/nixpkgs/pkgs/development/mobile/abootimg/default.nix b/nixpkgs/pkgs/development/mobile/abootimg/default.nix index a2ddda34347a..eed4b43d6a36 100644 --- a/nixpkgs/pkgs/development/mobile/abootimg/default.nix +++ b/nixpkgs/pkgs/development/mobile/abootimg/default.nix @@ -4,7 +4,8 @@ let version = "0.6"; in stdenv.mkDerivation { - name = "abootimg-${version}"; + pname = "abootimg"; + inherit version; src = fetchFromGitHub { owner = "ggrandou"; diff --git a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix index b6d35051733a..8578e51e939d 100644 --- a/nixpkgs/pkgs/development/mobile/adb-sync/default.nix +++ b/nixpkgs/pkgs/development/mobile/adb-sync/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, python3, platform-tools, makeWrapper }: stdenv.mkDerivation rec { - name = "adb-sync-${version}"; + pname = "adb-sync"; version = "2016-08-31"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix b/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix index fffe2fbbcbed..2033fa78ae58 100644 --- a/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/nixpkgs/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: stdenv.mkDerivation rec { - name = "adbfs-rootless-${version}"; + pname = "adbfs-rootless"; version = "2016-10-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2ddffbf16b7c..c75dc334ebc9 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) + CFPropertyList (3.0.1) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) @@ -12,16 +12,16 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.0.beta.1) + cocoapods (1.8.0.beta.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.0.beta.1) + cocoapods-core (= 1.8.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -31,9 +31,10 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.0.beta.1) + cocoapods-core (1.8.0.beta.2) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) + concurrent-ruby (~> 1.0) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -42,7 +43,7 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.3.1) + cocoapods-trunk (1.4.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index baa4748fb946..e2d4127ae44d 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; + sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; claide = { groups = ["default"]; @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54"; + sha256 = "1qsj34czqsy93w2bnwhdhr0cyzjwl7vy3sknmak4syyni6m0rlli"; type = "gem"; }; - version = "1.8.0.beta.1"; + version = "1.8.0.beta.2"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j"; + sha256 = "166pr9m3da9hsra9rviaxz3i4spm7kl003mkn7sn25r9smcvfdj4"; type = "gem"; }; - version = "1.8.0.beta.1"; + version = "1.8.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl"; + sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; cocoapods-try = { groups = ["default"]; diff --git a/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix b/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix index 9cee1c9e5dee..706fa2c65998 100644 --- a/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix +++ b/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, bzip2, openssl, zlib }: stdenv.mkDerivation rec { - name = "imgpatchtools-${version}"; + pname = "imgpatchtools"; version = "0.3"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix b/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix index f149cb622e13..cd58ea4e20cf 100644 --- a/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix +++ b/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "cmake-modules-webos-${version}"; + pname = "cmake-modules-webos"; version = "19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/mobile/webos/novacom.nix b/nixpkgs/pkgs/development/mobile/webos/novacom.nix index 52b50635e336..e7afdb32137b 100644 --- a/nixpkgs/pkgs/development/mobile/webos/novacom.nix +++ b/nixpkgs/pkgs/development/mobile/webos/novacom.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, webos, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "novacom-${version}"; + pname = "novacom"; version = "18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix index f82009b0c39c..4d62dd305d3a 100644 --- a/nixpkgs/pkgs/development/mobile/webos/novacomd.nix +++ b/nixpkgs/pkgs/development/mobile/webos/novacomd.nix @@ -4,7 +4,7 @@ webos, cmake, pkgconfig, libusb }: stdenv.mkDerivation rec { - name = "novacomd-${version}"; + pname = "novacomd"; version = "127"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix index 8128dc1cb6f5..4606ebd51721 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix @@ -3,7 +3,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "ocaml-base64-${version}"; + pname = "ocaml-base64"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix new file mode 100644 index 000000000000..6d833b48f269 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "bigarray-compat"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = pname; + rev = "v${version}"; + sha256 = "06j1dwlpisxshdd0nab4n4x266gg1s1n8na16lpgw3fvcznwnimz"; + }; + + meta = { + description = "Compatibility library to use Stdlib.Bigarray when possible"; + inherit (src.meta) homepage; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix index a7e591e049e6..21897e3bf10f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -5,7 +5,7 @@ then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "camomile-${version}"; + pname = "camomile"; version = "0.8.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix index 48517036dc6d..a30b574f19bc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation rec { - name = "camomile-${version}"; + pname = "camomile"; version = "0.8.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix index 4832f5c39af3..2a4d7004faa0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; - name = "ocaml-cow-${version}"; + pname = "ocaml-cow"; src = fetchFromGitHub { owner = "mirage"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix index 7720650ddfc9..17da11708c60 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -5,7 +5,7 @@ then throw "cryptgps is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml-cryptgps-${version}"; + pname = "ocaml-cryptgps"; version = "0.2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix index 412146244278..1811e21cf58f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -18,7 +18,7 @@ let param = in stdenv.mkDerivation rec { - name = "cryptokit-${version}"; + pname = "cryptokit"; inherit (param) version; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index 37c7f660ca6b..01a32fc09a20 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, buildDunePackage, sexplib, ocplib-endian }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "cstruct"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; + url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; + sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a"; }; - propagatedBuildInputs = [ sexplib ocplib-endian ]; - meta = { description = "Access C-like structures directly from OCaml"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://github.com/mirage/ocaml-cstruct"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index 78600b783068..b5c39533e733 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, ppx_tools_versioned }: +{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct @@ -8,8 +8,8 @@ buildDunePackage { pname = "ppx_cstruct"; inherit (cstruct) version src meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.03"; - buildInputs = [ ppx_tools_versioned ]; + buildInputs = [ sexplib ppx_tools_versioned ]; propagatedBuildInputs = [ cstruct ]; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix new file mode 100644 index 000000000000..9a1ef0dd301f --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, alcotest, cstruct, sexplib }: + +if !lib.versionAtLeast (cstruct.version or "1") "3" +then cstruct +else + +buildDunePackage { + pname = "cstruct-sexp"; + inherit (cstruct) version src meta; + + doCheck = true; + buildInputs = [ alcotest ]; + + propagatedBuildInputs = [ cstruct sexplib ]; +} + diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix index 604ad4fb083b..7cb5d6658696 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "cstruct-unix"; inherit (cstruct) version src meta; - minimumOCamlVersion = "4.02"; + minimumOCamlVersion = "4.06"; propagatedBuildInputs = [ cstruct ]; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix b/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix index d08259af247c..dc6b17512837 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/curses/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ncurses }: stdenv.mkDerivation rec { - name = "ocaml-curses-${version}"; + pname = "ocaml-curses"; version = "1.0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix index 318353168336..9239d2543ee3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix @@ -3,7 +3,8 @@ let version = "3.0"; in stdenv.mkDerivation { - name = "ocaml-dolog-${version}"; + pname = "ocaml-dolog"; + inherit version; src = fetchzip { url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix b/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix new file mode 100644 index 000000000000..cb0105ff46fa --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchurl +, alcotest +, astring, fmt +}: + +buildDunePackage rec { + pname = "domain-name"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-v${version}.tbz"; + sha256 = "12kc9p2a2fi1ipc2hyhbzivxpph3npglxwdgvhd6v20rqqdyvnad"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ alcotest ]; + + propagatedBuildInputs = [ astring fmt ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/hannesm/domain-name"; + description = "RFC 1035 Internet domain names"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index 010df7d8df92..25e75ceeba36 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { pname = "eliom"; version = "6.7.0"; - name = "${pname}-${version}"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index 944195fd0a3e..35f8f5d52e94 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildDunePackage -, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri +, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri , alcotest, mtime, nocrypto }: @@ -15,7 +15,7 @@ buildDunePackage rec { }; buildInputs = [ alcotest mtime nocrypto ]; - propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; + propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ]; doCheck = true; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix new file mode 100644 index 000000000000..2585dfcaa968 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fetchurl, alcotest }: + +buildDunePackage rec { + pname = "gmap"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz"; + sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ alcotest ]; + + doCheck = true; + + meta = { + description = "Heterogenous maps over a GADT"; + homepage = "https://github.com/hannesm/gmap"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix index e8d9267aa858..93e2b3b84295 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/higlo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: stdenv.mkDerivation rec { - name = "higlo-${version}"; + pname = "higlo"; version = "0.6"; src = fetchFromGitHub { owner = "zoggy"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix index 8a11d22c2c11..40db8246f4aa 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix @@ -3,7 +3,8 @@ let version = "0.2.4"; in stdenv.mkDerivation { - name = "ocaml-iso8601-${version}"; + pname = "ocaml-iso8601"; + inherit version; src = fetchzip { url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz"; sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix index 6b01929db768..e78dd91f00a3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -14,7 +14,7 @@ let param = in stdenv.mkDerivation rec { - name = "lablgtk-${version}"; + pname = "lablgtk"; inherit (param) version; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix index 3bced92cc3e3..c91a57121379 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix @@ -3,7 +3,8 @@ let version = stdenv.lib.getVersion llvm; in stdenv.mkDerivation { - name = "ocaml-llvm-${version}"; + pname = "ocaml-llvm"; + inherit version; inherit (llvm) src; diff --git a/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix index 9a8a6259a778..65acbd6cc428 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -3,7 +3,8 @@ let version = "1.0.0"; in stdenv.mkDerivation { - name = "ocaml-magic-mime-${version}"; + pname = "ocaml-magic-mime"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix index e69b9dabeabc..d767c20f6385 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,7 +1,8 @@ { version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { - name = "menhir-${version}"; + pname = "menhir"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix index 813b4d7f7a4a..9108fd248c01 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg -, cpuid, ocb-stubblr +, cpuid, ocb-stubblr, sexplib , cstruct, zarith, ppx_sexp_conv , cstruct-lwt ? null }: @@ -33,10 +33,18 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch"; sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9"; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch"; + sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch"; + sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z"; + }) ]; buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ]; - propagatedBuildInputs = [ cstruct ppx_sexp_conv zarith ] ++ optional withLwt cstruct-lwt; + propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index b789b133aaf3..11405c0ebe5e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-libvirt-${version}"; + pname = "ocaml-libvirt"; rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4 diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix index 10d8484e3efa..e210ffa11523 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { - name = "ocaml-text-${version}"; + pname = "ocaml-text"; version = "0.8"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 20b63e3a8eef..27442075064c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: stdenv.mkDerivation rec { - name = "ocamlfuse-${version}"; + pname = "ocamlfuse"; version = "2.7.1_cvs5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix index e005024d2225..887dce586897 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib, lablgtk}: stdenv.mkDerivation rec { - name = "ocamlgraph-${version}"; + pname = "ocamlgraph"; version = "1.8.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix index d6d0c3292bb5..8063f284728b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -6,7 +6,8 @@ let sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8"; in stdenv.mkDerivation { - name = "ocaml-make-${version}"; + pname = "ocaml-make"; + inherit version; src = fetchurl { url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix index 9c4c2e21eddd..468e387f8f11 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -4,11 +4,11 @@ assert lib.versionOlder ocaml.version "4"; stdenv.mkDerivation rec { - name = "ocamlnat-${version}"; + pname = "ocamlnat"; version = "0.1.1"; src = fetchurl { - url = "http://benediktmeurer.de/files/source/${name}.tar.bz2"; + url = "http://benediktmeurer.de/files/source/${pname}-${version}.tar.bz2"; sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix index 6117d30665f0..0452b1b7dfe4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocf/default.nix @@ -4,7 +4,7 @@ if stdenv.lib.versionOlder ocaml.version "4.03" then throw "ocf not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocf-${version}"; + pname = "ocf"; version = "0.5.0"; src = fetchFromGitHub { owner = "zoggy"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 569f5081355c..0263d3284ffa 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -17,7 +17,8 @@ in let inherit (param) version; in stdenv.mkDerivation { - name = "ocsigen-deriving-${version}"; + pname = "ocsigen-deriving"; + inherit version; src = fetchzip { url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; inherit (param) sha256; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 147b4200cf69..9499bff84a10 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { version = "2.11.0"; - name = "ocsigenserver-${version}"; + pname = "ocsigenserver"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index bbe38ac89942..83d47fbb3af8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "piqi-ocaml-${version}"; + pname = "piqi-ocaml"; src = fetchurl { url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix index 6be1595f7c59..fb06820f1961 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.6.14"; - name = "piqi-${version}"; + pname = "piqi"; src = fetchurl { url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix index 38e1b3c7467d..0b3f13bc54f2 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }: stdenv.mkDerivation rec { - name = "ocaml-sqlite3-${version}"; + pname = "ocaml-sqlite3"; version = "2.0.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index 181946802d70..2a29179f4cd4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit +, ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: with stdenv.lib; @@ -11,23 +11,24 @@ then throw "tls is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "0.9.0"; + version = "0.10.4"; name = "ocaml${ocaml.version}-tls-${version}"; src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-tls"; rev = "${version}"; - sha256 = "0qgw8lq8pk9hss7b5i6fr08pi711i0zqx7yyjgcil47ipjig6c31"; + sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ounit ppx_cstruct cstruct-unix ]; - propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ + buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_cstruct ] + ++ optionals doCheck [ ounit cstruct-unix ]; + propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++ optional withLwt lwt; - buildPhase = "${topkg.run} build --tests true --with-mirage false --with-lwt ${if withLwt then "true" else "false"}"; + buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}"; - doCheck = true; + doCheck = versionAtLeast ocaml.version "4.06"; checkPhase = "${topkg.run} test"; inherit (topkg) installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix index ab6a7d8f5235..079e810bfdc6 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.7"; - name = "uuidm-${version}"; + pname = "uuidm"; src = fetchurl { url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index 8d4bd4c82b39..63ddc6e67bdc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -1,28 +1,23 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg -, asn1-combinators, astring, nocrypto, ppx_sexp_conv -, ounit, cstruct-unix +{ lib, fetchurl, buildDunePackage, ocaml +, alcotest, cstruct-unix +, asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-x509-${version}"; - version = "0.6.1"; +buildDunePackage rec { + pname = "x509"; + version = "0.7.1"; src = fetchurl { - url = "https://github.com/mirleft/ocaml-x509/releases/download/${version}/x509-${version}.tbz"; - sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; + url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; + sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; + buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ]; - buildPhase = "${topkg.run} build --tests true"; + doCheck = lib.versionAtLeast ocaml.version "4.06"; - doCheck = true; - checkPhase = "${topkg.run} test"; - - inherit (topkg) installPhase; - - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/pharo/launcher/default.nix b/nixpkgs/pkgs/development/pharo/launcher/default.nix index 8282c38a1e7f..2f633eed7a35 100644 --- a/nixpkgs/pkgs/development/pharo/launcher/default.nix +++ b/nixpkgs/pkgs/development/pharo/launcher/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017.02.28"; - name = "pharo-launcher-${version}"; + pname = "pharo-launcher"; src = fetchurl { url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip"; sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0"; diff --git a/nixpkgs/pkgs/development/pharo/vm/share.nix b/nixpkgs/pkgs/development/pharo/vm/share.nix index 3bd72434eb3c..ec4168508a7b 100644 --- a/nixpkgs/pkgs/development/pharo/vm/share.nix +++ b/nixpkgs/pkgs/development/pharo/vm/share.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "pharo-share-${version}"; + pname = "pharo-share"; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/python-modules/Pygments/default.nix b/nixpkgs/pkgs/development/python-modules/Pygments/default.nix index 75fceb7deedc..cb0986e1d7f0 100644 --- a/nixpkgs/pkgs/development/python-modules/Pygments/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.3.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a"; + sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748"; }; propagatedBuildInputs = [ docutils ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 5769109f7741..049ceb124ea0 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -40,14 +40,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; - # Don't error on cryptography deprecation warning - postPatch = '' - substituteInPlace pytest.ini --replace "filterwarnings = error" "" + checkPhase = '' + pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms" ''; - # coroutine 'noop2' was never awaited - doCheck = false; - meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix index a2a026e74d5b..22bddb252c8e 100644 --- a/nixpkgs/pkgs/development/python-modules/apipkg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest, setuptools_scm, isPy3k }: buildPythonPackage rec { pname = "apipkg"; @@ -19,8 +19,18 @@ buildPythonPackage rec { --replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')" ''; - checkPhase = '' - py.test + # Failing tests on Python 3 + # https://github.com/pytest-dev/apipkg/issues/17 + checkPhase = let + disabledTests = stdenv.lib.optionals isPy3k [ + "test_error_loading_one_element" + "test_aliasmodule_proxy_methods" + "test_eagerload_on_bython" + ]; + testExpression = stdenv.lib.optionalString (disabledTests != []) + "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'"; + in '' + py.test ${testExpression} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/augeas/default.nix b/nixpkgs/pkgs/development/python-modules/augeas/default.nix index de041c0f4c80..12a3529f8645 100644 --- a/nixpkgs/pkgs/development/python-modules/augeas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/augeas/default.nix @@ -2,7 +2,6 @@ buildPythonPackage rec { pname = "augeas"; version = "1.0.3"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "hercules-team"; diff --git a/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 0ccf3da7bec9..7d1e365b243c 100644 --- a/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -1,17 +1,17 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, six, txaio, twisted, zope_interface, cffi, trollius, futures, - mock, pytest + mock, pytest, cryptography, pynacl }: buildPythonPackage rec { pname = "autobahn"; - version = "19.1.1"; + version = "19.8.1"; src = fetchPypi { inherit pname version; - sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff"; + sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304"; }; - propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ + propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ (lib.optionals (!isPy3k) [ trollius futures ]); checkInputs = [ mock pytest ]; @@ -21,6 +21,10 @@ buildPythonPackage rec { runHook postCheck ''; + # Tests do no seem to be compatible yet with pytest 5.1 + # https://github.com/crossbario/autobahn-python/issues/1235 + doCheck = false; + meta = with lib; { description = "WebSocket and WAMP in Python for Twisted and asyncio."; homepage = "https://crossbar.io/autobahn"; diff --git a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix new file mode 100644 index 000000000000..ec66124e3c78 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.2.4"; + pname = "bids-validator"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg"; + }; + + propagatedBuildInputs = [ ]; + + meta = with lib; { + description = "Validator for the Brain Imaging Data Structure"; + homepage = "https://github.com/bids-standard/bids-validator"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 9bd7e586820d..bd19b8eb33e2 100644 --- a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -16,7 +16,7 @@ let visualizationSupport = (pyqtgraph != null); in buildPythonPackage rec { - name = "binwalk-${version}"; + pname = "binwalk"; version = "2.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/nixpkgs/pkgs/development/python-modules/bleach/default.nix index c2b0db61cbb3..7de124267f0e 100644 --- a/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleach/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { substituteInPlace setup.py --replace ",<3dev" "" ''; + # Disable a test + # https://github.com/mozilla/bleach/issues/467 + checkPhase = '' + pytest -k "not test_only_text_is_cleaned" + ''; + meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' diff --git a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index fde330d706f7..7b67997fa08a 100644 --- a/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "blockdiag"; version = "1.5.3"; - name = pname + "-" + version; src = fetchurl { url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index 158a3d318822..d53371221202 100644 --- a/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -1,74 +1,55 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi +, futures +, isPy3k , isPyPy -, mock -, pytest -, flask , jinja2 -, markupsafe -, werkzeug -, itsdangerous -, dateutil -, requests -, six -, pygments -, pystache -, markdown -, pyyaml -, pyzmq -, tornado -, colorama -, isPy3k -, futures -, websocket_client +, lib +, mock , numpy -, pandas -, greenlet -, python -, bkcharts +, nodejs , pillow +, pytest +, python +, python-dateutil +, pyyaml , selenium +, six +, substituteAll +, tornado }: buildPythonPackage rec { pname = "bokeh"; - version = "1.0.4"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "ceeb6a75afc1b2de00c2b8b6da121dec3fb77031326897b80d4375a70e96aebf"; + sha256 = "0m27j29jpi977y95k272xc24qkl5bkniy046cil116hrbgnppng2"; }; - disabled = isPyPy; + patches = [ + (substituteAll { + src = ./hardcode-nodejs-npmjs-paths.patch; + node_bin = "${nodejs}/bin/node"; + npm_bin = "${nodejs}/bin/npm"; + }) + ]; - # Some test that uses tornado fails -# doCheck = false; + disabled = isPyPy; checkInputs = [ mock pytest pillow selenium ]; propagatedBuildInputs = [ pillow - flask jinja2 - markupsafe - werkzeug - itsdangerous - dateutil - requests + python-dateutil six - pygments - pystache - markdown pyyaml - pyzmq tornado - colorama - bkcharts + numpy ] - ++ lib.optionals ( !isPy3k ) [ futures ] - ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ] - ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ]; + ++ lib.optionals ( !isPy3k ) [ futures ]; checkPhase = '' ${python.interpreter} -m unittest discover -s bokeh/tests diff --git a/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch new file mode 100644 index 000000000000..f8f33c0021f2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -0,0 +1,15 @@ +diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py +index a752aad7d..8af05ff63 100644 +--- a/bokeh/util/compiler.py ++++ b/bokeh/util/compiler.py +@@ -442,8 +442,8 @@ def _detect_nodejs(): + raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + + '("conda install nodejs" or follow https://nodejs.org/en/download/)') + +-_nodejs = None +-_npmjs = None ++_nodejs = "@node_bin@" ++_npmjs = "@npm_bin@" + + def _nodejs_path(): + global _nodejs diff --git a/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 203ef9a4355d..34178befebe4 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.160"; # N.B: if you change this, change botocore too + version = "1.9.205"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f"; + sha256 = "1zxz1d6w3f4ip04bm26xplpxjhblc2vfmqcs5n63a9y1h43mk171"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix index e3bbdf22ddf1..5c8b00fc6c15 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.205"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp"; + sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix b/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix index c4db013ea34d..21492dc152cb 100644 --- a/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "Bottleneck"; version = "1.2.1"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/nixpkgs/pkgs/development/python-modules/btchip/default.nix index 6e2e703dd569..069358a4d6d3 100644 --- a/nixpkgs/pkgs/development/python-modules/btchip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/btchip/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "btchip-python"; version = "0.1.28"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix index 2c97cbd4a334..7496e7e1fcce 100644 --- a/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cgroup-utils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "0.6"; pname = "cgroup-utils"; - name = pname + "-" + version; buildInputs = [ pep8 nose ]; # Pep8 tests fail... diff --git a/nixpkgs/pkgs/development/python-modules/cssmin/default.nix b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix new file mode 100644 index 000000000000..7cb01001fac2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cssmin/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cssmin"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dk723nfm2yf8cp4pj785giqlwv42l0kj8rk40kczvq1hk6g04p0"; + }; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python port of the YUI CSS compression algorithm"; + homepage = http://github.com/zacharyvoase/cssmin; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index 67120bf0f3d0..234bb46f97bc 100644 --- a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "cx_Freeze"; version = "5.1.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/nixpkgs/pkgs/development/python-modules/cymem/default.nix index 6862d6447e5f..b3d4a40bf66f 100644 --- a/nixpkgs/pkgs/development/python-modules/cymem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cymem/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "cymem"; version = "2.0.2"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "explosion"; diff --git a/nixpkgs/pkgs/development/python-modules/datashape/default.nix b/nixpkgs/pkgs/development/python-modules/datashape/default.nix index bb2e65125b7d..27665c689c41 100644 --- a/nixpkgs/pkgs/development/python-modules/datashape/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datashape/default.nix @@ -38,6 +38,9 @@ in buildPythonPackage rec { --ignore datashape/tests/test_user.py ''; + # https://github.com/blaze/datashape/issues/238 + PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'"; + meta = { homepage = https://github.com/ContinuumIO/datashape; description = "A data description language"; diff --git a/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix b/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix new file mode 100644 index 000000000000..3521e8ce1298 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, pexpect +, pytest +}: + +buildPythonPackage rec { + version = "0.1.1"; + pname = "delegator.py"; + + src = fetchFromGitHub { + owner = "amitt001"; + repo = "delegator.py"; + rev = "v${version}"; + sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb"; + }; + + propagatedBuildInputs = [ pexpect ]; + + # no tests in github or pypi + doCheck = false; + + meta = with lib; { + description = "Subprocesses for Humans 2.0"; + homepage = "https://github.com/amitt001/delegator.py"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix new file mode 100644 index 000000000000..096215a70abf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-paintstore/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, requests_oauthlib +, django, python3-openid }: + +buildPythonPackage rec { + pname = "django-paintstore"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "12wxgwv1qbkfq7w5i7bm7aidv655c2sxp0ym73qf8606dxbjcwwg"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Django app that integrates jQuery ColorPicker with the Django admin"; + homepage = https://github.com/gsiegman/django-paintstore; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/nixpkgs/pkgs/development/python-modules/django-q/default.nix new file mode 100644 index 000000000000..f671674ffe2e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, django-picklefield, arrow +, blessed, django, future }: + +buildPythonPackage rec { + pname = "django-q"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17mqxiacsp2yszak6j48fm7vx0w44pcg86flc63r9y5yhx490n5r"; + }; + + propagatedBuildInputs = [ + django-picklefield arrow blessed django future + ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A multiprocessing distributed task queue for Django"; + homepage = https://django-q.readthedocs.org; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django/1_8.nix b/nixpkgs/pkgs/development/python-modules/django/1_8.nix index a459e3c0e10b..9baafed4b75d 100644 --- a/nixpkgs/pkgs/development/python-modules/django/1_8.nix +++ b/nixpkgs/pkgs/development/python-modules/django/1_8.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { - name = "Django-${version}"; + pname = "Django"; version = "1.8.19"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; + url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz"; sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k"; }; diff --git a/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/nixpkgs/pkgs/development/python-modules/dyn/default.nix index 5c0e57cddc02..6e03a33f29b6 100644 --- a/nixpkgs/pkgs/development/python-modules/dyn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dyn/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "dyn"; version = "1.8.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/edward/default.nix b/nixpkgs/pkgs/development/python-modules/edward/default.nix index b09bef9fec4e..1ad5ea1ab3b3 100644 --- a/nixpkgs/pkgs/development/python-modules/edward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/edward/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "edward"; version = "1.3.5"; - name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); diff --git a/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/nixpkgs/pkgs/development/python-modules/execnet/default.nix index 4e1b78f80be9..c7766802e4e4 100644 --- a/nixpkgs/pkgs/development/python-modules/execnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/execnet/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "execnet"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm"; + sha256 = "3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/first/default.nix b/nixpkgs/pkgs/development/python-modules/first/default.nix index 3b91fb717bc4..de7342d67ca0 100644 --- a/nixpkgs/pkgs/development/python-modules/first/default.nix +++ b/nixpkgs/pkgs/development/python-modules/first/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "first"; version = "2.0.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/fx2/default.nix b/nixpkgs/pkgs/development/python-modules/fx2/default.nix new file mode 100644 index 000000000000..fa5edc1077c6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fx2/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, python +, fetchFromGitHub +, sdcc +, libusb1 +, crcmod +}: + +buildPythonPackage { + pname = "fx2"; + version = "unstable-2019-08-27"; + + src = fetchFromGitHub { + owner = "whitequark"; + repo = "libfx2"; + rev = "dd1e42c7b46ff410dbb18beab46111bb5491400c"; + sha256 = "0xvlmx6ym0ylrvnlqzf18d475wa0mfci7wkdbv30gl3hgdhsppjz"; + }; + + nativeBuildInputs = [ sdcc ]; + + propagatedBuildInputs = [ libusb1 crcmod ]; + + preBuild = '' + cd software + ${python.pythonForBuild.interpreter} setup.py build_ext + ''; + + preInstall = '' + mkdir -p $out/share/libfx2 + cp -R ../firmware/library/{.stamp,lib,include,fx2{rules,conf}.mk} \ + $out/share/libfx2 + ''; + + # installCheckPhase tries to run build_ext again and there are no tests + doCheck = false; + + meta = with lib; { + description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers"; + homepage = https://github.com/whitequark/libfx2; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index a9ac85e6248b..de313dc1c7d6 100644 --- a/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "geopandas"; version = "0.5.1"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; diff --git a/nixpkgs/pkgs/development/python-modules/glances/default.nix b/nixpkgs/pkgs/development/python-modules/glances/default.nix index 95c64e7187b0..0f4bb4ce9c47 100644 --- a/nixpkgs/pkgs/development/python-modules/glances/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glances/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - name = "glances-${version}"; + pname = "glances"; version = "3.1.2"; disabled = isPyPy; diff --git a/nixpkgs/pkgs/development/python-modules/glasgow/default.nix b/nixpkgs/pkgs/development/python-modules/glasgow/default.nix new file mode 100644 index 000000000000..264a13aed5e7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/glasgow/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sdcc +, nmigen +, fx2 +, libusb1 +, aiohttp +, pyvcd +, bitarray +, crcmod +, yosys +, icestorm +, nextpnr +}: + +buildPythonPackage rec { + pname = "glasgow"; + version = "unstable-2019-08-31"; + realVersion = lib.substring 0 7 src.rev; + + src = fetchFromGitHub { + owner = "GlasgowEmbedded"; + repo = "Glasgow"; + rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca"; + sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v"; + }; + + nativeBuildInputs = [ sdcc ]; + + propagatedBuildInputs = [ + nmigen + fx2 + libusb1 + aiohttp + pyvcd + bitarray + crcmod + ]; + + postPatch = '' + substituteInPlace software/setup.py \ + --replace 'versioneer.get_version()' '"${realVersion}"' + ''; + + preBuild = '' + make -C firmware LIBFX2=${fx2}/share/libfx2 + cp firmware/glasgow.ihex software/glasgow + cd software + ''; + + # a couple failing tests and also installCheck tries to build_ext again + doInstallCheck = false; + doCheck = false; + + checkPhase = '' + python -m unittest discover + ''; + + meta = with lib; { + description = "Software for Glasgow, a digital interface multitool"; + homepage = https://github.com/GlasgowEmbedded/Glasgow; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gpy/default.nix b/nixpkgs/pkgs/development/python-modules/gpy/default.nix index 8bbcaed377a8..2a65df18fa54 100644 --- a/nixpkgs/pkgs/development/python-modules/gpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpy/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "GPy"; version = "1.9.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix index 85c5c011dfd9..58d5c414cf0a 100644 --- a/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { --replace "coverage>=4.0,<4.4" "coverage" ''; + # Test failures but patch does not apply cleanly + # https://github.com/benoitc/gunicorn/commit/f38f717539b1b7296720805b8ae3969c3509b9c1 + doCheck = false; + meta = with stdenv.lib; { homepage = https://pypi.python.org/pypi/gunicorn; description = "WSGI HTTP Server for UNIX"; diff --git a/nixpkgs/pkgs/development/python-modules/handout/default.nix b/nixpkgs/pkgs/development/python-modules/handout/default.nix new file mode 100644 index 000000000000..9a3980806095 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/handout/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, imageio, imageio-ffmpeg }: + +buildPythonPackage rec { + pname = "handout"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16y1wqx8j4kf6fa94x22njrkdfb2cfi0dvc7a4q2qsa8m3ri0b43"; + }; + + propagatedBuildInputs = [ imageio imageio-ffmpeg ]; + + meta = with stdenv.lib; { + description = "Turn Python scripts into handouts with Markdown and figures"; + homepage = "https://github.com/danijar/handout"; + license = licenses.gpl3; + maintainers = with maintainers; [ averelld ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix index cfaaa5636113..51d42e5c8b73 100644 --- a/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "hcs_utils"; version = "2.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix index 9938d4053879..32c79b171366 100644 --- a/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "hmmlearn"; version = "0.2.2"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; + url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4"; }; diff --git a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix index c4afe809cfb6..59528723d80d 100644 --- a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix @@ -16,7 +16,7 @@ let components = { in stdenv.mkDerivation rec { version = "2.3.4"; - name = "hoomd-blue-${version}"; + pname = "hoomd-blue"; src = fetchgit { url = "https://bitbucket.org/glotzer/hoomd-blue"; diff --git a/nixpkgs/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix index c7f6e5c82194..f89b7ab1ce62 100644 --- a/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -4,28 +4,31 @@ , appdirs , dask , holoviews +, hvplot , jinja2 , msgpack-numpy , msgpack-python , numpy , pandas +, panel , python-snappy , requests , ruamel_yaml , six , tornado , pytest -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "intake"; - version = "0.4.4"; - disabled = isPy27; + version = "0.5.3"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3fc1b7c2949c9b4200ecbbfdff17da126981a1d8d95ccb7b7bcca3e3dd849d5e"; + sha256 = "1mbjr4xl4i523bg8k08s5986v2289fznd8cr3j3czn5adi8519j7"; }; checkInputs = [ pytest ]; @@ -33,11 +36,13 @@ buildPythonPackage rec { appdirs dask holoviews + hvplot jinja2 msgpack-numpy msgpack-python numpy pandas + panel python-snappy requests ruamel_yaml @@ -45,10 +50,15 @@ buildPythonPackage rec { tornado ]; + postPatch = '' + # Is in setup_requires but not used in setup.py... + substituteInPlace setup.py --replace "'pytest-runner'" "" + ''; + + # test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball + # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball checkPhase = '' - # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball - # test_which assumes python for executable name - PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_filtered_compressed_cache and not test_which" + PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_discover and not test_filtered_compressed_cache" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix index 81301f337e62..e22ab22d5a76 100644 --- a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix @@ -2,7 +2,7 @@ , pbr, ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { - name = "ldappool-${version}"; + pname = "ldappool"; version = "2.4.1"; src = fetchPypi { diff --git a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix index 6babc6ae0145..40a4f6f7429f 100644 --- a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix @@ -18,7 +18,6 @@ assert cudaSupport -> nvidia_x11 != null buildPythonPackage rec { pname = "libgpuarray"; version = "0.7.5"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "Theano"; diff --git a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix index 745f83fe5081..c456d67ac498 100644 --- a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix @@ -8,7 +8,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "libsoundtouch"; version = "0.4.0"; diff --git a/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/nixpkgs/pkgs/development/python-modules/llfuse/default.nix index 7f9aa3fa2e48..6a4973584044 100644 --- a/nixpkgs/pkgs/development/python-modules/llfuse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llfuse/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "llfuse"; version = "1.3.6"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2"; sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii"; }; diff --git a/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix new file mode 100644 index 000000000000..fd89260ab94b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }: + +buildPythonPackage rec { + pname = "mailman-hyperkitty"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; + }; + + propagatedBuildInputs = [ mailman ]; + checkInputs = [ mock ]; + + checkPhase = '' + python -m nose2 -v + ''; + doCheck = false; + + meta = with stdenv.lib; { + description = "Mailman archiver plugin for HyperKitty"; + homepage = https://gitlab.com/mailman/mailman-hyperkitty; + license = licenses.gpl3; + maintainers = with maintainers; [ globin peti ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/moto/default.nix b/nixpkgs/pkgs/development/python-modules/moto/default.nix index 04381d73834f..876b57dd01fa 100644 --- a/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch , aws-xray-sdk , backports_tempfile , boto @@ -26,13 +26,21 @@ buildPythonPackage rec { pname = "moto"; - version = "1.3.10"; + version = "1.3.13"; src = fetchPypi { inherit pname version; - sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj"; + sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m"; }; + # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198. + patches = [ + (fetchpatch { + url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff"; + sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb"; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "jsondiff==1.1.2" "jsondiff~=1.1" diff --git a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix index 76494c70b2ea..365f741c57fa 100644 --- a/nixpkgs/pkgs/development/python-modules/nibabel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nibabel/default.nix @@ -2,20 +2,20 @@ , buildPythonPackage , fetchPypi , isPy3k -, numpy -, six , bz2file -, nose , mock +, nose +, numpy +, six }: buildPythonPackage rec { pname = "nibabel"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17"; + sha256 = "07v1gsq1v43v0z06cnp82ij9sqx3972c9bc6vsdj7pa9ddpa2yjw"; }; propagatedBuildInputs = [ @@ -25,16 +25,8 @@ buildPythonPackage rec { checkInputs = [ nose mock ]; - checkPhase = let - excludeTests = lib.optionals isPy3k [ - # https://github.com/nipy/nibabel/issues/691 - "nibabel.gifti.tests.test_giftiio.test_read_deprecated" - "nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays" - "nibabel.tests.test_minc1.test_old_namespace" - ]; - # TODO: Add --with-doctest once all doctests pass - in '' - nosetests ${lib.concatMapStrings (test: "-e '${test}' ") excludeTests} + checkPhase = '' + nosetests ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index e45a0033c82a..2da580abd926 100644 --- a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "nilearn"; version = "0.5.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 42fb2de9dca6..5f33a5fe63ca 100644 --- a/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -16,6 +16,7 @@ , packaging , prov , psutil +, pybids , pydot , pytest , pytest_xdist @@ -44,11 +45,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.9"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016"; + sha256 = "09azgfmb0992c3xqmi7n93pz95i4v37vc9kqmjh8c9jjxjzszdd5"; }; postPatch = '' @@ -79,6 +80,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pybids codecov glibcLocales mock @@ -89,13 +91,11 @@ buildPythonPackage rec { which ]; + # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest -v --doctest-modules nipype + LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' ''; - # See: https://github.com/nipy/nipype/issues/2839 - doCheck = false; - meta = with stdenv.lib; { homepage = https://nipy.org/nipype/; description = "Neuroimaging in Python: Pipelines and Interfaces"; diff --git a/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix new file mode 100644 index 000000000000..4151d08b60f4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nmigen-boards/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nmigen +}: + +buildPythonPackage rec { + pname = "nmigen-boards"; + version = "unstable-2019-08-30"; + realVersion = lib.substring 0 7 src.rev; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "nmigen-boards"; + rev = "3b80b3a3749ae8f123ff258a25e81bd21412aed4"; + sha256 = "01qynxip8bq23jfjc5wjd97vxfvhld2zb8sxphwf0zixrmmyaspi"; + }; + + propagatedBuildInputs = [ nmigen ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'versioneer.get_version()' '"${realVersion}"' + ''; + + meta = with lib; { + description = "Board and connector definitions for nMigen"; + homepage = https://github.com/m-labs/nmigen-boards; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix new file mode 100644 index 000000000000..7375eda43271 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pyvcd +, bitarray +, jinja2 + +# nmigen.{test,build} call out to these +, yosys +, symbiyosys +, nextpnr ? null +, icestorm ? null +, trellis ? null + +# for tests +, yices +}: + +buildPythonPackage rec { + pname = "nmigen"; + version = "unstable-2019-08-31"; + realVersion = lib.substring 0 7 src.rev; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "nmigen"; + rev = "2e206220462c67aa6ae97f7515a2191440fd61b3"; + sha256 = "0y3w6vd493jqm9b8ppgwzs02v1al8w1n5gylljlsw70ci7fyk4qa"; + }; + + disabled = pythonOlder "3.6"; + + propagatedBuildInputs = [ pyvcd bitarray jinja2 ]; + + checkInputs = [ yosys yices ]; + + postPatch = let + tool = pkg: name: + if pkg == null then {} else { "${name}" = "${pkg}/bin/${name}"; }; + + # Only FOSS toolchain supported out of the box, sorry! + toolchainOverrides = + tool yosys "yosys" // + tool symbiyosys "sby" // + tool nextpnr "nextpnr-ice40" // + tool nextpnr "nextpnr-ecp5" // + tool icestorm "icepack" // + tool trellis "ecppack"; + in '' + substituteInPlace setup.py \ + --replace 'versioneer.get_version()' '"${realVersion}"' + + substituteInPlace nmigen/_toolchain.py \ + --replace 'overrides = {}' \ + 'overrides = ${builtins.toJSON toolchainOverrides}' + ''; + + meta = with lib; { + description = "A refreshed Python toolbox for building complex digital hardware"; + homepage = https://github.com/m-labs/nmigen; + license = licenses.bsd0; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/notify/default.nix b/nixpkgs/pkgs/development/python-modules/notify/default.nix index 5dd953808910..6aadd7f4533d 100644 --- a/nixpkgs/pkgs/development/python-modules/notify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notify/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "python-notify-${version}"; + pname = "python-notify"; version = "0.1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/python-modules/num2words/default.nix b/nixpkgs/pkgs/development/python-modules/num2words/default.nix new file mode 100644 index 000000000000..bce4c0426e40 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/num2words/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, lib +, fetchPypi +, docopt +, delegator-py +, pytest +}: + +buildPythonPackage rec { + version = "0.5.10"; + pname = "num2words"; + + src = fetchPypi { + inherit pname version; + sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p"; + }; + + propagatedBuildInputs = [ docopt ]; + + checkInputs = [ delegator-py pytest ]; + + checkPhase = '' + pytest -k 'not cli_with_lang' + ''; + + meta = with lib; { + description = "Modules to convert numbers to words. 42 --> forty-two"; + homepage = "https://github.com/savoirfairelinux/num2words"; + license = licenses.lgpl21; + maintainers = with maintainers; [ jonringer ]; + + longDescription = + "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix index 7fb1de53dbd9..7e34f3897bc5 100644 --- a/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "nwdiag"; version = "1.0.4"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; + url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz"; sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa"; }; diff --git a/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/nixpkgs/pkgs/development/python-modules/ovito/default.nix index 73230b2e8fb3..4c0d4346ee79 100644 --- a/nixpkgs/pkgs/development/python-modules/ovito/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ovito/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 # This is not the "released" 3.0.0 just a commit version = "3.0.0"; - name = "ovito-${version}"; + pname = "ovito"; src = fetchgit { url = "https://gitlab.com/stuko/ovito"; diff --git a/nixpkgs/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix index fccd46c605db..4c88f0e1e4b7 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -11,18 +11,13 @@ buildPythonPackage rec { pname = "panel"; - version = "0.4.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98"; + sha256 = "04w8jjlf7yz3k84xnacahczc9mmddqyp756rj3n8hclks9c1ww40"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "testpath<0.4" "testpath" - ''; - propagatedBuildInputs = [ bokeh param diff --git a/nixpkgs/pkgs/development/python-modules/param/default.nix b/nixpkgs/pkgs/development/python-modules/param/default.nix index 69a2e61e2690..cb27fdb64e5f 100644 --- a/nixpkgs/pkgs/development/python-modules/param/default.nix +++ b/nixpkgs/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.8.2"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01"; + sha256 = "1dbnviszdq3d2k3dfwpimb0adf27yzwm4iyv42rk8xvd8c6p9gdi"; }; checkInputs = [ flake8 nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/paramz/default.nix b/nixpkgs/pkgs/development/python-modules/paramz/default.nix index 0183379ac004..029ce4a1712d 100644 --- a/nixpkgs/pkgs/development/python-modules/paramz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paramz/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "paramz"; version = "0.9.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/passlib/default.nix b/nixpkgs/pkgs/development/python-modules/passlib/default.nix index 24539c7bbcef..6f82c446a1ff 100644 --- a/nixpkgs/pkgs/development/python-modules/passlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/passlib/default.nix @@ -8,7 +8,6 @@ buildPythonPackage rec { pname = "passlib"; version = "1.7.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/path.py/2.nix b/nixpkgs/pkgs/development/python-modules/path.py/2.nix new file mode 100644 index 000000000000..318642a393a3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/path.py/2.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytest-flake8 +, glibcLocales +, packaging +, isPy27 +, backports_os +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "path.py"; + version = "11.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; + }; + + checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + importlib-metadata + ] ++ lib.optional isPy27 backports_os + ; + + LC_ALL = "en_US.UTF-8"; + + meta = { + description = "A module wrapper for os.path"; + homepage = https://github.com/jaraco/path.py; + license = lib.licenses.mit; + }; + + checkPhase = '' + # ignore performance test which may fail when the system is under load + py.test -v -k 'not TestPerformance' + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/path.py/default.nix b/nixpkgs/pkgs/development/python-modules/path.py/default.nix index 318642a393a3..d3c3206fabaf 100644 --- a/nixpkgs/pkgs/development/python-modules/path.py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/path.py/default.nix @@ -9,15 +9,16 @@ , isPy27 , backports_os , importlib-metadata +, fetchpatch }: buildPythonPackage rec { pname = "path.py"; - version = "11.5.2"; + version = "12.0.1"; src = fetchPypi { inherit pname version; - sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa"; + sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f"; }; checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; @@ -39,4 +40,12 @@ buildPythonPackage rec { # ignore performance test which may fail when the system is under load py.test -v -k 'not TestPerformance' ''; + + patches = [ + (fetchpatch { + url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch; + sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9"; + }) + ]; + } diff --git a/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix index 39a2789a360f..8fb6259c5749 100644 --- a/nixpkgs/pkgs/development/python-modules/pathspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "pathspec"; version = "0.5.9"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index b9c4a62f0de0..6d2e8169eb76 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.16"; + version = "8.10.17"; src = fetchPypi { inherit pname version; - sha256 = "1cfkyz991nbqsak3mdwybaxvzqbdcqivxnl84n8p4dyi5lk45v4b"; + sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index c2662915b12d..025b17d19ae9 100644 --- a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.1.0"; + version = "1.6.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; + sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z"; }; buildInputs = [ @@ -55,8 +55,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml lxml ]; postPatch = '' - substituteInPlace requirements/test.txt \ - --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" + sed -i \ + -e 's/^pytest .*/pytest/g' \ + -e 's/^attrs .*/attrs/g' \ + -e 's/^hypothesis .*/hypothesis/g' \ + requirements/test.txt ''; preBuild = '' @@ -70,4 +73,3 @@ buildPythonPackage rec { maintainers = [ maintainers.kiwi ]; }; } - diff --git a/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/nixpkgs/pkgs/development/python-modules/powerline/default.nix index b35c9de19dcc..f8db636520fb 100644 --- a/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -11,11 +11,10 @@ buildPythonPackage rec { version = "2.7"; pname = "powerline"; - name = pname + "-" + version; src = fetchurl { url = "https://github.com/powerline/powerline/archive/${version}.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5"; }; diff --git a/nixpkgs/pkgs/development/python-modules/py/default.nix b/nixpkgs/pkgs/development/python-modules/py/default.nix index 20d3eb31b0f7..e54fd1521b3e 100644 --- a/nixpkgs/pkgs/development/python-modules/py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: + buildPythonPackage rec { pname = "py"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694"; + sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw"; }; # Circular dependency on pytest diff --git a/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/nixpkgs/pkgs/development/python-modules/pybids/default.nix new file mode 100644 index 000000000000..8779ad36ca2a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, lib +, fetchPypi +, isPy27 +, num2words +, numpy +, scipy +, pandas +, nibabel +, patsy +, bids-validator +, sqlalchemy +, pytest +, pathlib +}: + +buildPythonPackage rec { + version = "0.9.2"; + pname = "pybids"; + + src = fetchPypi { + inherit pname version; + sha256 = "16c0v800yklp043prbrx1357vx1mq5gddxz5zqlcnf4akhzcqrxs"; + }; + + propagatedBuildInputs = [ + num2words + numpy + scipy + pandas + nibabel + patsy + bids-validator + sqlalchemy + ]; + + checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python tools for querying and manipulating BIDS datasets"; + homepage = https://github.com/bids-standard/pybids; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix index f49c50185db7..1b89cb5ada7f 100644 --- a/nixpkgs/pkgs/development/python-modules/pybind11/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4"; + sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix index eb6de23e0eaa..1cd95c83fa2e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyblock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyblock/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "pyblock-${version}"; + pname = "pyblock"; version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = pkgs.fetchurl rec { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix b/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix index 192d60cec46a..c441cea5f45d 100644 --- a/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix +++ b/nixpkgs/pkgs/development/python-modules/pycuda/compyte.nix @@ -5,7 +5,6 @@ mkDerivation rec { pname = "compyte"; version = "git-20150817"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "inducer"; diff --git a/nixpkgs/pkgs/development/python-modules/pyev/default.nix b/nixpkgs/pkgs/development/python-modules/pyev/default.nix index e393265ae37f..b5ca0c7ef6cf 100644 --- a/nixpkgs/pkgs/development/python-modules/pyev/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyev/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "pyev"; version = "0.9.0"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/p/pyev/${name}.tar.gz"; + url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz"; sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix b/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix index 2b20ba956009..bf92f7360ddb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyftgl/default.nix @@ -12,11 +12,10 @@ in buildPythonPackage rec { pname = "pyftgl"; version = "0.4b"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "umlaeute"; - repo = name; + repo = "${pname}-${version}"; rev = version; sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pygobject/default.nix b/nixpkgs/pkgs/development/python-modules/pygobject/default.nix index 4826db3a8c02..d685e3541f94 100644 --- a/nixpkgs/pkgs/development/python-modules/pygobject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygobject/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { pname = "pygobject"; version = "2.28.6"; format = "other"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; + url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; }; @@ -31,7 +30,7 @@ buildPythonPackage rec { # used to select a specific version, in our setup it should have no # effect, but we leave it in case somebody expects and calls it. postInstall = '' - mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth} + mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} # Prevent wrapping of codegen files as these are meant to be # executed by the python program diff --git a/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix b/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix index a03be0ac04df..947b5733a7e5 100644 --- a/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygtksourceview/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "pygtksourceview"; format = "other"; version = "2.10.1"; - name = pname + "-" + version; src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix b/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix index c02c0361cf28..10bfb0d72b6f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytestcov pytest ]; + postPatch = '' + substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" + ''; + meta = with lib; { description = "JSON Web Token implementation in Python"; homepage = https://github.com/jpadilla/pyjwt; diff --git a/nixpkgs/pkgs/development/python-modules/pykde4/default.nix b/nixpkgs/pkgs/development/python-modules/pykde4/default.nix index 850e64000738..4a5a5c5e1f97 100644 --- a/nixpkgs/pkgs/development/python-modules/pykde4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykde4/default.nix @@ -16,10 +16,10 @@ let }); in stdenv.mkDerivation rec { version = "4.14.3"; - name = "pykde4-${version}"; + pname = "pykde4"; src = fetchurl { - url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz"; + url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz"; sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pykde4/kdelibs.nix b/nixpkgs/pkgs/development/python-modules/pykde4/kdelibs.nix index 073a2e624a5f..9803e7800c37 100644 --- a/nixpkgs/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/nixpkgs/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { version = "4.14.38"; - name = "kdelibs-${version}"; + pname = "kdelibs"; src = fetchurl { - url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz"; + url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz"; sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix b/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix index 97fbe28e50d7..f366f6e57f60 100644 --- a/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pylibacl"; version = "0.5.3"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix index fb2e9abe0651..1561c3c4d6de 100644 --- a/nixpkgs/pkgs/development/python-modules/pynacl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynacl/default.nix @@ -35,6 +35,9 @@ buildPythonPackage rec { py.test ''; + # https://github.com/pyca/pynacl/issues/550 + PYTEST_ADDOPTS = "-k 'not test_wrong_types'"; + meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; diff --git a/nixpkgs/pkgs/development/python-modules/pyocr/default.nix b/nixpkgs/pkgs/development/python-modules/pyocr/default.nix index 47a73c9c80af..ca606767f4d5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyocr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyocr/default.nix @@ -5,7 +5,6 @@ buildPythonPackage rec { pname = "pyocr"; version = "0.5.3"; - name = pname + "-" + version; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. diff --git a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix index 1a477ab23284..3defe979d378 100644 --- a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - name = "pyparted-${version}"; + pname = "pyparted"; version = "3.10.7"; disabled = isPyPy; diff --git a/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix index 76503122a1b1..0313632e6fd1 100644 --- a/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypillowfight/default.nix @@ -2,7 +2,7 @@ , isPy3k, isPyPy }: buildPythonPackage rec { - name = "pypillowfight-${version}"; + pname = "pypillowfight"; version = "0.2.4"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix index 65ff765a5849..8851b0464146 100644 --- a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix @@ -13,8 +13,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "Pyro4"; version = "4.75"; diff --git a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix index a2b614ba3b8c..cabb96d22565 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.14.11"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"; + sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix new file mode 100644 index 000000000000..088f8702436f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +}: + +buildPythonPackage rec { + version = "1.0.4"; + pname = "pytest-random-order"; + + src = fetchPypi { + inherit pname version; + sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ pytest ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jbasko/pytest-random-order"; + description = "Randomise the order of tests with some control over the randomness"; + license = licenses.mit; + maintainers = [ maintainers.prusnak ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix index b61bc8d5fa50..a2796fba5d8f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }: +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest +, setuptools_scm, pytest-forked, filelock, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; @@ -13,6 +14,10 @@ buildPythonPackage rec { checkInputs = [ pytest filelock ]; propagatedBuildInputs = [ execnet pytest-forked six ]; + # Encountered a memory leak + # https://github.com/pytest-dev/pytest-xdist/issues/462 + doCheck = !isPy3k; + checkPhase = '' # Excluded tests access file system py.test testing -k "not test_distribution_rsyncdirs_example \ diff --git a/nixpkgs/pkgs/development/python-modules/pytest/3.10.nix b/nixpkgs/pkgs/development/python-modules/pytest/2.nix index 2b4dd41bc2ec..7a43a2e2517b 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/3.10.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/2.nix @@ -1,9 +1,9 @@ { stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock, writeText, pathlib2 +, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "3.10.1"; + version = "4.6.5"; pname = "pytest"; preCheck = '' @@ -13,18 +13,19 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"; + sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347"; }; checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 96001a2d952e..7866454a62fa 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.3"; + version = "5.1.0"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45"; + sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031"; }; checkInputs = [ hypothesis mock ]; @@ -23,9 +23,10 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 47e269c2ff50..beb57ac491af 100644 --- a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -3,11 +3,11 @@ # Should be bumped along with EFL! buildPythonPackage rec { - name = "python-efl-${version}"; + pname = "python-efl"; version = "1.22.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; + url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63"; }; diff --git a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix index 4eb2daaf26dc..a9377c4a1c21 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix @@ -25,6 +25,9 @@ buildPythonPackage rec { py.test ''; + # https://github.com/mpdavis/python-jose/issues/149 + PYTEST_ADDOPTS = "-k 'not test_invalid_claims_json and not test_invalid_claims'"; + propagatedBuildInputs = [ future six ecdsa rsa ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix b/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix index c7709c4886d9..e967ba9934d2 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "2.1.6"; + version = "2.1.10"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1gx228946c2w645sh190m7ixfd0zfkdl3i8ybga77jz2sn1chzdi"; + sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; }; buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix index 1ff1f6512645..24f56ae53b24 100644 --- a/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "python-fedora"; version = "0.10.0"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix b/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix index f667e09892c1..7a137f5204ce 100644 --- a/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "pyxattr"; version = "0.6.1"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix index 91c2009744f7..06010b40ed96 100644 --- a/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qscintilla/default.nix @@ -11,7 +11,7 @@ disabledIf (isPy3k || isPyPy) (buildPythonPackage rec { # TODO: Qt5 support - name = "qscintilla-${version}"; + pname = "qscintilla"; version = pkgs.qscintilla.version; format = "other"; diff --git a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix index aaa095c53980..9644055b0071 100644 --- a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "python-recursive-pth-loader"; version = "1.0"; - name = pname + "-" + version; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix new file mode 100644 index 000000000000..81428b44ad98 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/robot-detection/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "robot-detection"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xd2jm3yn31bnk1kqzggils2rxj26ylxsfz3ap7bhr3ilhnbg3rx"; + }; + + propagatedBuildInputs = [ six ]; + + # no tests in archive + doCheck = false; + + meta = with stdenv.lib; { + description = "Library for detecting if a HTTP User Agent header is likely to be a bot"; + homepage = https://github.com/rory/robot-detection; + license = licenses.gpl3Plus; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix index 8bac32ba9112..4db1db04acce 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-ride/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { version = "1.2.3"; pname = "robotframework-ride"; disabled = isPy3k; - name = pname + "-" + version; src = fetchurl { - url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz"; sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; }; diff --git a/nixpkgs/pkgs/development/python-modules/rpkg/default.nix b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix index 3164be5aa86d..bbe20fd1e825 100644 --- a/nixpkgs/pkgs/development/python-modules/rpkg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpkg/default.nix @@ -4,12 +4,11 @@ buildPythonPackage rec { pname = "rpkg"; version = "1.50"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { - url = "https://releases.pagure.org/rpkg/${name}.tar.gz"; + url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz"; sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv"; }; diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index a69ab0d27a3c..934889170174 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a"; + sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5"; }; checkInputs = [ nose pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix index 079e88378c07..7bb66be3096e 100644 --- a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix @@ -6,8 +6,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "selectors34"; version = "1.2"; diff --git a/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix index 158d9a054df9..1f6307f2cbbf 100644 --- a/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix @@ -5,10 +5,9 @@ buildPythonPackage rec { pname = "seqdiag"; version = "0.9.6"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; + url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz"; sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf"; }; diff --git a/nixpkgs/pkgs/development/python-modules/serpent/default.nix b/nixpkgs/pkgs/development/python-modules/serpent/default.nix index 5ea59eb6a2a3..887d0c544245 100644 --- a/nixpkgs/pkgs/development/python-modules/serpent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/serpent/default.nix @@ -9,8 +9,6 @@ }: buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "serpent"; version = "1.27"; diff --git a/nixpkgs/pkgs/development/python-modules/smugline/default.nix b/nixpkgs/pkgs/development/python-modules/smugline/default.nix index ac625cf1fa04..514a3005725e 100644 --- a/nixpkgs/pkgs/development/python-modules/smugline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smugline/default.nix @@ -8,7 +8,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "smugline"; version = "20160106"; diff --git a/nixpkgs/pkgs/development/python-modules/smugpy/default.nix b/nixpkgs/pkgs/development/python-modules/smugpy/default.nix index 5eb8d77a244d..c2028228c31c 100644 --- a/nixpkgs/pkgs/development/python-modules/smugpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smugpy/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - name = pname + "-" + version; pname = "smugpy"; version = "20131218"; diff --git a/nixpkgs/pkgs/development/python-modules/sphfile/default.nix b/nixpkgs/pkgs/development/python-modules/sphfile/default.nix index 3309f1e9978f..f1455f945a9f 100644 --- a/nixpkgs/pkgs/development/python-modules/sphfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphfile/default.nix @@ -3,10 +3,9 @@ buildPythonPackage rec { pname = "sphfile"; version = "1.0.1"; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/s/sphfile/${name}.tar.gz"; + url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz"; sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8"; }; diff --git a/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index 9a414e31360b..70471aedbd76 100644 --- a/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "spotipy"; version = "2.4.4"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index c7ff2e56f02b..beb19b64f5ff 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,41 +1,29 @@ -{ lib -, fetchPypi -, fetchpatch -, buildPythonPackage -, pytest +{ lib, fetchPypi, buildPythonPackage, isPy3k , mock -, isPy3k , pysqlite +, pytest }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.2.14"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04"; + sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1"; }; - patches = [ - # fix for failing doc tests - # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail - (fetchpatch { - name = "doc-test-fixes.patch"; - url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw; - sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri"; - }) - ]; - checkInputs = [ pytest mock -# Disable pytest_xdist tests for now, because our version seems to be too new. -# pytest_xdist ] ++ lib.optional (!isPy3k) pysqlite; + postInstall = '' + sed -e 's:--max-worker-restart=5::g' -i setup.cfg + ''; + checkPhase = '' - py.test -k "not test_round_trip_direct_type_affinity" + pytest test ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/sybase/default.nix b/nixpkgs/pkgs/development/python-modules/sybase/default.nix index 51c80e0fa910..7821c7b3d743 100644 --- a/nixpkgs/pkgs/development/python-modules/sybase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sybase/default.nix @@ -8,11 +8,10 @@ buildPythonPackage rec { pname = "python-sybase"; version = "0.40pre2"; - name = pname + "-" + version; disabled = isPy3k; src = fetchurl { - url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz"; + url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j"; }; diff --git a/nixpkgs/pkgs/development/python-modules/systemd/default.nix b/nixpkgs/pkgs/development/python-modules/systemd/default.nix index ec5b3b325dd2..cbe2a2131918 100644 --- a/nixpkgs/pkgs/development/python-modules/systemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/systemd/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "systemd"; version = "234"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "systemd"; diff --git a/nixpkgs/pkgs/development/python-modules/tempita/default.nix b/nixpkgs/pkgs/development/python-modules/tempita/default.nix index 318c47d21608..4eff644a1616 100644 --- a/nixpkgs/pkgs/development/python-modules/tempita/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempita/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { version = "0.5.3-2016-09-28"; - name = "tempita-${version}"; + pname = "tempita"; src = fetchFromGitHub { owner = "gjhiggins"; diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 899e89368436..5f808bafe6f1 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -58,8 +58,23 @@ let variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; - # TODO: remove after there's support for setupPyDistFlags - setuppy = ../../../development/interpreters/python/run_setup.py; + pythonEnv = python.withPackages (_: + [ # python deps needed during wheel build time + numpy + keras-preprocessing + protobuf + wrapt + gast + astor + absl-py + termcolor + keras-applications + setuptools + wheel + ] ++ lib.optionals (!isPy3k) + [ future + mock + ]); bazel-build = buildBazelPackage rec { name = "${pname}-${version}"; @@ -96,27 +111,15 @@ let # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - swig which cython + swig which pythonEnv ]; buildInputs = [ - python jemalloc openmpi glibcLocales git - # python deps needed during wheel build time - numpy - keras-preprocessing - protobuf - wrapt - gast - astor - absl-py - termcolor - keras-applications - # libs taken from system through the TF_SYS_LIBS mechanism # grpc sqlite @@ -133,20 +136,12 @@ let giflib re2 pkgs.lmdb - - # for building the wheel - setuptools - wheel - ] ++ lib.optionals (!isPy3k) [ - future - mock ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn nvidia_x11 ]; - # arbitrarily set to the current latest bazel version, overly careful TF_IGNORE_MAX_BAZEL_VERSION = true; @@ -194,8 +189,8 @@ let INCLUDEDIR = "${includes_joined}/include"; - PYTHON_BIN_PATH = python.interpreter; - + PYTHON_BIN_PATH = pythonEnv.interpreter; + TF_NEED_GCP = true; TF_NEED_HDFS = true; TF_ENABLE_XLA = tfFeature xlaSupport; @@ -237,6 +232,9 @@ let export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages" export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}" mkdir -p "$PYTHON_LIB_PATH" + + # To avoid mixing Python 2 and Python 3 + unset PYTHONPATH ''; configurePhase = '' @@ -313,13 +311,7 @@ in buildPythonPackage rec { rm $out/bin/tensorboard ''; - # TODO: remove after there's support for setupPyDistFlags - buildPhase = '' - runHook preBuild - cp ${setuppy} nix_run_setup - ${python.interpreter} nix_run_setup --project_name ${pname} bdist_wheel - runHook postBuild - ''; + setupPyGlobalFlags = [ "--project_name ${pname}" ]; # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/thespian/default.nix b/nixpkgs/pkgs/development/python-modules/thespian/default.nix index cd4a30f656ae..f4c498bed959 100644 --- a/nixpkgs/pkgs/development/python-modules/thespian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.9"; + version = "3.9.10"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c89e1973465feb88b694f3884d24723932a6b0e4df8d909f61e44ff371af7380"; + sha256 = "bffb04b93afcbab0268332445f02757c326f95056eb7e1e2f0515c1dfb92ac7d"; }; # Do not run the test suite: it takes a long time and uses diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 0915bc300c54..0413fd33f6f0 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -10,7 +10,6 @@ buildPythonPackage rec { version = "0.2.1"; pname = "torchvision"; - name = "${pname}-${version}"; format = "wheel"; diff --git a/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 47aa23ca1143..9b7dc424ddc1 100644 --- a/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -26,9 +26,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic ]; - # build requires UTF-8 locale - LANG = "en_US.UTF-8"; - checkInputs = [ pytest ]; @@ -36,7 +33,7 @@ buildPythonPackage rec { # disable test_tx_api.py as it requires being online checkPhase = '' runHook preCheck - ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py + ${python.interpreter} -m pytest --pyargs trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/python-modules/typing/default.nix b/nixpkgs/pkgs/development/python-modules/typing/default.nix index 5c5ecd8949a2..51e634d2439b 100644 --- a/nixpkgs/pkgs/development/python-modules/typing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typing/default.nix @@ -5,11 +5,11 @@ let in buildPythonPackage rec { pname = "typing"; - version = "3.6.6"; + version = "3.7.4"; src = fetchPypi { inherit pname version; - sha256 = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d"; + sha256 = "1kj4kvkh89psajxlyb72rm5fr7w70yb32zkj2h174arsz325wxjk"; }; # Error for Python3.6: ImportError: cannot import name 'ann_module' diff --git a/nixpkgs/pkgs/development/python-modules/umemcache/default.nix b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix index 416c857bdc68..95c0d628697c 100644 --- a/nixpkgs/pkgs/development/python-modules/umemcache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/umemcache/default.nix @@ -4,10 +4,9 @@ buildPythonPackage rec { pname = "umemcache"; version = "1.6.3"; disabled = isPy3k; - name = pname + "-" + version; src = fetchurl { - url = "mirror://pypi/u/umemcache/${name}.zip"; + url = "mirror://pypi/u/umemcache/${pname}-${version}.zip"; sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; }; diff --git a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix index 35afe10f8d24..dcb8eca187e8 100644 --- a/nixpkgs/pkgs/development/python-modules/unicorn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unicorn/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPackages, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "unicorn"; version = "1.0.1"; diff --git a/nixpkgs/pkgs/development/python-modules/uritools/default.nix b/nixpkgs/pkgs/development/python-modules/uritools/default.nix index 6835f8c48e0a..cf3d36c3e5db 100644 --- a/nixpkgs/pkgs/development/python-modules/uritools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uritools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "uritools"; version = "2.2.0"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix index ffd99734f932..31e6e6a066a7 100644 --- a/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urlgrabber/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "urlgrabber"; version = "4.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix index bcbaa0b728c3..8b397d3c42c6 100644 --- a/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/usbtmc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "usbtmc"; version = "0.8"; - name = pname + "-" + version; src = fetchurl { url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 9c3dae74a79e..2093f4d7053c 100644 --- a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -1,23 +1,33 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pyopenssl , libuv , psutil , isPy27 +, CoreServices +, ApplicationServices }: buildPythonPackage rec { pname = "uvloop"; - version = "0.12.2"; + version = "0.13.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f"; + sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l"; }; - buildInputs = [ libuv ]; + buildInputs = [ + libuv + ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + + postPatch = '' + # Removing code linting tests, which we don't care about + rm tests/test_sourcecode.py + ''; checkInputs = [ pyopenssl psutil ]; diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index cbf82ca7ca3d..b3d397b97b41 100644 --- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.15.4"; + version = "0.15.5"; src = fetchPypi { inherit pname version; - sha256 = "a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6"; + sha256 = "a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6"; }; propagatedBuildInputs = [ itsdangerous ]; diff --git a/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix b/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix index 584200ff2b09..8b30cc6be87f 100644 --- a/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix +++ b/nixpkgs/pkgs/development/python-modules/wxPython/3.0.nix @@ -21,7 +21,6 @@ assert wxGTK.unicode; buildPythonPackage rec { pname = "wxPython"; version = "3.0.2.0"; - name = pname + "-" + version; disabled = isPy3k || isPyPy; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index 4bd95a8d745a..8b44203a7d2e 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ammonite-${version}"; + pname = "ammonite"; version = "1.6.9"; scalaVersion = "2.12"; diff --git a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix index a8b8a965256f..16b4be47d8b7 100644 --- a/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/autoflake/default.nix @@ -4,7 +4,6 @@ with python3Packages; buildPythonApplication rec { pname = "autoflake"; version = "1.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 95f5a418a617..ac2c6795a428 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "8.23"; - name = "checkstyle-${version}"; + pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; diff --git a/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix index 2e01e4d8f28e..6b0c1b401f63 100644 --- a/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }: stdenv.mkDerivation rec { - name = "clang-analyzer-${version}"; + pname = "clang-analyzer"; version = "3.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/analysis/coan/default.nix b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix index 2b4a87ffcb8d..951c46e2166f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/coan/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/coan/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.0.1"; - name = "coan-${version}"; + pname = "coan"; src = fetchurl { - url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz"; sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44"; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix index bd0a4ee5e40a..bd8c5c37c864 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix @@ -7,7 +7,7 @@ let ''; in stdenv.mkDerivation rec { - name = "cov-build-${version}"; + pname = "cov-build"; version = "7.0.2"; src = diff --git a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 09901afdd20b..8b6eb71f90ff 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "cppcheck"; version = "1.88"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv"; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix b/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix index 00c020e3f404..ed338a6e0d9b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/eresi/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, which, openssl, readline }: stdenv.mkDerivation rec { - name = "eresi-${version}"; + pname = "eresi"; version = "0.83-a3-phoenix"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix index 77bfa548068c..36fa7bb1f161 100644 --- a/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "evmdis-unstable-${version}"; + pname = "evmdis-unstable"; version = "2018-03-23"; goPackagePath = "github.com/Arachnid/evmdis"; diff --git a/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index 5f6b894f9849..8f1709933707 100644 --- a/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "frama-c-${version}"; + pname = "frama-c"; version = "19.0"; slang = "Potassium"; diff --git a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix index 4222f72248a8..c05d47e396cf 100644 --- a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, llvmPackages, python2 }: stdenv.mkDerivation rec { - name = "include-what-you-use-${version}"; + pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.10"; + version = "0.12"; src = fetchurl { - sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s"; - url = "${meta.homepage}/downloads/${name}.src.tar.gz"; + sha256 = "09b0h704fh7r4f5h92p5997cj3zk1v04bqp4jk1j1f6cmfq2z2d5"; + url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ - --replace "['include-what-you-use']" "['$out/bin/include-what-you-use']" + --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix index 939ae10c089d..455ff7722fa9 100644 --- a/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { - name = "jdepend-${version}"; + pname = "jdepend"; version = "2.9.1"; src = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share - install dist/${name}.jar $out/share + install dist/${pname}-${version}.jar $out/share cat > "$out/bin/jdepend" <<EOF #!${runtimeShell} diff --git a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix index af20165d155f..b5bc31ad5e9f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}: stdenv.mkDerivation rec { - name = "kcov-${version}"; + pname = "kcov"; version = "36"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix b/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix index a9793e048839..c2f0236ed0b4 100644 --- a/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { - name = "massif-visualizer-${version}"; + pname = "massif-visualizer"; version = "0.7.0"; src = fetchurl { - url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/massif-visualizer/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 39cd6417542e..2db6b821b4e1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -32,7 +32,8 @@ let cs_sha256 }: stdenv.mkDerivation rec { - name = "radare2-${version}"; + pname = "radare2"; + inherit version; src = fetchFromGitHub { owner = "radare"; diff --git a/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix index 4fc85c301665..e8e3168e937c 100644 --- a/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.1.5"; - name = "randoop-${version}"; + pname = "randoop"; src = fetchurl { - url = "https://github.com/randoop/randoop/releases/download/v${version}/${name}.zip"; + url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx"; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix index fec127178f9e..475d1950bb2a 100644 --- a/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/retdec/default.nix @@ -124,7 +124,7 @@ let ''; in stdenv.mkDerivation rec { - name = "retdec-${version}"; + pname = "retdec"; # If you update this you will also need to adjust the versions of the updated dependencies. You can do this by first just updating retdec # itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions. diff --git a/nixpkgs/pkgs/development/tools/analysis/retdec/yaracpp.nix b/nixpkgs/pkgs/development/tools/analysis/retdec/yaracpp.nix index cc857b86145f..c8bc4ed747b3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/retdec/yaracpp.nix +++ b/nixpkgs/pkgs/development/tools/analysis/retdec/yaracpp.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { # only fetches the yaracpp source patched to work with a local yara clone, # does not build anything - name = "yaracpp-src-${version}"; + pname = "yaracpp-src"; version = "2018-10-09"; rev = "b92bde0e59e3b75bc445227e04b71105771dee8b"; # as specified in retdec/deps/yaracpp/CMakeLists.txt diff --git a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix index cd2fb21209c4..844fd38d9be6 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rr/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.2.0"; - name = "rr-${version}"; + pname = "rr"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix index e965acc746cc..f8f2f55c5aa7 100644 --- a/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost, qtbase }: stdenv.mkDerivation rec { - name = "snowman-${version}"; + pname = "snowman"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/analysis/spin/default.nix b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix index fbb7eca0ef51..26598bb36cd0 100644 --- a/nixpkgs/pkgs/development/tools/analysis/spin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/spin/default.nix @@ -6,7 +6,7 @@ let ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ]; in stdenv.mkDerivation rec { - name = "spin-${version}"; + pname = "spin"; version = "6.4.9"; url-version = stdenv.lib.replaceChars ["."] [""] version; diff --git a/nixpkgs/pkgs/development/tools/apktool/default.nix b/nixpkgs/pkgs/development/tools/apktool/default.nix index d9d70f64d73e..56f9f98856cc 100644 --- a/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre, build-tools }: stdenv.mkDerivation rec { - name = "apktool-${version}"; + pname = "apktool"; version = "2.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/asmfmt/default.nix b/nixpkgs/pkgs/development/tools/asmfmt/default.nix index d2cb7e807b58..04cb6f808df2 100644 --- a/nixpkgs/pkgs/development/tools/asmfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/asmfmt/default.nix @@ -5,7 +5,7 @@ }: buildGoPackage rec { - name = "asmfmt-${version}"; + pname = "asmfmt"; version = "1.1"; goPackagePath = "github.com/klauspost/asmfmt"; diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 2089142a1deb..403d0ab745a9 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "azure-storage-azcopy-${version}"; + pname = "azure-storage-azcopy"; version = "10.0.1-pre"; revision = "10.0.1"; goPackagePath = "github.com/Azure/azure-storage-azcopy"; diff --git a/nixpkgs/pkgs/development/tools/bloaty/default.nix b/nixpkgs/pkgs/development/tools/bloaty/default.nix index f66c84142648..9a12a7afc625 100644 --- a/nixpkgs/pkgs/development/tools/bloaty/default.nix +++ b/nixpkgs/pkgs/development/tools/bloaty/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "bloaty-${version}"; + pname = "bloaty"; src = fetchFromGitHub { owner = "google"; diff --git a/nixpkgs/pkgs/development/tools/boomerang/default.nix b/nixpkgs/pkgs/development/tools/boomerang/default.nix index 7b5391725423..2623787993c6 100644 --- a/nixpkgs/pkgs/development/tools/boomerang/default.nix +++ b/nixpkgs/pkgs/development/tools/boomerang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { - name = "boomerang-${version}"; + pname = "boomerang"; version = "0.4.0-alpha-2018-07-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/boost-build/default.nix b/nixpkgs/pkgs/development/tools/boost-build/default.nix index 89c1b560eaca..f392475f6187 100644 --- a/nixpkgs/pkgs/development/tools/boost-build/default.nix +++ b/nixpkgs/pkgs/development/tools/boost-build/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "boost-build-${version}"; + pname = "boost-build"; version = "2016.03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 8816a005ca0f..0a86aaeb6ca0 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -3,7 +3,8 @@ let version = "1.9.6"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix index b6c2702485b1..8d1e09eeb338 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -3,7 +3,8 @@ let version = "1.10.2"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix index cde6ea2f7a87..ef339e658c10 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,12 +4,13 @@ assert jdk != null; let version = "3.6.1"; in stdenv.mkDerivation rec { - name = "apache-maven-${version}"; + pname = "apache-maven"; + inherit version; builder = ./builder.sh; src = fetchurl { - url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15"; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix index 0aec7491e4ad..16eb5e3ec748 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "arpa2cm"; version = "0.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix index 624821613465..969cd9879746 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lua5_3, python }: stdenv.mkDerivation rec { - name = "bam-${version}"; + pname = "bam"; version = "0.5.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/0.4.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/0.4.nix index 1018abd6ee9c..334d09622530 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { broken = true; # 2018-08-07 }; - name = "bazel-${version}"; + pname = "bazel"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index f7b0184f8367..b606e5470361 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "bazel-buildtools-${version}"; + pname = "bazel-buildtools"; version = "0.28.0"; rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix index 1007f4df8cad..908fc35c688b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix @@ -121,7 +121,8 @@ let in stdenv.mkDerivation rec { - name = "bazel-${version}"; + pname = "bazel"; + inherit version; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -511,6 +512,8 @@ stdenv.mkDerivation rec { # The templates get tar’d up into a .jar, # so nix can’t detect python is needed in the runtime closure echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends ''; dontStrip = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index ea8ee1f84962..c095f8c695c4 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python }: stdenv.mkDerivation rec { - name = "bear-${version}"; + pname = "bear"; version = "2.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix index f71b877c8c52..d895261c4b5b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bmake-${version}"; + pname = "bmake"; version = "20181221"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz"; + url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw"; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix index 380ba4803bd5..3f086c912c18 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.7.2"; - name = "boot-${version}"; + pname = "boot"; src = fetchurl { url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 4761d8dc5b11..5bad0100a032 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.14.5"; + version = "3.15.1"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; + sha256 = "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq"; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix index 9f4cb366e239..60a011a49d07 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/colormake/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, perl}: stdenv.mkDerivation rec { - name = "colormake-${version}"; + pname = "colormake"; version = "2.1.0"; buildInputs = [perl]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix index 7b882926e1f5..ef2b155482f1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: stdenv.mkDerivation rec { - name = "dub-${version}"; + pname = "dub"; version = "1.14.0"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix index 34d19b616942..24df6fa6ff3b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { - name = "gn-${version}"; + pname = "gn"; version = "20190403"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 47f800c67be5..b543565758c1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -6,7 +6,8 @@ let version = "4.2.1"; in stdenv.mkDerivation { - name = "gnumake-${version}"; + pname = "gnumake"; + inherit version; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 0ec57cc8b82c..902c74a08b4a 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_5_3; + gradle_latest = gradle_5_6; - gradle_5_3 = gradleGen rec { - name = "gradle-5.3.1"; - nativeVersion = "0.17"; + gradle_5_6 = gradleGen rec { + name = "gradle-5.6.1"; + nativeVersion = "0.18"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0dkl6f17zl9pc6y2xm8xqz23x53fck4p2648vpq8572f0mxa2n8w"; + sha256 = "04pccfcry5c59xwm6rr4r3baanwbfr5yrwhxv4r5v8z4414291h9"; }; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix index baa658b522a3..30c4d4ec4de0 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { rev = "version-0.7.0"; sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; }; - name = "gup-${version}"; + pname = "gup"; buildInputs = lib.remove null [ python which pychecker ]; SKIP_PYCHECKER = pychecker == null; buildPhase = "make python"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix index c5ab3fafc5e6..1d1bee9c04f6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }: stdenv.mkDerivation rec { - name = "icmake-${version}"; + pname = "icmake"; version = "9.02.08"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix index 8a72847be772..03cc0518ab51 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/kati/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv }: stdenv.mkDerivation rec { - name = "kati-unstable-${version}"; + pname = "kati-unstable"; version = "2017-05-23"; rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index d73683287a1e..9538171474d6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "leiningen"; version = "2.9.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues - url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; + url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip"; sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a"; }; - JARNAME = "${name}-standalone.jar"; + JARNAME = "${pname}-${version}-standalone.jar"; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index f929d3105856..b7e6e08cb04a 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "mill-${version}"; + pname = "mill"; version = "0.5.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix index 796747bf6e9c..1c90bcc3a9f8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "ninja-${version}"; + pname = "ninja"; version = "1.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index 266dff8cf6ce..3d2759f025cc 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qtscript }: stdenv.mkDerivation rec { - name = "qbs-${version}"; + pname = "qbs"; version = "1.13.1"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix index 98cd7e136d22..0b858f6f20d2 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix @@ -5,7 +5,8 @@ let version = "2.5.1"; in stdenv.mkDerivation { - name = "rebar-${version}"; + pname = "rebar"; + inherit version; src = fetchurl { url = "https://github.com/rebar/rebar/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index 767cd70abcda..28697f4c69cd 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, python2, which}: stdenv.mkDerivation rec { - name = "redo-apenwarr-${version}"; + pname = "redo-apenwarr"; version = "unstable-2019-06-21"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix index 3036ef235845..612dd5c7810d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.3"; - name = "redo-sh-${version}"; + pname = "redo-sh"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix index 3eca6f02e45d..4d43812ebe65 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "remake-${version}"; + pname = "remake"; remakeVersion = "4.1"; dbgVersion = "1.1"; version = "${remakeVersion}+dbg-${dbgVersion}"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index ba00a7078fc6..d32eba51ce17 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "sbt-${version}"; + pname = "sbt"; version = "1.2.8"; src = fetchurl { urls = [ - "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz" + "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${pname}-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix index 08644def517d..1655c154d4e5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.1.0"; - sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; + version = "3.1.1"; + sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc"; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index 00345179131a..7f0cc8100ac0 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }: stdenv.mkDerivation rec { - name = "shards-${version}"; + pname = "shards"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix index 19256e39c33c..9b44b30d7775 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }: stdenv.mkDerivation rec { - name = "tup-${version}"; + pname = "tup"; version = "0.7.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index c3346ad7e993..6f50907665fe 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -7,13 +7,13 @@ let optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\""; in stdenv.mkDerivation rec { - name = "waf-${version}"; + pname = "waf"; version = "2.0.15"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz"; }; diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 3ef3c75ca4ef..317186ea3e0e 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -15,7 +15,8 @@ let goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { - name = "buildah-${version}"; + pname = "buildah"; + inherit version; inherit src; outputs = [ "bin" "man" "out" ]; diff --git a/nixpkgs/pkgs/development/tools/cargo-web/default.nix b/nixpkgs/pkgs/development/tools/cargo-web/default.nix index fa45ba689dfe..7ed75d3f6e69 100644 --- a/nixpkgs/pkgs/development/tools/cargo-web/default.nix +++ b/nixpkgs/pkgs/development/tools/cargo-web/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-web"; - version = "0.6.25"; + version = "0.6.26"; src = fetchFromGitHub { owner = "koute"; repo = pname; rev = version; - sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf"; + sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; - cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn"; + cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5"; nativeBuildInputs = [ openssl perl pkgconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for the client-side Web"; homepage = https://github.com/koute/cargo-web; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ maintainers.kevincox ]; + maintainers = with maintainers; [ kevincox ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/cask/default.nix b/nixpkgs/pkgs/development/tools/cask/default.nix index e33761a67e02..8ec2552aeffb 100644 --- a/nixpkgs/pkgs/development/tools/cask/default.nix +++ b/nixpkgs/pkgs/development/tools/cask/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, python, emacsPackagesNg }: +{ stdenv, fetchurl, python, emacsPackages }: stdenv.mkDerivation rec { - name = "cask-${version}"; + pname = "cask"; version = "0.8.4"; src = fetchurl { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; doCheck = true; - buildInputs = with emacsPackagesNg; [ + buildInputs = with emacsPackages; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build ]; @@ -44,5 +44,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.flexw ]; }; - nativeBuildInputs = [ emacsPackagesNg.emacs python ]; + nativeBuildInputs = [ emacsPackages.emacs python ]; } diff --git a/nixpkgs/pkgs/development/tools/casperjs/default.nix b/nixpkgs/pkgs/development/tools/casperjs/default.nix index e07b3cd9db74..001f87b3b279 100644 --- a/nixpkgs/pkgs/development/tools/casperjs/default.nix +++ b/nixpkgs/pkgs/development/tools/casperjs/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1"; in stdenv.mkDerivation rec { - name = "casperjs-${version}"; + pname = "casperjs"; + inherit version; src = fetchFromGitHub { owner = "casperjs"; diff --git a/nixpkgs/pkgs/development/tools/check/default.nix b/nixpkgs/pkgs/development/tools/check/default.nix index dfa164e6755c..9ae1026c8583 100644 --- a/nixpkgs/pkgs/development/tools/check/default.nix +++ b/nixpkgs/pkgs/development/tools/check/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "check-unstable-${version}"; + pname = "check-unstable"; version = "2018-09-12"; rev = "88db195993f8e991ad402754accd0635490769f9"; diff --git a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix index 93809551f1d7..be39f6e36677 100644 --- a/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cloudfoundry-cli-${version}"; + pname = "cloudfoundry-cli"; version = "6.46.1"; goPackagePath = "code.cloudfoundry.org/cli"; diff --git a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix index db7df2af7009..24aca0dada7b 100644 --- a/nixpkgs/pkgs/development/tools/compile-daemon/default.nix +++ b/nixpkgs/pkgs/development/tools/compile-daemon/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "compile-daemon-unstable-${version}"; + pname = "compile-daemon-unstable"; version = "2017-03-08"; rev = "d447e567232bcb84cedd3b2be012c7127f31f469"; diff --git a/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix b/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix index b2b903b095c6..9aaf886ef067 100644 --- a/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "ct-${version}"; + pname = "ct"; version = "0.7.0"; goPackagePath = "github.com/coreos/container-linux-config-transpiler"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index ba0be89abf3d..d9f7237d2897 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -5,7 +5,8 @@ let goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { - name = "buildkite-agent-${version}"; + pname = "buildkite-agent"; + inherit version; inherit goPackagePath src postPatch; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/cide/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/cide/default.nix index fe83a9aa1704..75f175aae9cc 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/cide/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/cide/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, docker, git, gnutar, gzip }: stdenv.mkDerivation rec { - name = "cide-${version}"; + pname = "cide"; version = "0.9.0"; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; gemdir = ./.; }; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 4a4708df32dd..b20d5cfbeee1 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "drone-cli-${version}"; + pname = "drone-cli"; version = "0.8.6"; revision = "v${version}"; goPackagePath = "github.com/drone/drone-cli"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index 81dbc54cece0..53ad6f4c2f61 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }: buildGoPackage rec { - name = "drone.io-${version}"; + pname = "drone.io"; version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}"; revision = "c48150767c2700d35dcc29b110a81c8b5969175e"; goPackagePath = "github.com/drone/drone"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 62c682a1608f..d8b18fcd121e 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -15,7 +15,7 @@ let in buildGoPackage rec { inherit version; - name = "gitlab-runner-${version}"; + pname = "gitlab-runner"; goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; commonPackagePath = "${goPackagePath}/common"; buildFlagsArray = '' diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 04352660a76f..26647370821a 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jenkins-${version}"; - version = "2.176.2"; + pname = "jenkins"; + version = "2.176.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "19chl7dq25hjn73qgx5cd4azs68kg16r30zx563rrppq3hbc79ik"; + sha256 = "18wsggb4fhlacpxpxkd04zwj56gqjccrbkhs35vkyixwwazcf1ll"; }; buildCommand = '' diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix index 5554455b8894..09e6513d2b16 100644 --- a/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "coursier-${version}"; + pname = "coursier"; version = "2.0.0-RC3-3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/database/cdb/default.nix b/nixpkgs/pkgs/development/tools/database/cdb/default.nix index 553d622a83c6..47f625736750 100644 --- a/nixpkgs/pkgs/development/tools/database/cdb/default.nix +++ b/nixpkgs/pkgs/development/tools/database/cdb/default.nix @@ -16,7 +16,8 @@ let }; in stdenv.mkDerivation { - name = "cdb-${version}"; + pname = "cdb"; + inherit version; src = fetchurl { url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 7eb34aa29ba4..11b84648632d 100644 --- a/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dbmate-${version}"; + pname = "dbmate"; version = "1.4.1"; goPackagePath = "github.com/amacneil/dbmate"; diff --git a/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix index e136b180d78c..8feca8c62ca8 100644 --- a/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "ephemeralpg-${version}"; + pname = "ephemeralpg"; version = "2.5"; src = fetchurl { - url = "http://ephemeralpg.org/code/${name}.tar.gz"; + url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 4589e6ff4e5b..637519bcf3fb 100644 --- a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -21,12 +21,11 @@ let in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liquibase"; version = "3.6.2"; src = fetchurl { - url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; + url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${pname}-${version}-bin.tar.gz"; sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx"; }; @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { cp ${logback-core} ${logback-classic} ${slf4j} $out/lib # Clean up documentation. - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} mv $out/LICENSE.txt \ $out/README.txt \ - $out/share/doc/${name} + $out/share/doc/${pname}-${version} # Remove silly files. rm $out/liquibase.bat $out/liquibase.spec diff --git a/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix index 128921a67d7a..d4e57adc140c 100644 --- a/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix +++ b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.0.0-rc2"; - name = "schemaspy-${version}"; + pname = "schemaspy"; src = fetchurl { - url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar"; + url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; }; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -D ${src} "$out/share/java/${name}.jar" + install -D ${src} "$out/share/java/${pname}-${version}.jar" makeWrapper ${jre}/bin/java $out/bin/schemaspy \ - --add-flags "-jar $out/share/java/${name}.jar" \ + --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ --prefix PATH : "$wrappedPath" ''; diff --git a/nixpkgs/pkgs/development/tools/database/shmig/default.nix b/nixpkgs/pkgs/development/tools/database/shmig/default.nix index f65347889382..2ba38905af9c 100644 --- a/nixpkgs/pkgs/development/tools/database/shmig/default.nix +++ b/nixpkgs/pkgs/development/tools/database/shmig/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "shmig-${version}"; + pname = "shmig"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix index 867aa0b98eca..33b2abce277b 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "sqlcheck-${version}"; + pname = "sqlcheck"; version = "1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix index adb22f45c8e1..ca87395b9179 100644 --- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix +++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/18.2.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sqldeveloper-${version}"; + pname = "sqldeveloper"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index 45e8ba4f7c02..461acacf4e99 100644 --- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sqldeveloper-${version}"; + pname = "sqldeveloper"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; diff --git a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index 5eb7651f199b..ca04d209fabb 100644 --- a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -7,7 +7,8 @@ let version = "3.9.1"; in stdenv.mkDerivation rec { - name = "squirrel-sql-${version}"; + pname = "squirrel-sql"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; diff --git a/nixpkgs/pkgs/development/tools/dcadec/default.nix b/nixpkgs/pkgs/development/tools/dcadec/default.nix index f9ca826cd620..685b9d2f13d5 100644 --- a/nixpkgs/pkgs/development/tools/dcadec/default.nix +++ b/nixpkgs/pkgs/development/tools/dcadec/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "dcadec"; version = "0.2.0"; diff --git a/nixpkgs/pkgs/development/tools/deadcode/default.nix b/nixpkgs/pkgs/development/tools/deadcode/default.nix index fbed4e905cfc..7d106e5a2516 100644 --- a/nixpkgs/pkgs/development/tools/deadcode/default.nix +++ b/nixpkgs/pkgs/development/tools/deadcode/default.nix @@ -6,7 +6,7 @@ # TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of # the standalone extract of deadcode from it? buildGoPackage rec { - name = "deadcode-unstable-${version}"; + pname = "deadcode-unstable"; version = "2016-07-24"; rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab"; diff --git a/nixpkgs/pkgs/development/tools/deis/default.nix b/nixpkgs/pkgs/development/tools/deis/default.nix index 172e81e1369e..db232561add0 100644 --- a/nixpkgs/pkgs/development/tools/deis/default.nix +++ b/nixpkgs/pkgs/development/tools/deis/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "deis-${version}"; + pname = "deis"; version = "1.13.4"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/deisctl/default.nix b/nixpkgs/pkgs/development/tools/deisctl/default.nix index 4285a6745591..a344bcf91d83 100644 --- a/nixpkgs/pkgs/development/tools/deisctl/default.nix +++ b/nixpkgs/pkgs/development/tools/deisctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "deis-${version}"; + pname = "deis"; version = "1.13.3"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/delve/default.nix b/nixpkgs/pkgs/development/tools/delve/default.nix index a0bd4e12063e..fc38f3edb47a 100644 --- a/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/nixpkgs/pkgs/development/tools/delve/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "delve-${version}"; + pname = "delve"; version = "1.2.0"; goPackagePath = "github.com/go-delve/delve"; diff --git a/nixpkgs/pkgs/development/tools/dep/default.nix b/nixpkgs/pkgs/development/tools/dep/default.nix index a486d786c374..456948a97955 100644 --- a/nixpkgs/pkgs/development/tools/dep/default.nix +++ b/nixpkgs/pkgs/development/tools/dep/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dep-${version}"; + pname = "dep"; version = "0.5.1"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/nixpkgs/pkgs/development/tools/devpi-client/default.nix index b23745a7b493..3108ffdcbba9 100644 --- a/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -7,7 +7,6 @@ } : pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "devpi-client"; version = "4.1.0"; diff --git a/nixpkgs/pkgs/development/tools/devtodo/default.nix b/nixpkgs/pkgs/development/tools/devtodo/default.nix index dcaa43156699..b3134b0d0ad0 100644 --- a/nixpkgs/pkgs/development/tools/devtodo/default.nix +++ b/nixpkgs/pkgs/development/tools/devtodo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, ncurses }: stdenv.mkDerivation rec { - name = "devtodo-${version}"; + pname = "devtodo"; version = "0.1.20"; src = fetchurl { - url = "https://swapoff.org/files/devtodo/${name}.tar.gz"; + url = "https://swapoff.org/files/devtodo/${pname}-${version}.tar.gz"; sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p"; }; diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch b/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch new file mode 100644 index 000000000000..342ac1baa102 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch @@ -0,0 +1,88 @@ +diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs +index 4e743eb4..97c53ed8 100644 +--- a/diesel/src/lib.rs ++++ b/diesel/src/lib.rs +@@ -131,7 +131,6 @@ + #![cfg_attr(feature = "unstable", feature(specialization, try_from))] + // Built-in Lints + #![deny( +- warnings, + missing_debug_implementations, + missing_copy_implementations, + missing_docs +diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs +index 741ca003..cf93bb8f 100644 +--- a/diesel_cli/src/main.rs ++++ b/diesel_cli/src/main.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_copy_implementations)] ++#![deny(missing_copy_implementations)] + // Clippy lints + #![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)] + #![warn( +diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs +index 2edee846..c96917c4 100644 +--- a/diesel_cli/tests/tests.rs ++++ b/diesel_cli/tests/tests.rs +@@ -1,5 +1,3 @@ +-#![deny(warnings)] +- + extern crate chrono; + extern crate diesel; + #[macro_use] +diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs +index 2c43b2a3..44dcf3f9 100644 +--- a/diesel_derives/src/lib.rs ++++ b/diesel_derives/src/lib.rs +@@ -1,6 +1,6 @@ + #![recursion_limit = "1024"] + // Built-in Lints +-#![deny(warnings, missing_copy_implementations)] ++#![deny(missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::needless_pass_by_value, +diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs +index 636fea66..f86f3dcc 100644 +--- a/diesel_derives/tests/tests.rs ++++ b/diesel_derives/tests/tests.rs +@@ -1,5 +1,3 @@ +-#![deny(warnings)] +- + #[macro_use] + extern crate cfg_if; + #[macro_use] +diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs +index 933e21a8..7c4d0222 100644 +--- a/diesel_migrations/migrations_internals/src/lib.rs ++++ b/diesel_migrations/migrations_internals/src/lib.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)] ++#![deny(missing_debug_implementations, missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::option_map_unwrap_or_else, +diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs +index 0a83234e..2f509c04 100644 +--- a/diesel_migrations/migrations_macros/src/lib.rs ++++ b/diesel_migrations/migrations_macros/src/lib.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)] ++#![deny(missing_debug_implementations, missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::option_map_unwrap_or_else, +diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs +index c85414e5..f025f237 100644 +--- a/diesel_migrations/src/lib.rs ++++ b/diesel_migrations/src/lib.rs +@@ -1,5 +1,5 @@ + // Built-in Lints +-#![deny(warnings, missing_copy_implementations)] ++#![deny(missing_copy_implementations)] + // Clippy lints + #![allow( + clippy::needless_pass_by_value, diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch b/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch new file mode 100644 index 000000000000..26d583f9a11d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch @@ -0,0 +1,1589 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..f20a5bf +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1583 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "advanced-blog-cli" ++version = "0.1.0" ++dependencies = [ ++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_inserts" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_inserts_mysql" ++version = "0.1.0" ++dependencies = [ ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_inserts_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "all_about_updates" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "assert_matches" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "atty" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "barrel" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bcrypt" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bigdecimal" ++version = "0.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bumpalo" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "derive-error-chain" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel" ++version = "1.4.0" ++dependencies = [ ++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_cli" ++version = "1.4.0" ++dependencies = [ ++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_1_mysql" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_1_pg" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_1_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_2_mysql" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_2_pg" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_2_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_3_mysql" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_3_pg" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_demo_step_3_sqlite" ++version = "0.1.0" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_derives" ++version = "1.4.0" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_derives" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "diesel_derives 1.4.0" ++ ++[[package]] ++name = "diesel_infer_schema" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_migrations" ++version = "1.4.0" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "diesel_migrations" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "diesel_migrations 1.4.0" ++ ++[[package]] ++name = "diesel_tests" ++version = "0.1.0" ++dependencies = [ ++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.0", ++ "diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "difference" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "dotenv" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gcc" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "infer_schema_internals" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "infer_schema_macros" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ipnetwork" ++version = "0.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.62" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libsqlite3-sys" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "migrations_internals" ++version = "1.4.0" ++dependencies = [ ++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "migrations_internals" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "migrations_internals 1.4.0" ++ ++[[package]] ++name = "migrations_macros" ++version = "1.4.0" ++dependencies = [ ++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "migrations_macros" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++replace = "migrations_macros 1.4.0" ++ ++[[package]] ++name = "mysqlclient-sys" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pq-sys" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quickcheck" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "r2d2" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.3.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex" ++version = "0.1.80" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex-syntax" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rust-crypto" ++version = "0.2.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc-serialize" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "safemem" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scheduled-thread-pool" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "smallvec" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "structopt" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.11.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synom" ++version = "0.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread-id" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "uuid" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wasi" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" ++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" ++"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55" ++"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" ++"checksum barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2016bcea86b2a1a807753dc2b6ba682fa24e14e50c7474f4b1a0330949c86fb" ++"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" ++"checksum bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6f09cde06fb2cd52a77123c36bfd1e8e60cf13a8bac6ba8f451dabff4644c8" ++"checksum bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "679e21a6734fdfc63378aea80c2bf31e6ac8ced21ed33e1ee37f8f7bf33c2056" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" ++"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a" ++"checksum diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d24935ba50c4a8dc375a0fd1f8a2ba6bdbdc4125713126a74b965d6a01a06d7" ++"checksum diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4" ++"checksum diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bea70d0798a3d8489e1d5493bb2111a1ab2da434191b9e9605f167c01a20680" ++"checksum diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" ++"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" ++"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3" ++"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" ++"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" ++"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90e390df38a4e5cb4337a76db5b736f239e08f3ab7e8e42a34548617f0113f64" ++"checksum infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07b667b471ef99645989ceea451be288b6e669eeb8951d3f0fbd310677588ac6" ++"checksum ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d1d8b990621b5b0806fac3dbf71d1833a4c0a9e25702d10bd8b2c629c7ae01c" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" ++"checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1" ++"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" ++"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" ++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++"checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9" ++"checksum migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1664412abf7db2b8a6d58be42a38b099780cc542b5b350383b805d88932833fe" ++"checksum mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85" ++"checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718" ++"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" ++"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" ++"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" ++"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" ++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" ++"checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95" ++"checksum quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406" ++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" ++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++"checksum r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bc42ce75d9f4447fb2a04bbe1ed5d18dd949104572850ec19b164e274919f81b" ++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" ++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" ++"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" ++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" ++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" ++"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" ++"checksum scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd07742e081ff6c077f5f6b283f12f32b9e7cc765b316160d66289b74546fbb3" ++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f" ++"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425" ++"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "783cb22d520b177a3772e520d04a3c7970d51c3b647ba80739f99be01131b54f" ++"checksum structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4da119c9a7a1eccb7c6de0c1eb3f7ed1c11138624d092b3687222aeed8f1375c" ++"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" ++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ++"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" ++"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" ++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" ++"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" ++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" ++"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" ++"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" ++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" ++"checksum wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc" ++"checksum wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0" ++"checksum wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9" ++"checksum wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e" ++"checksum wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix new file mode 100644 index 000000000000..f6a67b051146 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security +, sqliteSupport ? true, sqlite +, postgresqlSupport ? true, postgresql +, mysqlSupport ? true, mysql, zlib, libiconv +}: + +assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true) + "support for at least one database must be enabled"; + +let + inherit (stdenv.lib) optional optionals optionalString; + features = '' + ${optionalString sqliteSupport "sqlite"} \ + ${optionalString postgresqlSupport "postgres"} \ + ${optionalString mysqlSupport "mysql"} \ + ''; +in + +rustPlatform.buildRustPackage rec { + pname = "diesel-cli"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "diesel-rs"; + repo = "diesel"; + rev = "v${version}"; + sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb"; + }; + + patches = [ + # Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated` + # + # Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c + # is in a release. + ./allow-warnings.patch + ]; + + cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ]; + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] + ++ optional stdenv.isDarwin Security + ++ optional (stdenv.isDarwin && mysqlSupport) libiconv + ++ optional sqliteSupport sqlite + ++ optional postgresqlSupport postgresql + ++ optionals mysqlSupport [ mysql zlib ]; + + # We must `cd diesel_cli`, we cannot use `--package diesel_cli` to build + # because --features fails to apply to the package: + # https://github.com/rust-lang/cargo/issues/5015 + # https://github.com/rust-lang/cargo/issues/4753 + preBuild = "cd diesel_cli"; + postBuild = "cd .."; + + checkPhase = optionalString sqliteSupport '' + (cd diesel_cli && cargo check --features sqlite) + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/diesel --version + ''; + + # Fix the build with mariadb, which otherwise shows "error adding symbols: + # DSO missing from command line" errors for libz and libssl. + NIX_LDFLAGS = lib.optional mysqlSupport "-lz -lssl -lcrypto"; + + meta = with lib; { + description = "Database tool for working with Rust projects that use Diesel"; + homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli; + license = with licenses; [ mit asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ ivan ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/update-cargo-lock.sh b/nixpkgs/pkgs/development/tools/diesel-cli/update-cargo-lock.sh new file mode 100755 index 000000000000..bd2e033e6871 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/diesel-cli/update-cargo-lock.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# This updates cargo-lock.patch for the diesel version listed in default.nix. + +set -eu -o verbose + +here=$PWD +version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) +checkout=$(mktemp -d) +git clone -b "v$version" --depth=1 https://github.com/diesel-rs/diesel "$checkout" +cd "$checkout" + +rm -f rust-toolchain +cargo generate-lockfile +git add -f Cargo.lock +git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch + +cd "$here" +rm -rf "$checkout" diff --git a/nixpkgs/pkgs/development/tools/doctl/default.nix b/nixpkgs/pkgs/development/tools/doctl/default.nix index d7604f4de9d7..86954ea9d7ec 100644 --- a/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "doctl-${version}"; + pname = "doctl"; version = "${major}.${minor}.${patch}"; major = "1"; minor = "18"; diff --git a/nixpkgs/pkgs/development/tools/drip/default.nix b/nixpkgs/pkgs/development/tools/drip/default.nix index 17aa94ebf366..1b559df8ef6c 100644 --- a/nixpkgs/pkgs/development/tools/drip/default.nix +++ b/nixpkgs/pkgs/development/tools/drip/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, jdk, which, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "drip"; version = "0.2.4"; diff --git a/nixpkgs/pkgs/development/tools/dtools/default.nix b/nixpkgs/pkgs/development/tools/dtools/default.nix index c223a8dc54a1..5f359757eac4 100644 --- a/nixpkgs/pkgs/development/tools/dtools/default.nix +++ b/nixpkgs/pkgs/development/tools/dtools/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchFromGitHub, dmd, curl}: stdenv.mkDerivation rec { - name = "dtools-${version}"; + pname = "dtools"; version = "2.085.1"; srcs = [ diff --git a/nixpkgs/pkgs/development/tools/ejson/default.nix b/nixpkgs/pkgs/development/tools/ejson/default.nix index 19ee4c6391bf..bc46f0776a6d 100644 --- a/nixpkgs/pkgs/development/tools/ejson/default.nix +++ b/nixpkgs/pkgs/development/tools/ejson/default.nix @@ -7,7 +7,7 @@ let inherit ruby; }; in buildGoPackage rec { - name = "ejson-${version}"; + pname = "ejson"; version = "1.2.1"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix index e67b417226f4..736640eba8ea 100644 --- a/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix +++ b/nixpkgs/pkgs/development/tools/erlang/cuter/default.nix @@ -2,7 +2,7 @@ , z3, python }: stdenv.mkDerivation rec { - name = "cuter-${version}"; + pname = "cuter"; version = "0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/errcheck/default.nix b/nixpkgs/pkgs/development/tools/errcheck/default.nix index 1ce49a4cbb9d..f65dfe6565bc 100644 --- a/nixpkgs/pkgs/development/tools/errcheck/default.nix +++ b/nixpkgs/pkgs/development/tools/errcheck/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "errcheck-${version}"; + pname = "errcheck"; version = "1.1.0"; goPackagePath = "github.com/kisielk/errcheck"; diff --git a/nixpkgs/pkgs/development/tools/fac/default.nix b/nixpkgs/pkgs/development/tools/fac/default.nix index 18367d14f6e5..331c86ad88c5 100644 --- a/nixpkgs/pkgs/development/tools/fac/default.nix +++ b/nixpkgs/pkgs/development/tools/fac/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { - name = "fac-${version}"; + pname = "fac"; version = "2.0.0"; goPackagePath = "github.com/mkchoi212/fac"; diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index 7eb057654283..d190ee32fca4 100644 --- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -45,12 +45,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; version = "1.0.8"; in stdenv.mkDerivation rec { - name = "flatpak-builder-${version}"; + pname = "flatpak-builder"; + inherit version; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { - url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912"; }; diff --git a/nixpkgs/pkgs/development/tools/flock/default.nix b/nixpkgs/pkgs/development/tools/flock/default.nix index ac145fae7efe..a6ba410ec710 100644 --- a/nixpkgs/pkgs/development/tools/flock/default.nix +++ b/nixpkgs/pkgs/development/tools/flock/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "flock"; - name = "${pname}-${version}"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix index 4ad04ae0e43b..b57c9841978f 100644 --- a/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -3,7 +3,8 @@ version = "5.2.4"; in stdenv.mkDerivation { - name = "flyway-${version}"; + pname = "flyway"; + inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc"; diff --git a/nixpkgs/pkgs/development/tools/fmbt/default.nix b/nixpkgs/pkgs/development/tools/fmbt/default.nix index 11880213bada..3100daae389b 100644 --- a/nixpkgs/pkgs/development/tools/fmbt/default.nix +++ b/nixpkgs/pkgs/development/tools/fmbt/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { version = "0.39"; - name = "fMBT-${version}"; + pname = "fMBT"; src = fetchFromGitHub { owner = "intel"; diff --git a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix index 292c0dc3a4e8..eb6f937800aa 100644 --- a/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix +++ b/nixpkgs/pkgs/development/tools/fusee-launcher/default.nix @@ -7,7 +7,7 @@ } : stdenv.mkDerivation rec { - name = "fusee-launcher-${version}"; + pname = "fusee-launcher"; version = "unstable-2018-07-14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/galen/default.nix b/nixpkgs/pkgs/development/tools/galen/default.nix index fac1a3958d37..15129bbebffc 100644 --- a/nixpkgs/pkgs/development/tools/galen/default.nix +++ b/nixpkgs/pkgs/development/tools/galen/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "galen"; version = "2.4.4"; - name = "${pname}-${version}"; inherit jre8; diff --git a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix index 0857a3d4a7c6..872c8fae527d 100644 --- a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix @@ -2,7 +2,7 @@ libtool, freeimage, mesa }: stdenv.mkDerivation rec { version = "v1.0.2"; - name = "gamecube-tools-${version}"; + pname = "gamecube-tools"; nativeBuildInputs = [ which autoconf automake libtool ]; buildInputs = [ freeimage mesa ]; diff --git a/nixpkgs/pkgs/development/tools/gauge/default.nix b/nixpkgs/pkgs/development/tools/gauge/default.nix index c750b5537913..b284b7e7a040 100644 --- a/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gauge-${version}"; + pname = "gauge"; version = "1.0.4"; goPackagePath = "github.com/getgauge/gauge"; diff --git a/nixpkgs/pkgs/development/tools/gdm/default.nix b/nixpkgs/pkgs/development/tools/gdm/default.nix index 35328fdf66cf..9cfa2f02c6e6 100644 --- a/nixpkgs/pkgs/development/tools/gdm/default.nix +++ b/nixpkgs/pkgs/development/tools/gdm/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gdm-${version}"; + pname = "gdm"; version = "1.4"; goPackagePath = "github.com/sparrc/gdm"; diff --git a/nixpkgs/pkgs/development/tools/git-ftp/default.nix b/nixpkgs/pkgs/development/tools/git-ftp/default.nix index 2d61b27e2c2c..b0a59e632f16 100644 --- a/nixpkgs/pkgs/development/tools/git-ftp/default.nix +++ b/nixpkgs/pkgs/development/tools/git-ftp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { - name = "git-ftp-${version}"; + pname = "git-ftp"; version = "1.5.2"; src = fetchFromGitHub { owner = "git-ftp"; diff --git a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index 3408b960889d..d13c75be9b70 100644 --- a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "git-quick-stats-${version}"; + pname = "git-quick-stats"; version = "2.0.8"; src = fetchFromGitHub { repo = "git-quick-stats"; diff --git a/nixpkgs/pkgs/development/tools/github/cligh/default.nix b/nixpkgs/pkgs/development/tools/github/cligh/default.nix index 6a336b7015a0..1bad76b246ac 100644 --- a/nixpkgs/pkgs/development/tools/github/cligh/default.nix +++ b/nixpkgs/pkgs/development/tools/github/cligh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }: buildPythonApplication rec { - name = "cligh-${version}"; + pname = "cligh"; version = "0.3"; doCheck = false; # no tests diff --git a/nixpkgs/pkgs/development/tools/glide/default.nix b/nixpkgs/pkgs/development/tools/glide/default.nix index bd83a63e5d66..930043489813 100644 --- a/nixpkgs/pkgs/development/tools/glide/default.nix +++ b/nixpkgs/pkgs/development/tools/glide/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "glide-${version}"; + pname = "glide"; version = "0.12.3"; goPackagePath = "github.com/Masterminds/glide"; diff --git a/nixpkgs/pkgs/development/tools/gllvm/default.nix b/nixpkgs/pkgs/development/tools/gllvm/default.nix index b581e71129ca..dfc5ed843e75 100644 --- a/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gllvm-${version}"; + pname = "gllvm"; version = "1.2.3"; goPackagePath = "github.com/SRI-CSL/gllvm"; diff --git a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index 361740def118..7341dfc90c43 100644 --- a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "global-platform-pro"; version = "18.09.14"; GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "martinpaljak"; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { }; deps = stdenv.mkDerivation { - name = "${name}-deps"; + name = "${pname}-${version}-deps"; inherit src; nativeBuildInputs = [ jdk maven ]; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/glock/default.nix b/nixpkgs/pkgs/development/tools/glock/default.nix index 35f7a2bfdea1..d0e9cc9e2d35 100644 --- a/nixpkgs/pkgs/development/tools/glock/default.nix +++ b/nixpkgs/pkgs/development/tools/glock/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "glock-${version}"; + pname = "glock"; version = "20160816-${stdenv.lib.strings.substring 0 7 rev}"; rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; diff --git a/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/nixpkgs/pkgs/development/tools/glslviewer/default.nix index d85060add5eb..20d1f7c0f1e3 100644 --- a/nixpkgs/pkgs/development/tools/glslviewer/default.nix +++ b/nixpkgs/pkgs/development/tools/glslviewer/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "glslviewer-${version}"; + pname = "glslviewer"; version = "2019-04-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix index 70b426dc5942..8f9b9ddf0b55 100644 --- a/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2018.1"; - name = "gnome-desktop-testing-${version}"; + pname = "gnome-desktop-testing"; src = fetchgit { url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git; diff --git a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix index 249fc21cdfe4..ffdb2a092a05 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-bindata-assetfs-${version}"; + pname = "go-bindata-assetfs"; version = "20160814-${rev}"; rev = "e1a2a7e"; goPackagePath = "github.com/elazarl/go-bindata-assetfs"; diff --git a/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/nixpkgs/pkgs/development/tools/go-bindata/default.nix index 9a783deecee6..4d07939bd7c0 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-bindata-${version}"; + pname = "go-bindata"; version = "20151023-${stdenv.lib.strings.substring 0 7 rev}"; rev = "a0ff2567cfb70903282db057e799fd826784d41d"; diff --git a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix index 5e1a69a16929..3c6cf7e3d83b 100644 --- a/nixpkgs/pkgs/development/tools/go-junit-report/default.nix +++ b/nixpkgs/pkgs/development/tools/go-junit-report/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-junit-report-unstable-${version}"; + pname = "go-junit-report-unstable"; version = "2018-06-14"; rev = "385fac0ced9acaae6dc5b39144194008ded00697"; diff --git a/nixpkgs/pkgs/development/tools/go-motion/default.nix b/nixpkgs/pkgs/development/tools/go-motion/default.nix index 62e276f2f423..52b2962a23d8 100644 --- a/nixpkgs/pkgs/development/tools/go-motion/default.nix +++ b/nixpkgs/pkgs/development/tools/go-motion/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "motion-unstable-${version}"; + pname = "motion-unstable"; version = "2018-04-09"; rev = "218875ebe23806e7af82f3b5b14bb3355534f679"; diff --git a/nixpkgs/pkgs/development/tools/go-outline/default.nix b/nixpkgs/pkgs/development/tools/go-outline/default.nix index 4df506f908fc..5f6088363f1f 100644 --- a/nixpkgs/pkgs/development/tools/go-outline/default.nix +++ b/nixpkgs/pkgs/development/tools/go-outline/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-outline-${version}"; + pname = "go-outline"; version = "unstable-2018-11-22"; rev = "7182a932836a71948db4a81991a494751eccfe77"; diff --git a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index f818569dd004..febf71657eb4 100644 --- a/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "go-protobuf-${version}"; + pname = "go-protobuf"; version = "1.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix index 52cd37f98850..7fcec1937c7a 100644 --- a/nixpkgs/pkgs/development/tools/go-repo-root/default.nix +++ b/nixpkgs/pkgs/development/tools/go-repo-root/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-repo-root-${version}"; + pname = "go-repo-root"; version = "20140911-${stdenv.lib.strings.substring 0 7 rev}"; rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; diff --git a/nixpkgs/pkgs/development/tools/go-symbols/default.nix b/nixpkgs/pkgs/development/tools/go-symbols/default.nix index dfeb6d52e727..e774ed716647 100644 --- a/nixpkgs/pkgs/development/tools/go-symbols/default.nix +++ b/nixpkgs/pkgs/development/tools/go-symbols/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-symbols-${version}"; + pname = "go-symbols"; version = "0.1.1"; goPackagePath = "github.com/acroca/go-symbols"; diff --git a/nixpkgs/pkgs/development/tools/go2nix/default.nix b/nixpkgs/pkgs/development/tools/go2nix/default.nix index 36634423fdbc..26458a3ca2ef 100644 --- a/nixpkgs/pkgs/development/tools/go2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/go2nix/default.nix @@ -2,7 +2,7 @@ fetchFromGitHub }: buildGoPackage rec { - name = "go2nix-${version}"; + pname = "go2nix"; version = "1.3.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix index 53d4bfaa483e..24a21c8279cf 100644 --- a/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/nixpkgs/pkgs/development/tools/goa/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goa-${version}"; + pname = "goa"; version = "1.4.1"; goPackagePath = "github.com/goadesign/goa"; diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix index f93bd9d28c81..1524984756fc 100644 --- a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gocode-gomod-unstable-${version}"; + pname = "gocode-gomod-unstable"; version = "2019-03-27"; rev = "81059208699789f992bb4a4a3fedd734e335468d"; diff --git a/nixpkgs/pkgs/development/tools/gocode/default.nix b/nixpkgs/pkgs/development/tools/gocode/default.nix index 3351c0e986b3..b67f8929e48d 100644 --- a/nixpkgs/pkgs/development/tools/gocode/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gocode-unstable-${version}"; + pname = "gocode-unstable"; version = "2018-11-05"; rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898"; diff --git a/nixpkgs/pkgs/development/tools/goconst/default.nix b/nixpkgs/pkgs/development/tools/goconst/default.nix index 9ef94ffdc7fa..0ee889d02654 100644 --- a/nixpkgs/pkgs/development/tools/goconst/default.nix +++ b/nixpkgs/pkgs/development/tools/goconst/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "goconst-${version}"; + pname = "goconst"; version = "1.1.0"; goPackagePath = "github.com/jgautheron/goconst"; diff --git a/nixpkgs/pkgs/development/tools/goconvey/default.nix b/nixpkgs/pkgs/development/tools/goconvey/default.nix index fcdb56460e19..1c4dd00b95e0 100644 --- a/nixpkgs/pkgs/development/tools/goconvey/default.nix +++ b/nixpkgs/pkgs/development/tools/goconvey/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goconvey-${version}"; + pname = "goconvey"; version = "1.6.3"; goPackagePath = "github.com/smartystreets/goconvey"; diff --git a/nixpkgs/pkgs/development/tools/gocyclo/default.nix b/nixpkgs/pkgs/development/tools/gocyclo/default.nix index 91ebaff803eb..f446b7289085 100644 --- a/nixpkgs/pkgs/development/tools/gocyclo/default.nix +++ b/nixpkgs/pkgs/development/tools/gocyclo/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gocyclo-unstable-${version}"; + pname = "gocyclo-unstable"; version = "2015-02-08"; rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7"; diff --git a/nixpkgs/pkgs/development/tools/godef/default.nix b/nixpkgs/pkgs/development/tools/godef/default.nix index 993305bd98fa..ce6c77b2cc3f 100644 --- a/nixpkgs/pkgs/development/tools/godef/default.nix +++ b/nixpkgs/pkgs/development/tools/godef/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "godef-${version}"; + pname = "godef"; version = "1.1.1"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix index 7fd6fe623748..20c031ead4ab 100644 --- a/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/nixpkgs/pkgs/development/tools/godot/default.nix @@ -9,7 +9,7 @@ let pulseaudio = false; }; in stdenv.mkDerivation rec { - name = "godot-${version}"; + pname = "godot"; version = "3.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/gogetdoc/default.nix b/nixpkgs/pkgs/development/tools/gogetdoc/default.nix index 7724ee49465c..61d0e7a73dba 100644 --- a/nixpkgs/pkgs/development/tools/gogetdoc/default.nix +++ b/nixpkgs/pkgs/development/tools/gogetdoc/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gogetdoc-unstable-${version}"; + pname = "gogetdoc-unstable"; version = "2018-10-25"; rev = "9098cf5fc236a5e25060730544af2ba6d65cd968"; diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index ae7f24a62a51..7a3d7882715f 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "golangci-lint-${version}"; + pname = "golangci-lint"; version = "1.17.1"; goPackagePath = "github.com/golangci/golangci-lint"; diff --git a/nixpkgs/pkgs/development/tools/golint/default.nix b/nixpkgs/pkgs/development/tools/golint/default.nix index 9d404546d008..bd66f35e4710 100644 --- a/nixpkgs/pkgs/development/tools/golint/default.nix +++ b/nixpkgs/pkgs/development/tools/golint/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "lint-${version}"; + pname = "lint"; version = "20181026-${stdenv.lib.strings.substring 0 7 rev}"; rev = "c67002cb31c3a748b7688c27f20d8358b4193582"; diff --git a/nixpkgs/pkgs/development/tools/gometalinter/default.nix b/nixpkgs/pkgs/development/tools/gometalinter/default.nix index f63d33138fc2..c2f2a8a597a1 100644 --- a/nixpkgs/pkgs/development/tools/gometalinter/default.nix +++ b/nixpkgs/pkgs/development/tools/gometalinter/default.nix @@ -39,7 +39,7 @@ let ]; in buildGoPackage rec { - name = "gometalinter-${version}"; + pname = "gometalinter"; version = "3.0.0"; goPackagePath = "github.com/alecthomas/gometalinter"; diff --git a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix index 112e1769f212..4d97415bc565 100644 --- a/nixpkgs/pkgs/development/tools/gomodifytags/default.nix +++ b/nixpkgs/pkgs/development/tools/gomodifytags/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gomodifytags-unstable-${version}"; + pname = "gomodifytags-unstable"; version = "2018-09-14"; rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d"; diff --git a/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix index ba4f4bb3f519..df3310893a4d 100644 --- a/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -3,7 +3,7 @@ with python27Packages; stdenv.mkDerivation rec { - name = "google-app-engine-go-sdk-${version}"; + pname = "google-app-engine-go-sdk"; version = "1.9.61"; src = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/nixpkgs/pkgs/development/tools/gopkgs/default.nix b/nixpkgs/pkgs/development/tools/gopkgs/default.nix index 89a1da772701..778ed562637e 100644 --- a/nixpkgs/pkgs/development/tools/gopkgs/default.nix +++ b/nixpkgs/pkgs/development/tools/gopkgs/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gopkgs-${version}"; + pname = "gopkgs"; version = "2.0.1"; goPackagePath = "github.com/uudashr/gopkgs"; diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix index 7ee87b8f8483..cc2106cdc082 100644 --- a/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gosec-${version}"; + pname = "gosec"; version = "1.2.0"; goPackagePath = "github.com/securego/gosec"; diff --git a/nixpkgs/pkgs/development/tools/gotags/default.nix b/nixpkgs/pkgs/development/tools/gotags/default.nix index b8230561fb42..881ae7e24d4a 100644 --- a/nixpkgs/pkgs/development/tools/gotags/default.nix +++ b/nixpkgs/pkgs/development/tools/gotags/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gotags-${version}"; + pname = "gotags"; version = "20150803-${stdenv.lib.strings.substring 0 7 rev}"; rev = "be986a34e20634775ac73e11a5b55916085c48e7"; diff --git a/nixpkgs/pkgs/development/tools/gotests/default.nix b/nixpkgs/pkgs/development/tools/gotests/default.nix index 8eb65281b3fe..e74b6c27b2b2 100644 --- a/nixpkgs/pkgs/development/tools/gotests/default.nix +++ b/nixpkgs/pkgs/development/tools/gotests/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gotests-${version}"; + pname = "gotests"; version = "1.5.3"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix new file mode 100644 index 000000000000..36e41bddf25d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gotestsum"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "gotestyourself"; + repo = "gotestsum"; + rev = "v${version}"; + sha256 = "1d4sbvk9wqzl3g3da8inqdkvd43rkwvmq969jlgl1k1agv5xjxqv"; + }; + + modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn"; + + meta = with stdenv.lib; { + homepage = "https://github.com/gotestyourself/gotestsum"; + description = "A human friendly `go test` runner"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + maintainers = with maintainers; [ endocrimes ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index d83f0ec40149..be7db5e8b8a6 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoModule, fetchgit }: buildGoModule rec { - name = "gotools-unstable-${version}"; + pname = "gotools-unstable"; version = "2019-07-06"; rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e"; diff --git a/nixpkgs/pkgs/development/tools/govendor/default.nix b/nixpkgs/pkgs/development/tools/govendor/default.nix index 2030c8ba444a..804a9bf043ed 100644 --- a/nixpkgs/pkgs/development/tools/govendor/default.nix +++ b/nixpkgs/pkgs/development/tools/govendor/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "govendor-${version}"; + pname = "govendor"; version = "1.0.9"; goPackagePath = "github.com/kardianos/govendor"; diff --git a/nixpkgs/pkgs/development/tools/govers/default.nix b/nixpkgs/pkgs/development/tools/govers/default.nix index 152b619966c9..ebce368ea9f8 100644 --- a/nixpkgs/pkgs/development/tools/govers/default.nix +++ b/nixpkgs/pkgs/development/tools/govers/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "govers-${version}"; + pname = "govers"; version = "20160623-${stdenv.lib.strings.substring 0 7 rev}"; rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; diff --git a/nixpkgs/pkgs/development/tools/gox/default.nix b/nixpkgs/pkgs/development/tools/gox/default.nix index b28bf24892c2..25b80d9cf697 100644 --- a/nixpkgs/pkgs/development/tools/gox/default.nix +++ b/nixpkgs/pkgs/development/tools/gox/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gox-${version}"; + pname = "gox"; version = "20181025"; goPackagePath = "github.com/mitchellh/gox"; diff --git a/nixpkgs/pkgs/development/tools/gpp/default.nix b/nixpkgs/pkgs/development/tools/gpp/default.nix index 461110b63d71..009f475bb7dd 100644 --- a/nixpkgs/pkgs/development/tools/gpp/default.nix +++ b/nixpkgs/pkgs/development/tools/gpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "gpp-${version}"; + pname = "gpp"; version = "2.25"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/gron/default.nix b/nixpkgs/pkgs/development/tools/gron/default.nix index ebe76197ef4e..e0d2d3d1498f 100644 --- a/nixpkgs/pkgs/development/tools/gron/default.nix +++ b/nixpkgs/pkgs/development/tools/gron/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gron-${version}"; + pname = "gron"; version = "0.6.0"; owner = "tomnomnom"; diff --git a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix index 833b41ae985b..27ca714b73ab 100644 --- a/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gtk-mac-bundler-${version}"; + pname = "gtk-mac-bundler"; version = "0.7.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix index 78f2e967123b..15233979e158 100644 --- a/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix +++ b/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,12 +1,11 @@ { fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "g-wrap"; version = "1.9.15"; src = fetchurl { - url = "mirror://savannah/${pname}/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; diff --git a/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix index fd9347a4007f..b8efb30f5f17 100644 --- a/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, guile }: stdenv.mkDerivation rec { - name = "guile-lint-${version}"; + pname = "guile-lint"; version = "14"; src = fetchurl { - url = "https://download.tuxfamily.org/user42/${name}.tar.bz2"; + url = "https://download.tuxfamily.org/user42/${pname}-${version}.tar.bz2"; sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v"; }; buildInputs = [ guile ]; - unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; + unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${pname}-${version}"''; prePatch = '' substituteInPlace guile-lint.in --replace \ diff --git a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix index 3b52c262c0c6..7d99a5e9a573 100644 --- a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -5,7 +5,7 @@ let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); in stdenv.mkDerivation rec { - name = "hyper-haskell-${version}"; + pname = "hyper-haskell"; version = "0.1.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/hexio/default.nix b/nixpkgs/pkgs/development/tools/hexio/default.nix index 905580482d45..c97e35583b63 100644 --- a/nixpkgs/pkgs/development/tools/hexio/default.nix +++ b/nixpkgs/pkgs/development/tools/hexio/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "hexio"; - name = "${pname}-${version}"; version = "1.0-RC1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/iferr/default.nix b/nixpkgs/pkgs/development/tools/iferr/default.nix index e2aebe9b2dc2..5874d1eeed38 100644 --- a/nixpkgs/pkgs/development/tools/iferr/default.nix +++ b/nixpkgs/pkgs/development/tools/iferr/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "iferr-unstable-${version}"; + pname = "iferr-unstable"; version = "2018-06-15"; rev = "bb332a3b1d9129b6486c7ddcb7030c11b05cfc88"; diff --git a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix index 62f33a2d2517..b394e9e71fbf 100644 --- a/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix +++ b/nixpkgs/pkgs/development/tools/imatix_gsl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pcre } : stdenv.mkDerivation rec { - name = "imatix_gsl-${version}"; + pname = "imatix_gsl"; version = "4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/impl/default.nix b/nixpkgs/pkgs/development/tools/impl/default.nix index 69bbf8afe5ac..8d368ba528a9 100644 --- a/nixpkgs/pkgs/development/tools/impl/default.nix +++ b/nixpkgs/pkgs/development/tools/impl/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "impl-unstable-${version}"; + pname = "impl-unstable"; version = "2018-02-27"; rev = "3d0f908298c49598b6aa84f101c69670e15d1d03"; diff --git a/nixpkgs/pkgs/development/tools/ineffassign/default.nix b/nixpkgs/pkgs/development/tools/ineffassign/default.nix index 10e5c61025ab..06831e3a43c2 100644 --- a/nixpkgs/pkgs/development/tools/ineffassign/default.nix +++ b/nixpkgs/pkgs/development/tools/ineffassign/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "ineffassign-unstable-${version}"; + pname = "ineffassign-unstable"; version = "2018-09-09"; rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; diff --git a/nixpkgs/pkgs/development/tools/interfacer/default.nix b/nixpkgs/pkgs/development/tools/interfacer/default.nix index 274ced0b37cd..2f505ef1c678 100644 --- a/nixpkgs/pkgs/development/tools/interfacer/default.nix +++ b/nixpkgs/pkgs/development/tools/interfacer/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "interfacer-unstable-${version}"; + pname = "interfacer-unstable"; version = "2018-08-31"; rev = "c20040233aedb03da82d460eca6130fcd91c629a"; diff --git a/nixpkgs/pkgs/development/tools/irony-server/default.nix b/nixpkgs/pkgs/development/tools/irony-server/default.nix index b6a78071bc87..035964dafc01 100644 --- a/nixpkgs/pkgs/development/tools/irony-server/default.nix +++ b/nixpkgs/pkgs/development/tools/irony-server/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, llvmPackages, irony }: stdenv.mkDerivation rec { - name = "irony-server-${version}"; + pname = "irony-server"; inherit (irony) version; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/java/cfr/default.nix b/nixpkgs/pkgs/development/tools/java/cfr/default.nix index 1f0d8f286094..382ef28c0147 100644 --- a/nixpkgs/pkgs/development/tools/java/cfr/default.nix +++ b/nixpkgs/pkgs/development/tools/java/cfr/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, fetchurl, jre }: stdenv.mkDerivation rec { - name = "cfr-${version}"; + pname = "cfr"; version = "0.146"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/java/fastjar/default.nix b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix index 403bfeabfd05..9791cd56ea1a 100644 --- a/nixpkgs/pkgs/development/tools/java/fastjar/default.nix +++ b/nixpkgs/pkgs/development/tools/java/fastjar/default.nix @@ -2,7 +2,8 @@ let version = "0.98"; in stdenv.mkDerivation { - name = "fastjar-${version}"; + pname = "fastjar"; + inherit version; src = fetchurl { url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix index 4577de0cde4c..dae394534959 100644 --- a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix +++ b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "jhiccup-${version}"; + pname = "jhiccup"; version = "2.0.10"; src = fetchzip { diff --git a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 9682ceb93c75..04d5a0b2e768 100644 --- a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.3"; - name = "visualvm-${version}"; + pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; diff --git a/nixpkgs/pkgs/development/tools/jbake/default.nix b/nixpkgs/pkgs/development/tools/jbake/default.nix index dbda476171ab..79054c7f667b 100644 --- a/nixpkgs/pkgs/development/tools/jbake/default.nix +++ b/nixpkgs/pkgs/development/tools/jbake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.4"; - name = "jbake-${version}"; + pname = "jbake"; src = fetchzip { - url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; + url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip"; sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw"; }; diff --git a/nixpkgs/pkgs/development/tools/jd/default.nix b/nixpkgs/pkgs/development/tools/jd/default.nix index 3fe55de2ec8c..b03fd7a0028a 100644 --- a/nixpkgs/pkgs/development/tools/jd/default.nix +++ b/nixpkgs/pkgs/development/tools/jd/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "jd-${version}"; + pname = "jd"; version = "0.3.1"; rev = "2729b5af166cfd72bd953ef8959b456c4db940fc"; diff --git a/nixpkgs/pkgs/development/tools/jid/default.nix b/nixpkgs/pkgs/development/tools/jid/default.nix index 4833755b3ee3..cd0e125564f9 100644 --- a/nixpkgs/pkgs/development/tools/jid/default.nix +++ b/nixpkgs/pkgs/development/tools/jid/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "jid-${version}"; + pname = "jid"; version = "0.7.2"; goPackagePath = "github.com/simeji/jid"; diff --git a/nixpkgs/pkgs/development/tools/jmespath/default.nix b/nixpkgs/pkgs/development/tools/jmespath/default.nix index c53d6608efd3..300c52961f3a 100644 --- a/nixpkgs/pkgs/development/tools/jmespath/default.nix +++ b/nixpkgs/pkgs/development/tools/jmespath/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "jmespath-${version}"; + pname = "jmespath"; version = "0.2.2"; rev = "${version}"; diff --git a/nixpkgs/pkgs/development/tools/jp/default.nix b/nixpkgs/pkgs/development/tools/jp/default.nix index e8e8acd6a9a4..e9ba5a7ddd79 100644 --- a/nixpkgs/pkgs/development/tools/jp/default.nix +++ b/nixpkgs/pkgs/development/tools/jp/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "jp-${version}"; + pname = "jp"; version = "0.1.2"; rev = "${version}"; diff --git a/nixpkgs/pkgs/development/tools/jq/default.nix b/nixpkgs/pkgs/development/tools/jq/default.nix index e7c5955ef417..8605ef398a1c 100644 --- a/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/nixpkgs/pkgs/development/tools/jq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, oniguruma }: stdenv.mkDerivation rec { - name = "jq-${version}"; + pname = "jq"; version="1.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/jsduck/default.nix b/nixpkgs/pkgs/development/tools/jsduck/default.nix index dc8e618910c4..11a96bc22fe8 100644 --- a/nixpkgs/pkgs/development/tools/jsduck/default.nix +++ b/nixpkgs/pkgs/development/tools/jsduck/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "jsduck"; - name = "${pname}-${version}"; version = (import ./gemset.nix).jsduck.version; env = bundlerEnv { diff --git a/nixpkgs/pkgs/development/tools/json2hcl/default.nix b/nixpkgs/pkgs/development/tools/json2hcl/default.nix index 694428f55a6b..4fe4e4c7eab3 100644 --- a/nixpkgs/pkgs/development/tools/json2hcl/default.nix +++ b/nixpkgs/pkgs/development/tools/json2hcl/default.nix @@ -2,7 +2,6 @@ buildGoPackage rec { pname = "json2hcl"; - name = "${pname}-${version}"; version = "0.0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/kafkacat/default.nix b/nixpkgs/pkgs/development/tools/kafkacat/default.nix index 4a837bcef652..d1da88f60bd8 100644 --- a/nixpkgs/pkgs/development/tools/kafkacat/default.nix +++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }: stdenv.mkDerivation rec { - name = "kafkacat-${version}"; + pname = "kafkacat"; version = "1.4.0"; diff --git a/nixpkgs/pkgs/development/tools/kind/default.nix b/nixpkgs/pkgs/development/tools/kind/default.nix index 3a2040e712a9..5246a51aabb3 100644 --- a/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/nixpkgs/pkgs/development/tools/kind/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "kind-${version}"; + pname = "kind"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix index 202c57f9106d..c98d397953ec 100644 --- a/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "ktlint-${version}"; + pname = "ktlint"; version = "0.34.2"; src = fetchurl { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jre ]; unpackCmd = '' - mkdir -p ${name} - cp $curSrc ${name}/ktlint + mkdir -p ${pname}-${version} + cp $curSrc ${pname}-${version}/ktlint ''; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/kube-aws/default.nix b/nixpkgs/pkgs/development/tools/kube-aws/default.nix index af5c0e9c2f9f..6083c03ebc9f 100644 --- a/nixpkgs/pkgs/development/tools/kube-aws/default.nix +++ b/nixpkgs/pkgs/development/tools/kube-aws/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "kube-aws-${version}"; + pname = "kube-aws"; version = "0.9.4"; goPackagePath = "github.com/coreos/kube-aws"; diff --git a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix index 20a26824e5e7..8e6ca8e221e2 100644 --- a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kube-prompt-${version}"; + pname = "kube-prompt"; version = "1.0.5"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/kubicorn/default.nix b/nixpkgs/pkgs/development/tools/kubicorn/default.nix index a63de5507479..104b11c1ce1d 100644 --- a/nixpkgs/pkgs/development/tools/kubicorn/default.nix +++ b/nixpkgs/pkgs/development/tools/kubicorn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "kubicorn-${version}"; + pname = "kubicorn"; version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4c7f3623e9188fba43778271afe161a4facfb657"; diff --git a/nixpkgs/pkgs/development/tools/leaps/default.nix b/nixpkgs/pkgs/development/tools/leaps/default.nix index be964cf4d308..a2a35c7fd1d7 100644 --- a/nixpkgs/pkgs/development/tools/leaps/default.nix +++ b/nixpkgs/pkgs/development/tools/leaps/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "leaps-${version}"; + pname = "leaps"; version = "0.9.0"; goPackagePath = "github.com/Jeffail/leaps"; diff --git a/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix b/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix index 58f50dd2f7e3..7f40824c4724 100644 --- a/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "librarian-puppet-go-${version}"; + pname = "librarian-puppet-go"; version = "0.3.9"; goPackagePath = "github.com/tmtk75/librarian-puppet-go"; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix index 00397978054b..41c4b25c8b1b 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ - name = "nuweb-${version}"; + pname = "nuweb"; version = "1.58"; src = fetchurl { - url = "mirror://sourceforge/project/nuweb/${name}.tar.gz"; + url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz"; sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y"; }; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec{ make nuweb.pdf nuwebdoc.pdf all ''; installPhase = '' - install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp + install -d $out/bin $out/share/man/man1 $out/share/doc/${pname}-${version} $out/share/emacs/site-lisp cp nuweb $out/bin cp nuweb.el $out/share/emacs/site-lisp gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz - cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name} + cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/makerpm/default.nix b/nixpkgs/pkgs/development/tools/makerpm/default.nix index 404f3758ced4..573e2aefb80d 100644 --- a/nixpkgs/pkgs/development/tools/makerpm/default.nix +++ b/nixpkgs/pkgs/development/tools/makerpm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "makerpm-${version}"; + pname = "makerpm"; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/development/tools/maligned/default.nix b/nixpkgs/pkgs/development/tools/maligned/default.nix index 7e5cbaddd8b3..3029ee385188 100644 --- a/nixpkgs/pkgs/development/tools/maligned/default.nix +++ b/nixpkgs/pkgs/development/tools/maligned/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "maligned-unstable-${version}"; + pname = "maligned-unstable"; version = "2018-07-07"; rev = "6e39bd26a8c8b58c5a22129593044655a9e25959"; diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix index 14f42ed9d40a..53e2920c68d6 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -3,7 +3,8 @@ let version = "2.2.3"; in stdenv.mkDerivation { - name = "minizinc-${version}"; + pname = "minizinc"; + inherit version; buildInputs = [ cmake flex bison ]; diff --git a/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/nixpkgs/pkgs/development/tools/minizinc/ide.nix index 799623d34cc9..284ad4a5a670 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -3,7 +3,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "minizinc-ide-${version}"; + pname = "minizinc-ide"; + inherit version; nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; diff --git a/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix index db0e41d27ab3..37d49b1f35bf 100644 --- a/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: stdenv.mkDerivation rec { - name = "abi-compliance-checker-${version}"; + pname = "abi-compliance-checker"; version = "2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix index 047cd466baac..ca59bf28b1ec 100644 --- a/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/abi-dumper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: stdenv.mkDerivation rec { - name = "abi-dumper-${version}"; + pname = "abi-dumper"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix index 7810ba6349ce..664e7d28d791 100644 --- a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix @@ -15,7 +15,7 @@ let }; in stdenv.mkDerivation rec { - name = "arcanist-${version}"; + pname = "arcanist"; version = "20180916"; src = [ arcanist libphutil ]; diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix index d7cea5c3d4ed..9901e46d5787 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "autoconf-archive-${version}"; + pname = "autoconf-archive"; version = "2019.01.06"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix index ff5ce659d2e1..dc7197897192 100644 --- a/nixpkgs/pkgs/development/tools/misc/autogen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autogen/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { - name = "autogen-${version}"; + pname = "autogen"; version = "5.18.12"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/awf/default.nix b/nixpkgs/pkgs/development/tools/misc/awf/default.nix index 38d2194dab82..8892142ad779 100644 --- a/nixpkgs/pkgs/development/tools/misc/awf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/awf/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "awf-${version}"; + pname = "awf"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix index 16182d26db3f..72848d049303 100644 --- a/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python3Packages }: stdenv.mkDerivation rec { - name = "bashdb-${version}"; + pname = "bashdb"; version = "4.4-1.0.0"; src = fetchurl { - url = "mirror://sourceforge/bashdb/${name}.tar.bz2"; + url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2"; sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix index ac7eb557f2ed..ea9b340fb0b7 100644 --- a/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf, txt2man }: stdenv.mkDerivation rec { - name = "bin_replace_string-${version}"; + pname = "bin_replace_string"; version = "0.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix index 359ab125be99..dd84e3830c41 100644 --- a/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: stdenv.mkDerivation rec { - name = "bsdbuild-${version}"; + pname = "bsdbuild"; version = "3.1"; src = fetchurl { - url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz"; + url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz"; sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index ae7ecad7ea1c..0577165bcff4 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { - name = "ccache-${version}"; + pname = "ccache"; version = "3.4.1"; src = fetchurl { sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; - url = "mirror://samba/ccache/${name}.tar.xz"; + url = "mirror://samba/ccache/${pname}-${version}.tar.xz"; }; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index f643ecab69d6..008701615e72 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -2,7 +2,7 @@ , cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { - name = "ccls-${version}"; + pname = "ccls"; version = "0.20190314.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix index 6de69a34b290..f823519fb34a 100644 --- a/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, readline, flex, texinfo }: stdenv.mkDerivation rec { - name = "cgdb-${version}"; + pname = "cgdb"; version = "0.7.1"; src = fetchurl { - url = "https://cgdb.me/files/${name}.tar.gz"; + url = "https://cgdb.me/files/${pname}-${version}.tar.gz"; sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix index 5f98df54c0a0..887a0f16ec1a 100644 --- a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "2.0.0.2"; - name = "checkbashisms-${version}"; + pname = "checkbashisms"; src = fetchurl { url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; diff --git a/nixpkgs/pkgs/development/tools/misc/chruby/default.nix b/nixpkgs/pkgs/development/tools/misc/chruby/default.nix index ed96befca5e7..1aac0bd651c7 100644 --- a/nixpkgs/pkgs/development/tools/misc/chruby/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/chruby/default.nix @@ -8,7 +8,7 @@ let ''; in stdenv.mkDerivation rec { - name = "chruby-${version}"; + pname = "chruby"; version = "0.3.9"; diff --git a/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix index 4040eda141fd..861a6eff1640 100644 --- a/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: stdenv.mkDerivation rec { - name = "coccinelle-${version}"; + pname = "coccinelle"; version = "1.0.6"; src = fetchurl { - url = "http://coccinelle.lip6.fr/distrib/${name}.tgz"; + url = "http://coccinelle.lip6.fr/distrib/${pname}-${version}.tgz"; sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/complexity/default.nix b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix index d95c67fea6d9..a2a39b810553 100644 --- a/nixpkgs/pkgs/development/tools/misc/complexity/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/complexity/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autogen }: stdenv.mkDerivation rec { - name = "complexity-${version}"; + pname = "complexity"; version = "1.10"; src = fetchurl { - url = "mirror://gnu/complexity/${name}.tar.gz"; + url = "mirror://gnu/complexity/${pname}-${version}.tar.gz"; sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix index 8a0cb095d445..973caee64e85 100644 --- a/nixpkgs/pkgs/development/tools/misc/cproto/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cproto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "cproto-${version}"; + pname = "cproto"; version = "4.7o"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/cquery/default.nix b/nixpkgs/pkgs/development/tools/misc/cquery/default.nix index 54ad7ca7071c..02d480cf2cd5 100644 --- a/nixpkgs/pkgs/development/tools/misc/cquery/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cquery/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "cquery-${version}"; + pname = "cquery"; version = "2018-10-14"; inherit src; diff --git a/nixpkgs/pkgs/development/tools/misc/csmith/default.nix b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix index eff1af8cdb47..34cbadb38afb 100644 --- a/nixpkgs/pkgs/development/tools/misc/csmith/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/csmith/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }: stdenv.mkDerivation rec { - name = "csmith-${version}"; + pname = "csmith"; version = "2.3.0"; src = fetchurl { - url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz"; + url = "https://embed.cs.utah.edu/csmith/${pname}-${version}.tar.gz"; sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ - --replace '$CSMITH_HOME/runtime' $out/include/${name} \ - --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \ + --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \ + --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \ --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith substituteInPlace $out/bin/launchn.pl \ diff --git a/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix index d8deb75d2d41..3a54a17a93af 100644 --- a/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, tie }: stdenv.mkDerivation rec { - name = "cwebbin-${version}"; + pname = "cwebbin"; version = "22p"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix index ba95889b5a80..1dd53f62cec6 100644 --- a/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -3,12 +3,13 @@ let version = "0.7.2"; in stdenv.mkDerivation rec { - name="dfu-programmer-${version}"; + pname = "dfu-programmer"; + inherit version; buildInputs = [ libusb ]; src = fetchurl { - url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; + url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix index 2657e570106e..bf1effbe71a2 100644 --- a/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name="dfu-util-${version}"; + pname = "dfu-util"; version = "0.9"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz"; + url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix index efb850d5adef..378cc4683b41 100644 --- a/nixpkgs/pkgs/development/tools/misc/dialog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dialog/default.nix @@ -8,13 +8,13 @@ assert withLibrary -> libtool != null; assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { - name = "dialog-${version}"; + pname = "dialog"; version = "1.3-20190211"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/dialog/${name}.tgz" - "https://invisible-mirror.net/archives/dialog/${name}.tgz" + "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz" + "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz" ]; sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix index 51a5f52d3759..23c01338f601 100644 --- a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "elfinfo-${version}"; + pname = "elfinfo"; version = "0.7.5"; goPackagePath = "github.com/xyproto/elfinfo"; diff --git a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix index 905fa0d40935..c7eaafd9c7a8 100644 --- a/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "elfkickers-${version}"; + pname = "elfkickers"; version = "3.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 424032e21af4..7a3579f0635d 100644 --- a/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -2,11 +2,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { - name = "elfutils-${version}"; + pname = "elfutils"; version = "0.176"; src = fetchurl { - url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; + url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/epm/default.nix b/nixpkgs/pkgs/development/tools/misc/epm/default.nix index f58d06599650..b449c0a2d010 100644 --- a/nixpkgs/pkgs/development/tools/misc/epm/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/epm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, rpm}: stdenv.mkDerivation rec { - name = "epm-${version}"; + pname = "epm"; version = "4.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix index e84aa0ef555a..152792dcee25 100644 --- a/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fsatrace-${version}"; + pname = "fsatrace"; version = "0.0.1-160"; src = fetchFromGitHub { @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; preConfigure = '' - mkdir -p $out/libexec/${name} - export makeFlags=INSTALLDIR=$out/libexec/${name} + mkdir -p $out/libexec/${pname}-${version} + export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version} ''; postInstall = '' mkdir -p $out/bin - ln -s $out/libexec/${name}/fsatrace $out/bin/ + ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/ ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix index 73de8eb8cb61..a5c32bd3dc1b 100644 --- a/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "fswatch-${version}"; + pname = "fswatch"; version = "1.14.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/gede/default.nix b/nixpkgs/pkgs/development/tools/misc/gede/default.nix index 70a157bc0840..1484e54289e6 100644 --- a/nixpkgs/pkgs/development/tools/misc/gede/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gede/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { - name = "gede-${version}"; + pname = "gede"; version = "2.14.1"; src = fetchurl { - url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; + url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/global/default.nix b/nixpkgs/pkgs/development/tools/misc/global/default.nix index b2c71388fc52..2d756a655a43 100644 --- a/nixpkgs/pkgs/development/tools/misc/global/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "global-${version}"; + pname = "global"; version = "6.6.3"; src = fetchurl { - url = "mirror://gnu/global/${name}.tar.gz"; + url = "mirror://gnu/global/${pname}-${version}.tar.gz"; sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix index 25043f89463d..108d6190cb7d 100644 --- a/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gpshell-${version}"; + pname = "gpshell"; version = "1.4.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix index aaaee20b81a8..37a7a8c931c3 100644 --- a/nixpkgs/pkgs/development/tools/misc/gputils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gputils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gputils-${version}"; + pname = "gputils"; version = "1.5.0-1"; src = fetchurl { - url = "mirror://sourceforge/gputils/${name}.tar.bz2"; + url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2"; sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/nixpkgs/pkgs/development/tools/misc/hound/default.nix index 0f9219f10a01..d3afbbc1bc76 100644 --- a/nixpkgs/pkgs/development/tools/misc/hound/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hound/default.nix @@ -7,7 +7,7 @@ }: buildGoPackage rec { - name = "hound-unstable-${version}"; + pname = "hound-unstable"; version = "2018-11-02"; rev = "74ec7448a234d8d09e800b92e52c92e378c07742"; diff --git a/nixpkgs/pkgs/development/tools/misc/igprof/default.nix b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix index 294d1fa10dde..996dda4ca941 100644 --- a/nixpkgs/pkgs/development/tools/misc/igprof/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/igprof/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.9.16"; - name = "igprof-${version}"; + pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; diff --git a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix index 8bc35ba01a61..b04de1832abb 100644 --- a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "inotify-tools-${version}"; + pname = "inotify-tools"; version = "3.20.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 281b09393b5d..12197c2de40c 100644 --- a/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -3,7 +3,7 @@ , procps, utilmacros, gtk-doc, openssl, peg }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-${version}"; + pname = "intel-gpu-tools"; version = "1.23"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix index a9f451d31e7d..c837728f72dd 100644 --- a/nixpkgs/pkgs/development/tools/misc/intltool/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/intltool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, gettext, perlPackages }: stdenv.mkDerivation rec { - name = "intltool-${version}"; + pname = "intltool"; version = "0.51.0"; src = fetchurl { - url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/intltool/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix index b431e804d8dc..8da3cd57703c 100644 --- a/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "kdbg-${version}"; + pname = "kdbg"; version = "3.0.0"; src = fetchurl { - url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz"; sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix index f4c3237ee7a5..7d824fd81fbe 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/5.x.nix @@ -16,11 +16,11 @@ let "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; }; in stdenv.mkDerivation rec { - name = "kibana-${version}"; + pname = "kibana"; version = elk5Version; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz"; sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); }; diff --git a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix index 240d52ca7d0e..ace34f350599 100644 --- a/nixpkgs/pkgs/development/tools/misc/loccount/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/loccount/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { - name = "loccount-${version}"; + pname = "loccount"; version = "1.2"; goPackagePath = "gitlab.com/esr/loccount"; diff --git a/nixpkgs/pkgs/development/tools/misc/lsof/darwin-dfile.patch b/nixpkgs/pkgs/development/tools/misc/lsof/darwin-dfile.patch deleted file mode 100644 index 9952228e613a..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/lsof/darwin-dfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c ---- a/dialects/darwin/libproc/dfile.c 2018-02-14 09:28:06.000000000 -0500 -+++ b/dialects/darwin/libproc/dfile.c 2018-04-16 18:52:40.828715293 -0400 -@@ -43,7 +43,7 @@ - #include "lsof.h" - - #if defined(PROC_FP_GUARDED) --#extern struct pff_tab Pgf_tab[]; -+extern struct pff_tab Pgf_tab[]; - #endif /* defined(PROC_FP_GUARDED) */ - - diff --git a/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index 63003f338eb9..98acccb252a3 100644 --- a/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -1,34 +1,22 @@ -{ stdenv, fetchurl, buildPackages, ncurses }: +{ stdenv, fetchFromGitHub, buildPackages, ncurses }: let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { - name = "lsof-${version}"; - version = "4.91"; + pname = "lsof"; + version = "4.93.2"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; - src = fetchurl { - urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down... - ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] - ++ map ( - # the tarball is moved after new version is released - isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/" - + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ] - ++ map ( - # the tarball is moved after new version is released - isOld: "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/" - + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ] - ; - sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9"; + src = fetchFromGitHub { + owner = "lsof-org"; + repo = "lsof"; + rev = "${version}"; + sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv"; }; - unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - - patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + patches = [ ./no-build-info.patch ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 @@ -47,12 +35,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/man/man8 - cp lsof.8 $out/man/man8/ + cp Lsof.8 $out/man/man8/lsof.8 cp lsof $out/bin ''; meta = with stdenv.lib; { - homepage = https://people.freebsd.org/~abe/; + homepage = "https://github.com/lsof-org/lsof"; description = "A tool to list open files"; longDescription = '' List open files. Can show what process has opened some file, diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index 42ca1a1b7d54..17837a548772 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { - name = "lttng-tools-${version}"; + pname = "lttng-tools"; version = "2.10.7"; src = fetchurl { - url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; + url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix index adc4bbd5c39a..ad5276e5e1a9 100644 --- a/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix @@ -12,11 +12,11 @@ # Debian builds with std.h (systemtap). stdenv.mkDerivation rec { - name = "lttng-ust-${version}"; + pname = "lttng-ust"; version = "2.10.4"; src = fetchurl { - url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index ebe62452440e..ce62634e7d7a 100644 --- a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "macdylibbundler-${version}"; + pname = "macdylibbundler"; version = "20180825"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/md2man/default.nix b/nixpkgs/pkgs/development/tools/misc/md2man/default.nix index 23b7119e7d74..7cbd92460817 100644 --- a/nixpkgs/pkgs/development/tools/misc/md2man/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/md2man/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "go-md2man-${version}"; + pname = "go-md2man"; version = "1.0.6"; goPackagePath = "github.com/cpuguy83/go-md2man"; diff --git a/nixpkgs/pkgs/development/tools/misc/moby/default.nix b/nixpkgs/pkgs/development/tools/misc/moby/default.nix index c45e7841d450..a5e4572d18dd 100644 --- a/nixpkgs/pkgs/development/tools/misc/moby/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/moby/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "moby-${version}"; + pname = "moby"; version = "2017-07-06"; rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40"; diff --git a/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix b/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix index ade9954021a1..164e0e80b60c 100644 --- a/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix @@ -2,7 +2,8 @@ let version = "0.1.2"; in pythonPackages.buildPythonApplication { - name = "nixbang-${version}"; + pname = "nixbang"; + inherit version; namePrefix = ""; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix index a449c28ea289..dea6256824df 100644 --- a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "objconv-${version}"; + pname = "objconv"; version = "2.51"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. - url = "https://archive.org/download/objconv/${name}.zip"; + url = "https://archive.org/download/objconv/${pname}-${version}.zip"; sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock index 3e02f085ae6b..ea31cc3704fa 100644 --- a/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -2,10 +2,10 @@ GEM remote: https://rubygems.org/ specs: bindata (2.4.4) - elftools (1.0.2) + elftools (1.1.0) bindata (~> 2) - one_gadget (1.6.2) - elftools (~> 1.0.2) + one_gadget (1.7.2) + elftools (>= 1.0.2, < 1.2.0) PLATFORMS ruby diff --git a/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix index 485ddf940fda..26507a26e915 100644 --- a/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix +++ b/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajymn59fr9117dkwf5xl8vmr737h6xmrcf1033zjlj2l5qkxn4a"; + sha256 = "0kdf0ck4rzxpd006y09rfwppdrqb3sxww4gzfpv2053yq4mkimbn"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; one_gadget = { dependencies = ["elftools"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wacvysd7ddnbx2jl1vhzbkb28y974riyns7bpx889518zaa09z0"; + sha256 = "07s2nigjw1yik895gliz3a7ps0m9j5nccq82zwdd30sv740jmf5b"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.2"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index 874aa04157dc..21e825ac0bf0 100644 --- a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { - name = "opengrok-${version}"; + pname = "opengrok"; version = "1.0"; # binary distribution src = fetchurl { - url = "https://github.com/oracle/opengrok/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index 7141fdcee7e7..d85a05ca2456 100644 --- a/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { - name = "openocd-${version}"; + pname = "openocd"; version = "0.10.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index 29d713a9af44..c673bd261098 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; + pname = "patchelf"; version = "0.10-pre-20190328"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix index fbb21a8b7c65..0b91953a7c7f 100644 --- a/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pmccabe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pmccabe-${version}"; + pname = "pmccabe"; version = "2.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix index f99c904ed01c..c0e7a3653a86 100644 --- a/nixpkgs/pkgs/development/tools/misc/prelink/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/prelink/default.nix @@ -4,7 +4,8 @@ let version = "20130503"; in stdenv.mkDerivation rec { - name = "prelink-${version}"; + pname = "prelink"; + inherit version; buildInputs = [ libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc) diff --git a/nixpkgs/pkgs/development/tools/misc/premake/5.nix b/nixpkgs/pkgs/development/tools/misc/premake/5.nix index 8ceb3d4a4367..d9d28580210b 100644 --- a/nixpkgs/pkgs/development/tools/misc/premake/5.nix +++ b/nixpkgs/pkgs/development/tools/misc/premake/5.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "premake5-${version}"; + pname = "premake5"; version = "5.0.0-alpha12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix index 8f27609ababe..7182144fd200 100644 --- a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix @@ -15,7 +15,7 @@ , }: stdenv.mkDerivation rec { - name = "pwndbg-${version}"; + pname = "pwndbg"; version = "2019.01.25"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix index 19e4423f7d86..0519e4d05e04 100644 --- a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix @@ -27,7 +27,6 @@ assert stdenv.hostPlatform.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.18"; - name = "${pname}-${version}"; src = fetchurl { name = "saleae-logic-${version}-64bit.zip"; diff --git a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix index a506831cd8ea..004975f10d8a 100644 --- a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.5.1"; - name = "sipp-${version}"; + pname = "sipp"; src = fetchFromGitHub { owner = "SIPp"; diff --git a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index fdacdaef20fc..98c400d52851 100644 --- a/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -7,7 +7,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "stlink-${version}"; + pname = "stlink"; + inherit version; src = fetchFromGitHub { owner = "texane"; diff --git a/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix index acdc712786f5..c809437f6fb9 100644 --- a/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libunwind, buildPackages }: stdenv.mkDerivation rec { - name = "strace-${version}"; + pname = "strace"; version = "5.2"; src = fetchurl { - url = "https://strace.io/files/${version}/${name}.tar.xz"; + url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix index b50aa088ac57..9872c91ac4ba 100644 --- a/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tcptrack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { - name = "tcptrack-${version}"; + pname = "tcptrack"; version = "1.4.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 82d0ec6119ea..2975d64113e8 100644 --- a/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -3,7 +3,8 @@ let version = "2.1"; in stdenv.mkDerivation { - name = "teensy-loader-cli-${version}"; + pname = "teensy-loader-cli"; + inherit version; src = fetchgit { url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; diff --git a/nixpkgs/pkgs/development/tools/misc/tet/default.nix b/nixpkgs/pkgs/development/tools/misc/tet/default.nix index 77b362c712c2..29d809b5f05e 100644 --- a/nixpkgs/pkgs/development/tools/misc/tet/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation (rec { version = "3.8"; - name = "tet-${version}"; + pname = "tet"; src = fetchurl { url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ; diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix index 63e5bea19d74..5f4478bd4fbb 100644 --- a/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, texinfo, ncurses, lzma }: stdenv.mkDerivation rec { - name = "texinfo-${version}"; + pname = "texinfo"; version = "4.13a"; src = fetchurl { - url = "mirror://gnu/texinfo/${name}.tar.lzma"; + url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma"; sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/nixpkgs/pkgs/development/tools/misc/tie/default.nix index c380243a898b..5e40152df8df 100644 --- a/nixpkgs/pkgs/development/tools/misc/tie/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tie-${version}"; + pname = "tie"; version = "2.4"; src = fetchurl { - url = "http://mirrors.ctan.org/web/tie/${name}.tar.gz"; + url = "http://mirrors.ctan.org/web/tie/${pname}-${version}.tar.gz"; sha256 = "1m5952kdfffiz33p1jw0wv7dh272mmw28mpxw9v7lkb352zv4xsj"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/trv/default.nix b/nixpkgs/pkgs/development/tools/misc/trv/default.nix index 11caf8e7b20e..65a17fd1242e 100644 --- a/nixpkgs/pkgs/development/tools/misc/trv/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/trv/default.nix @@ -6,7 +6,7 @@ assert stdenv.lib.versionOlder "4.02" ocaml.version; stdenv.mkDerivation rec { - name = "trv-${version}"; + pname = "trv"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix index ebc85c19b395..68409a59f371 100644 --- a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: stdenv.mkDerivation rec { - name = "universal-ctags-${version}"; + pname = "universal-ctags"; version = "unstable-2019-07-30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix index 0fa854f9b2a1..fb43ff61a81c 100644 --- a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix +++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/data.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, tcl, usb-modeswitch }: stdenv.mkDerivation rec { - name = "usb-modeswitch-data-${version}"; + pname = "usb-modeswitch-data"; version = "20170806"; src = fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2"; sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix index d34a94e04670..7c119c929431 100644 --- a/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "usb-modeswitch-${version}"; + pname = "usb-modeswitch"; version = "2.5.2"; src = fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2"; sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb"; }; diff --git a/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix index e806a7796386..2b6e349b9fde 100644 --- a/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libelf }: stdenv.mkDerivation rec { - name = "vtable-dumper-${version}"; + pname = "vtable-dumper"; version = "1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix index d6b8eb5b95ff..e2ea96cd590b 100644 --- a/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/watson-ruby/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "watson-ruby-${version}"; + pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; env = bundlerEnv rec { diff --git a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix index 8f3f6c1b22a7..6edf6551b068 100644 --- a/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/xc3sprog/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "787"; - name = "xc3sprog-${version}"; + pname = "xc3sprog"; src = fetchsvn rec { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; diff --git a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix index 2e67da18ae9a..b409009b524e 100644 --- a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "ycmd-${version}"; + pname = "ycmd"; version = "2018-09-20"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/tools/misc/yodl/default.nix b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix index 76130f255fde..5520a4a30be0 100644 --- a/nixpkgs/pkgs/development/tools/misc/yodl/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/yodl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, perl, icmake, utillinux }: stdenv.mkDerivation rec { - name = "yodl-${version}"; + pname = "yodl"; version = "4.02.01"; nativeBuildInputs = [ icmake ]; diff --git a/nixpkgs/pkgs/development/tools/mod/default.nix b/nixpkgs/pkgs/development/tools/mod/default.nix index 6390c1d7fd24..60e948d593fa 100644 --- a/nixpkgs/pkgs/development/tools/mod/default.nix +++ b/nixpkgs/pkgs/development/tools/mod/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "mod-${version}"; + pname = "mod"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix index 2b5f42b2cbe5..1d7784ae1cc7 100644 --- a/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, unzip }: stdenv.mkDerivation rec { - name = "msgpack-tools-${version}"; + pname = "msgpack-tools"; version = "0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/mustache-go/default.nix b/nixpkgs/pkgs/development/tools/mustache-go/default.nix index 0b060624de3d..41e74bc120f1 100644 --- a/nixpkgs/pkgs/development/tools/mustache-go/default.nix +++ b/nixpkgs/pkgs/development/tools/mustache-go/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mustache-go-${version}"; + pname = "mustache-go"; version = "1.0.1"; goPackagePath = "github.com/cbroglie/mustache"; diff --git a/nixpkgs/pkgs/development/tools/nailgun/default.nix b/nixpkgs/pkgs/development/tools/nailgun/default.nix index 07005131fb5e..689b7da88021 100644 --- a/nixpkgs/pkgs/development/tools/nailgun/default.nix +++ b/nixpkgs/pkgs/development/tools/nailgun/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation rec { - name = "nailgun-${version}"; + pname = "nailgun"; + inherit version; src = fetchFromGitHub { owner = "facebook"; diff --git a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix index 57beec8f171a..e052b7244392 100644 --- a/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix +++ b/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix @@ -20,7 +20,7 @@ let }; in stdenv.mkDerivation rec { - name = "nwjs-${version}"; + pname = "nwjs"; version = "0.12.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/nrpl/default.nix b/nixpkgs/pkgs/development/tools/nrpl/default.nix index 234f5a5bfae7..081e86c44dde 100644 --- a/nixpkgs/pkgs/development/tools/nrpl/default.nix +++ b/nixpkgs/pkgs/development/tools/nrpl/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }: stdenv.mkDerivation rec { - name = "nrpl-${version}"; + pname = "nrpl"; version = "20150522"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/nsis/default.nix b/nixpkgs/pkgs/development/tools/nsis/default.nix index 7117d7dd628f..0539e8de92be 100644 --- a/nixpkgs/pkgs/development/tools/nsis/default.nix +++ b/nixpkgs/pkgs/development/tools/nsis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchzip, scons, zlib }: stdenv.mkDerivation rec { - name = "nsis-${version}"; + pname = "nsis"; version = "3.04"; src = diff --git a/nixpkgs/pkgs/development/tools/nwjs/default.nix b/nixpkgs/pkgs/development/tools/nwjs/default.nix index 96516bfda48b..30f531d7db20 100644 --- a/nixpkgs/pkgs/development/tools/nwjs/default.nix +++ b/nixpkgs/pkgs/development/tools/nwjs/default.nix @@ -32,7 +32,7 @@ let }; in stdenv.mkDerivation rec { - name = "nwjs-${version}"; + pname = "nwjs"; version = "0.33.4"; src = if sdk then fetchurl { diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index a83959fba395..4a4203a2f59d 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -26,7 +26,7 @@ let param = { in stdenv.mkDerivation rec { - name = "camlp4-${version}"; + pname = "camlp4"; inherit (param) version; src = fetchzip { diff --git a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix index 91870a570b09..fb1eb4276d62 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { - name = "ocaml-findlib-${version}"; + pname = "ocaml-findlib"; version = "1.8.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index 1307635abb99..90e88979de40 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-${version}"; + pname = "js_of_ocaml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index ff59fa7cf8a3..e9e7f9d279ea 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; - name = "js_of_ocaml-camlp4-${version}"; + pname = "js_of_ocaml-camlp4"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index c5a345f505b7..c15268923123 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -7,7 +7,7 @@ then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "js_of_ocaml-compiler-${version}"; + pname = "js_of_ocaml-compiler"; version = "3.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index f88811855a2e..e6fb1b353d2a 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -7,7 +7,8 @@ let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" in stdenv.mkDerivation { - name = "js_of_ocaml-${version}"; + pname = "js_of_ocaml"; + inherit version; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; sha256 = { diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index e7a31c1ce2e5..65afee16afbd 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-lwt-${version}"; + pname = "js_of_ocaml-lwt"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index bf33b4e59e52..4b2b14d317b4 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ocamlbuild-${version}"; + pname = "js_of_ocaml-ocamlbuild"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 0649aee162a5..277973afba8a 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ppx-${version}"; + pname = "js_of_ocaml-ppx"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index ddea73b3c766..5b5f7d18f797 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-ppx_deriving_json-${version}"; + pname = "js_of_ocaml-ppx_deriving_json"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index 1ba9ddd0ab7f..c24162cccf75 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "js_of_ocaml-tyxml-${version}"; + pname = "js_of_ocaml-tyxml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix index 2364058729e8..90b092f0e4b6 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.10"; - name = "ocaml-oasis-${version}"; + pname = "ocaml-oasis"; # You must manually update the url, not just the version. OCamlforge keys off # the number after download.php, not the filename. diff --git a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix index 87d592bd1126..e7528d4f7728 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocamlPackages }: stdenv.mkDerivation rec { - name = "obelisk-${version}"; + pname = "obelisk"; version = "0.4.0"; src = fetchFromGitHub { owner = "lelio-brun"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix index 41cde6f8ab73..61e8e77f384b 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix @@ -3,7 +3,8 @@ let version = "0.1.10"; in stdenv.mkDerivation { - name = "obuild-${version}"; + pname = "obuild"; + inherit version; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 74dee630d295..dbf33424439d 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { - name = "ocamlmod-${version}"; + pname = "ocamlmod"; version = "0.0.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index f91ae7132005..09ab9587ddba 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; - name = "${pname}-${version}"; version = "3.4.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix index 0f536c489eb6..da7a5b439ab1 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/omake/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "omake-${version}"; + pname = "omake"; version = "0.10.3"; src = fetchurl { - url = "http://download.camlcity.org/download/${name}.tar.gz"; + url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"; }; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix index fa5393c1871c..a49749ad716f 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.3.2"; - name = "opaline-${version}"; + pname = "opaline"; src = fetchFromGitHub { owner = "jaapb"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix index ddd8d4b9920b..87490bcb617f 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -44,7 +44,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "opam-${version}"; + pname = "opam"; version = "1.2.2"; buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index 452f162b2356..763642e5da1b 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -60,7 +60,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "opam-${version}"; + pname = "opam"; version = "2.0.5"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; diff --git a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index 161c08a7f82b..8b7354ae48ab 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -7,8 +7,8 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { + pname = "utop"; version = "2.4.1"; - name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { # derivation of just runtime deps so env vars created by # setup-hooks can be saved for use at runtime runtime = stdenv.mkDerivation rec { - name = "utop-runtime-env-${version}"; + pname = "utop-runtime-env"; + inherit version; buildInputs = [ findlib ] ++ propagatedBuildInputs; diff --git a/nixpkgs/pkgs/development/tools/omniorb/default.nix b/nixpkgs/pkgs/development/tools/omniorb/default.nix index 725219c3d7c7..f29153334273 100644 --- a/nixpkgs/pkgs/development/tools/omniorb/default.nix +++ b/nixpkgs/pkgs/development/tools/omniorb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { - name = "omniorb-${version}"; + pname = "omniorb"; version = "4.2.3"; diff --git a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 85f8955185fb..784895845e52 100644 --- a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - name = "omnisharp-roslyn-${version}"; + pname = "omnisharp-roslyn"; version = "1.32.19"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix index 7064cb8285ee..0e4810f0ba41 100644 --- a/nixpkgs/pkgs/development/tools/out-of-tree/default.nix +++ b/nixpkgs/pkgs/development/tools/out-of-tree/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "out-of-tree"; - version = "1.0.1"; + version = "1.1.1"; buildInputs = [ makeWrapper ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "0p0ps73w6lmsdyf7irqgbhfxjg5smgbn081d06pnr1zmxvw8dryx"; + sha256 = "048jda3vng11mg62fd3d8vs9yjsp569zlfylnkqv8sb6wd1qn66d"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index 24a6404dc039..9e0da00dd529 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "packer-${version}"; + pname = "packer"; version = "1.4.1"; goPackagePath = "github.com/hashicorp/packer"; diff --git a/nixpkgs/pkgs/development/tools/packet/default.nix b/nixpkgs/pkgs/development/tools/packet/default.nix index 82849be40b2c..54100dfdee9e 100644 --- a/nixpkgs/pkgs/development/tools/packet/default.nix +++ b/nixpkgs/pkgs/development/tools/packet/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "packet-${version}"; + pname = "packet"; version = "v2.2.2"; goPackagePath = "github.com/ebsarr/packet"; diff --git a/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix index 616a2049c778..0f8ead579d0a 100644 --- a/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix +++ b/nixpkgs/pkgs/development/tools/parse-cli-bin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "parse-cli-bin-${version}"; + pname = "parse-cli-bin"; version = "3.0.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix index b53116b888e1..9e86a29cf934 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre}: stdenv.mkDerivation rec { - name = "antlr-${version}"; + pname = "antlr"; version = "3.4"; src = fetchurl { url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix index e6e54f8dab92..fcd7e445b8a2 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix @@ -12,7 +12,8 @@ let runtime = { cpp = stdenv.mkDerivation { - name = "antlr-runtime-cpp-${version}"; + pname = "antlr-runtime-cpp"; + inherit version; src = source; outputs = [ "out" "dev" "doc" ]; @@ -35,7 +36,8 @@ let }; antlr = stdenv.mkDerivation { - name = "antlr-${version}"; + pname = "antlr"; + inherit version; src = fetchurl { url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; diff --git a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix index 9b3fd86b5552..23ea39c6fa9f 100644 --- a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "byacc-${version}"; + pname = "byacc"; version = "20190617"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/byacc/${name}.tgz" - "https://invisible-mirror.net/archives/byacc/${name}.tgz" + "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" + "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q"; }; diff --git a/nixpkgs/pkgs/development/tools/parsing/flex/default.nix b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix index d7d27ac9a1cd..e46a494de76c 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flex/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flex/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "flex-${version}"; + pname = "flex"; version = "2.6.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix index 681f90bbe5a6..93f1d1ee649f 100644 --- a/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bobcat, icmake, yodl }: stdenv.mkDerivation rec { - name = "flexc++-${version}"; + pname = "flexc++"; version = "2.05.00"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix index bf5a2374fdef..d41c113821ad 100644 --- a/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/hammer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, glib, pkgconfig, python, scons }: stdenv.mkDerivation rec { - name = "hammer-${version}"; + pname = "hammer"; version = "e7aa734"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix index 108576d0b11c..aa7b63dafea9 100644 --- a/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/lemon/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "lemon-${version}"; + pname = "lemon"; version = "1.69"; phases = [ "buildPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix index d08df8265b0a..2f4db7982b71 100644 --- a/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix @@ -5,10 +5,11 @@ let generic = { version, sha256, license }: stdenv.mkDerivation rec { - name = "ragel-${version}"; + pname = "ragel"; + inherit version; src = fetchurl { - url = "https://www.colm.net/files/ragel/${name}.tar.gz"; + url = "https://www.colm.net/files/ragel/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix index 1d0545f6889e..f6e35f086396 100644 --- a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "re2c-${version}"; + pname = "re2c"; version = "1.0.3"; sourceRoot = "${src.name}/re2c"; diff --git a/nixpkgs/pkgs/development/tools/pet/default.nix b/nixpkgs/pkgs/development/tools/pet/default.nix index ce562bbf5ac5..7953a55c7d97 100644 --- a/nixpkgs/pkgs/development/tools/pet/default.nix +++ b/nixpkgs/pkgs/development/tools/pet/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "pet-${version}"; + pname = "pet"; version = "0.3.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/pew/default.nix b/nixpkgs/pkgs/development/tools/pew/default.nix index 6f26a48b9c43..e4b50f317763 100644 --- a/nixpkgs/pkgs/development/tools/pew/default.nix +++ b/nixpkgs/pkgs/development/tools/pew/default.nix @@ -1,6 +1,5 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "pew"; version = "1.1.2"; diff --git a/nixpkgs/pkgs/development/tools/pgloader/default.nix b/nixpkgs/pkgs/development/tools/pgloader/default.nix index 47b426604da0..8aaae2b1c433 100644 --- a/nixpkgs/pkgs/development/tools/pgloader/default.nix +++ b/nixpkgs/pkgs/development/tools/pgloader/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "pgloader"; version = "3.6.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz"; diff --git a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix index a37de2a3f628..29b8d4d5ae1e 100644 --- a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix +++ b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix @@ -15,7 +15,7 @@ let ''; in stdenv.mkDerivation rec { - name = "phantomjs-${version}"; + pname = "phantomjs"; version = "2.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/pigeon/default.nix b/nixpkgs/pkgs/development/tools/pigeon/default.nix new file mode 100644 index 000000000000..ae5435330593 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/pigeon/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage { + pname = "pigeon"; + version = "20190810-f3db42a662"; + + goPackagePath = "github.com/mna/pigeon"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "mna"; + repo = "pigeon"; + rev = "f3db42a662eded7550fc7cd11605d05311dfa30f"; + sha256 = "1n0zqidwbqqfslrirpbqw14ylgiry6ggcp9ll4h8rf1chqwk6dhv"; + }; + + meta = { + homepage = "https://github.com/mna/pigeon"; + description = "A PEG parser generator for Go"; + maintainers = with lib.maintainers; [ zimbatm ]; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/pigeon/deps.nix b/nixpkgs/pkgs/development/tools/pigeon/deps.nix new file mode 100644 index 000000000000..d836dc43c7cd --- /dev/null +++ b/nixpkgs/pkgs/development/tools/pigeon/deps.nix @@ -0,0 +1,66 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "b29f5f60c37a"; + sha256 = "118rvb59hc1fykbmif4008rbxw1p0dblc8dxkq96yaapd6p0vbpn"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } +] diff --git a/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix index 8155f3016c3f..b02ae3c544fa 100644 --- a/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.1-7"; - name = "EZTrace-${version}"; + pname = "EZTrace"; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix b/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix index 5ff0d2ca2b1e..5aaf3d436ded 100644 --- a/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "heaptrack-${version}"; + pname = "heaptrack"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix index 9130f31f21d3..120fd89377b3 100644 --- a/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "pprof-unstable-${version}"; + pname = "pprof-unstable"; version = "2018-08-15"; rev = "781f11b1fcf71fae9d185e7189b5e686f575075a"; diff --git a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index 8f711e14654d..3f0b37a7175e 100644 --- a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -14,7 +14,8 @@ let ## stap binaries stapBuild = stdenv.mkDerivation { - name = "systemtap-${version}"; + pname = "systemtap"; + inherit version; src = fetchgit { inherit url rev sha256; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix index 559383f45fe7..6d6a02ab49f4 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "protoc-gen-doc-unstable-${version}"; + pname = "protoc-gen-doc-unstable"; version = "2019-04-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/pup/default.nix b/nixpkgs/pkgs/development/tools/pup/default.nix index 10a10fa21efb..13e8c233ec39 100644 --- a/nixpkgs/pkgs/development/tools/pup/default.nix +++ b/nixpkgs/pkgs/development/tools/pup/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "pup-${version}"; + pname = "pup"; version = "0.4.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/development/tools/pypi2nix/default.nix b/nixpkgs/pkgs/development/tools/pypi2nix/default.nix index 0f1482d7953d..6a709cf8f9b1 100644 --- a/nixpkgs/pkgs/development/tools/pypi2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/pypi2nix/default.nix @@ -24,7 +24,8 @@ let }; in stdenv.mkDerivation rec { - name = "pypi2nix-${version}"; + pname = "pypi2nix"; + inherit version; srcs = [ src click diff --git a/nixpkgs/pkgs/development/tools/rdocker/default.nix b/nixpkgs/pkgs/development/tools/rdocker/default.nix index a5683e7a953d..a2ab9a47a79a 100644 --- a/nixpkgs/pkgs/development/tools/rdocker/default.nix +++ b/nixpkgs/pkgs/development/tools/rdocker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, openssh }: stdenv.mkDerivation rec { - name = "rdocker-${version}"; + pname = "rdocker"; version = "unstable-2018-07-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index 939febae693a..dfa31b30a7e4 100644 --- a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -37,7 +37,7 @@ let xorg.libXScrnSaver ]; in stdenv.mkDerivation rec { - name = "react-native-debugger-${version}"; + pname = "react-native-debugger"; version = "0.9.10"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/reflex/default.nix b/nixpkgs/pkgs/development/tools/reflex/default.nix index 3e69b4ffa073..b82c0694fec8 100644 --- a/nixpkgs/pkgs/development/tools/reflex/default.nix +++ b/nixpkgs/pkgs/development/tools/reflex/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { - name = "reflex-${version}"; + pname = "reflex"; version = "0.2.0"; goPackagePath = "github.com/cespare/reflex"; diff --git a/nixpkgs/pkgs/development/tools/reftools/default.nix b/nixpkgs/pkgs/development/tools/reftools/default.nix index 6ef724022e8c..2d5346f2112a 100644 --- a/nixpkgs/pkgs/development/tools/reftools/default.nix +++ b/nixpkgs/pkgs/development/tools/reftools/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "reftools-unstable-${version}"; + pname = "reftools-unstable"; version = "2018-09-14"; rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399"; diff --git a/nixpkgs/pkgs/development/tools/reno/default.nix b/nixpkgs/pkgs/development/tools/reno/default.nix index 35aab138292d..80c64a65083f 100644 --- a/nixpkgs/pkgs/development/tools/reno/default.nix +++ b/nixpkgs/pkgs/development/tools/reno/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: with pythonPackages; buildPythonApplication rec { - name = "reno-${version}"; + pname = "reno"; version = "2.3.2"; src = fetchurl { - url = "mirror://pypi/r/reno/${name}.tar.gz"; + url = "mirror://pypi/r/reno/${pname}-${version}.tar.gz"; sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4"; }; diff --git a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix index ffd9774ee447..44654e052d1b 100644 --- a/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre_headless, gawk }: stdenv.mkDerivation rec { - name = "nexus-${version}"; + pname = "nexus"; version = "3.16.1-02"; src = fetchurl { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln"; }; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix index aa537df15084..507402deed66 100644 --- a/nixpkgs/pkgs/development/tools/richgo/default.nix +++ b/nixpkgs/pkgs/development/tools/richgo/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "richgo-${version}"; + pname = "richgo"; version = "0.2.8"; goPackagePath = "github.com/kyoh86/richgo"; diff --git a/nixpkgs/pkgs/development/tools/ronn/default.nix b/nixpkgs/pkgs/development/tools/ronn/default.nix index 499cec2e6a7f..51801864796e 100644 --- a/nixpkgs/pkgs/development/tools/ronn/default.nix +++ b/nixpkgs/pkgs/development/tools/ronn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }: stdenv.mkDerivation rec { - name = "ronn-${version}"; + pname = "ronn"; version = env.gems.ronn.version; env = bundlerEnv rec { diff --git a/nixpkgs/pkgs/development/tools/rtags/default.nix b/nixpkgs/pkgs/development/tools/rtags/default.nix index da3b27ebacc5..3a9ecb7697ab 100644 --- a/nixpkgs/pkgs/development/tools/rtags/default.nix +++ b/nixpkgs/pkgs/development/tools/rtags/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }: stdenv.mkDerivation rec { - name = "rtags-${version}"; + pname = "rtags"; version = "2.16"; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/rucksack/default.nix b/nixpkgs/pkgs/development/tools/rucksack/default.nix index 09008c9d63d8..12b00ce93f38 100644 --- a/nixpkgs/pkgs/development/tools/rucksack/default.nix +++ b/nixpkgs/pkgs/development/tools/rucksack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - name = "rucksack-${version}"; + pname = "rucksack"; src = fetchFromGitHub { owner = "andrewrk"; diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index df782d935157..ca1c2fa45e9d 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -5,6 +5,8 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; version = "0.51.0"; + RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update + src = fetchFromGitHub { owner = "rust-lang"; repo = pname; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix index e7c8e869c87e..b5c6f19ddc3d 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "1r8d3mqzaiasvhxmry8va55ggq817y82x8yb3vzih84lxq134y8n"; + sha256 = "088px2kdcfjdb8zfmk7g409h7ij9dngywz336hj2ny82lrdjzazc"; }; - cargoSha256 = "1ys3wd1k39vkll25c56sfv767rcd53yb46adwgzdkkyl2pjphf1r"; + cargoSha256 = "11q8j8y7m59gc8047qhz6pp2825qjcpg9xwgj09l8a5aijf25avb"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix new file mode 100644 index 000000000000..5ea935babd19 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-watch"; + version = "7.2.1"; + + src = fetchFromGitHub { + owner = "passcod"; + repo = pname; + rev = "v${version}"; + sha256 = "13zjsypj0ay9xb5j5fhl3yfn57kp2yngl138vmnyfk1h7gjdxpk3"; + }; + + cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg"; + + buildInputs = lib.optional stdenv.isDarwin CoreServices; + + # `test with_cargo` tries to call cargo-watch as a cargo subcommand + # (calling cargo-watch with command `cargo watch`) + checkPhase = "PATH=target/debug:$PATH cargo test"; + + meta = with lib; { + description = "A Cargo subcommand for watching over Cargo project's source"; + homepage = https://github.com/passcod/cargo-watch; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ xrelkd ivan ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index ca4b6825a38f..945b78caccc7 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "040rivayr0dgmrhlly5827c850xbr0j5ngiy6rvwyba5j9iv2x0y"; + sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88"; }; - cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547"; + cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index a17d50262a0e..7bd49132d0ef 100644 --- a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -4,17 +4,17 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { - name = "pyo3-pack-${version}"; - version = "0.6.1"; + name = "maturin-${version}"; + version = "0.7.1"; src = fetchFromGitHub { owner = "PyO3"; - repo = "pyo3-pack"; + repo = "maturin"; rev = "v${version}"; - sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn"; + sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2"; }; - cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih"; + cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335"; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +27,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Build and publish crates with pyo3 bindings as python packages"; - homepage = https://github.com/PyO3/pyo3-pack; + homepage = https://github.com/PyO3/maturin; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/sauce-connect/default.nix b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix index c6b3d0b4cd08..4cd8b328353b 100644 --- a/nixpkgs/pkgs/development/tools/sauce-connect/default.nix +++ b/nixpkgs/pkgs/development/tools/sauce-connect/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "sauce-connect-${version}"; + pname = "sauce-connect"; version = "4.5.4"; src = fetchurl ( diff --git a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index f91285820923..5937b00f4594 100644 --- a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -27,7 +27,7 @@ let ]; in stdenv.mkDerivation rec { - name = "chromedriver-${version}"; + pname = "chromedriver"; version = "76.0.3809.68"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix index a8085399b3db..3f4b8a22d648 100644 --- a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "htmlunit-driver-standalone-${version}"; + pname = "htmlunit-driver-standalone"; version = "2.27"; src = fetchurl { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - installPhase = "install -D $src $out/share/lib/${name}/${name}.jar"; + installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; meta = { homepage = https://github.com/SeleniumHQ/htmlunit-driver; diff --git a/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/nixpkgs/pkgs/development/tools/selenium/server/default.nix index 61b74ce108d6..d3a8efaadb6a 100644 --- a/nixpkgs/pkgs/development/tools/selenium/server/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/server/default.nix @@ -8,7 +8,7 @@ let patchVersion = "0"; in stdenv.mkDerivation rec { - name = "selenium-server-standalone-${version}"; + pname = "selenium-server-standalone"; version = "${minorVersion}.${patchVersion}"; src = fetchurl { @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { buildInputs = [ jre makeWrapper ]; installPhase = '' - mkdir -p $out/share/lib/${name} - cp $src $out/share/lib/${name}/${name}.jar + mkdir -p $out/share/lib/${pname}-${version} + cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ - --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ + --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; diff --git a/nixpkgs/pkgs/development/tools/simavr/default.nix b/nixpkgs/pkgs/development/tools/simavr/default.nix index 04076a8f0cf6..71f488c760a4 100644 --- a/nixpkgs/pkgs/development/tools/simavr/default.nix +++ b/nixpkgs/pkgs/development/tools/simavr/default.nix @@ -4,7 +4,7 @@ , GLUT }: stdenv.mkDerivation rec { - name = "simavr-${version}"; + pname = "simavr"; version = "1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix index d8899de205fd..786cac68425a 100644 --- a/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -20,7 +20,8 @@ let in buildGoPackage rec { - name = "skopeo-${version}"; + pname = "skopeo"; + inherit version; inherit src goPackagePath; outputs = [ "bin" "man" "out" ]; diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix index f2f50c18e0b9..d84322bb5474 100644 --- a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix +++ b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix @@ -2,7 +2,7 @@ , zlib, expat, dbus, openssl, python3 }: stdenv.mkDerivation rec { - name = "sourcetrail-${version}"; + pname = "sourcetrail"; version = "2019.2.39"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix index c9df2703daa5..550cd9dce278 100644 --- a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }: +{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file - version = "2019.1"; + version = "2019.3"; in -assert version == spirv-headers.version; stdenv.mkDerivation rec { - name = "spirv-tools-${version}"; + pname = "spirv-tools"; inherit version; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "v${version}"; - sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r"; + sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8"; }; enableParallelBuilding = true; - buildInputs = [ cmake python ]; + buildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; diff --git a/nixpkgs/pkgs/development/tools/sqsh/default.nix b/nixpkgs/pkgs/development/tools/sqsh/default.nix index 4acfa4a2b0ed..52c33f3e444c 100644 --- a/nixpkgs/pkgs/development/tools/sqsh/default.nix +++ b/nixpkgs/pkgs/development/tools/sqsh/default.nix @@ -4,11 +4,11 @@ let mainVersion = "2.5"; in stdenv.mkDerivation rec { - name = "sqsh-${version}"; + pname = "sqsh"; version = "${mainVersion}.16.1"; src = fetchurl { - url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz"; + url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${pname}-${version}.tgz"; sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; }; diff --git a/nixpkgs/pkgs/development/tools/stagit/default.nix b/nixpkgs/pkgs/development/tools/stagit/default.nix index 21068a8b05f6..f1a1ceb9bb19 100644 --- a/nixpkgs/pkgs/development/tools/stagit/default.nix +++ b/nixpkgs/pkgs/development/tools/stagit/default.nix @@ -1,7 +1,7 @@ { stdenv, libgit2, fetchgit }: stdenv.mkDerivation rec { - name = "stagit-${version}"; + pname = "stagit"; version = "0.9.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/development/tools/textql/default.nix b/nixpkgs/pkgs/development/tools/textql/default.nix index a3499258a999..cc865e2bd528 100644 --- a/nixpkgs/pkgs/development/tools/textql/default.nix +++ b/nixpkgs/pkgs/development/tools/textql/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { - name = "textql-${version}"; + pname = "textql"; version = "2.0.3"; goPackagePath = "github.com/dinedal/textql"; diff --git a/nixpkgs/pkgs/development/tools/thrust/default.nix b/nixpkgs/pkgs/development/tools/thrust/default.nix index f07451ae8404..50c34dc39edf 100644 --- a/nixpkgs/pkgs/development/tools/thrust/default.nix +++ b/nixpkgs/pkgs/development/tools/thrust/default.nix @@ -14,7 +14,7 @@ let ]; }; in stdenv.mkDerivation rec { - name = "thrust-${version}"; + pname = "thrust"; version = "0.7.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/toluapp/default.nix b/nixpkgs/pkgs/development/tools/toluapp/default.nix index 90d36c71caa9..df6279b5a4ca 100644 --- a/nixpkgs/pkgs/development/tools/toluapp/default.nix +++ b/nixpkgs/pkgs/development/tools/toluapp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.93"; - name = "toluapp-${version}"; + pname = "toluapp"; src = fetchFromGitHub { owner = "LuaDist"; diff --git a/nixpkgs/pkgs/development/tools/tora/default.nix b/nixpkgs/pkgs/development/tools/tora/default.nix index 2bbe2cfe16df..7f35d3c438d1 100644 --- a/nixpkgs/pkgs/development/tools/tora/default.nix +++ b/nixpkgs/pkgs/development/tools/tora/default.nix @@ -5,7 +5,7 @@ let qscintillaLib = (qscintilla.override { withQt5 = true; }); in mkDerivation rec { - name = "tora-${version}"; + pname = "tora"; version = "3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/toxiproxy/default.nix b/nixpkgs/pkgs/development/tools/toxiproxy/default.nix index 565ec7904f18..a5c13e2266e9 100644 --- a/nixpkgs/pkgs/development/tools/toxiproxy/default.nix +++ b/nixpkgs/pkgs/development/tools/toxiproxy/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "toxiproxy-${version}"; + pname = "toxiproxy"; version = "2.1.3"; src = fetchFromGitHub { owner = "Shopify"; diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index 1deb2c7a8fc0..c98529484d51 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -8,14 +8,16 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2019.08.09"; + version = "2019.09.01"; + realVersion = with stdenv.lib; with builtins; + "1.0-53-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "a67379179985bb12a611c75d975548cdf6e7d12e"; - sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35"; + rev = "98871e0e2959bc8cb4de3c7ebe2b9eddc4efe00c"; + sha256 = "1yq7ih2xvhfvdpijmbqjq6jcngl6710kiv66hkww5ih8j5dzsq5l"; name = "trellis"; }) (fetchFromGitHub { @@ -32,6 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; preConfigure = with builtins; '' + substituteInPlace libtrellis/CMakeLists.txt \ + --replace "git describe --tags" "echo ${realVersion}" + rmdir database && ln -sfv ${elemAt srcs 1} ./database source environment.sh diff --git a/nixpkgs/pkgs/development/tools/tychus/default.nix b/nixpkgs/pkgs/development/tools/tychus/default.nix index 775e26eb6a8c..01531d23c781 100644 --- a/nixpkgs/pkgs/development/tools/tychus/default.nix +++ b/nixpkgs/pkgs/development/tools/tychus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }: buildGoPackage rec { - name = "tychus-${version}"; + pname = "tychus"; version = "0.6.3"; goPackagePath = "github.com/devlocker/tychus"; diff --git a/nixpkgs/pkgs/development/tools/udis86/default.nix b/nixpkgs/pkgs/development/tools/udis86/default.nix new file mode 100644 index 000000000000..6996d5bf13fa --- /dev/null +++ b/nixpkgs/pkgs/development/tools/udis86/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, python }: + +stdenv.mkDerivation rec { + pname = "udis86"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "vmt"; + repo = "udis86"; + rev = "v${version}"; + url = "https://github.com/vmt/udis86/archive/v${version}.tar.gz"; + sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1"; + }; + + nativeBuildInputs = [ autoreconfHook python ]; + + configureFlags = [ + "--enable-shared" + ]; + + outputs = [ "bin" "out" "dev" "lib" ]; + + meta = with stdenv.lib; { + homepage = "http://udis86.sourceforge.net"; + license = licenses.bsd2; + maintainers = with maintainers; [ timor ]; + description = '' + Easy-to-use, minimalistic x86 disassembler library (libudis86) + ''; + platforms = platforms.all ; + }; +} diff --git a/nixpkgs/pkgs/development/tools/uftrace/default.nix b/nixpkgs/pkgs/development/tools/uftrace/default.nix index f62cd1aabb1b..796d3509c1c4 100644 --- a/nixpkgs/pkgs/development/tools/uftrace/default.nix +++ b/nixpkgs/pkgs/development/tools/uftrace/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "uftrace-${version}"; + pname = "uftrace"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/unconvert/default.nix b/nixpkgs/pkgs/development/tools/unconvert/default.nix index 1e81c5b9f86e..a6c087d7be72 100644 --- a/nixpkgs/pkgs/development/tools/unconvert/default.nix +++ b/nixpkgs/pkgs/development/tools/unconvert/default.nix @@ -5,7 +5,7 @@ }: buildGoPackage rec { - name = "unconvert-unstable-${version}"; + pname = "unconvert-unstable"; version = "2018-07-03"; rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b"; diff --git a/nixpkgs/pkgs/development/tools/unity3d/default.nix b/nixpkgs/pkgs/development/tools/unity3d/default.nix index 54ace72c5fbd..0ca7e37ef706 100644 --- a/nixpkgs/pkgs/development/tools/unity3d/default.nix +++ b/nixpkgs/pkgs/development/tools/unity3d/default.nix @@ -23,7 +23,7 @@ let build = "f2"; in stdenv.mkDerivation rec { - name = "unity-editor-${version}"; + pname = "unity-editor"; version = "${ver}x${build}"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/valadoc/default.nix b/nixpkgs/pkgs/development/tools/valadoc/default.nix index ebeb81c90ec5..71c47a7394b7 100644 --- a/nixpkgs/pkgs/development/tools/valadoc/default.nix +++ b/nixpkgs/pkgs/development/tools/valadoc/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}: stdenv.mkDerivation rec { version = "0.36.2"; - name = "valadoc-${version}"; + pname = "valadoc"; src = fetchurl { - url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h"; }; diff --git a/nixpkgs/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix index f6c160de65c3..8f3bc5609052 100644 --- a/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -4,7 +4,6 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "vcstool"; version = "0.1.36"; diff --git a/nixpkgs/pkgs/development/tools/vgo2nix/default.nix b/nixpkgs/pkgs/development/tools/vgo2nix/default.nix index 9601771f75f0..e8173a6b5b0d 100644 --- a/nixpkgs/pkgs/development/tools/vgo2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/vgo2nix/default.nix @@ -8,7 +8,7 @@ }: buildGoPackage rec { - name = "vgo2nix-${version}"; + pname = "vgo2nix"; version = "unstable-2019-02-06"; goPackagePath = "github.com/adisbladis/vgo2nix"; diff --git a/nixpkgs/pkgs/development/tools/vim-vint/default.nix b/nixpkgs/pkgs/development/tools/vim-vint/default.nix index 3e8a228bacf1..27296edfac0b 100644 --- a/nixpkgs/pkgs/development/tools/vim-vint/default.nix +++ b/nixpkgs/pkgs/development/tools/vim-vint/default.nix @@ -3,7 +3,7 @@ with python3Packages; buildPythonApplication rec { - name = "vim-vint-${version}"; + pname = "vim-vint"; version = "0.3.20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/vndr/default.nix b/nixpkgs/pkgs/development/tools/vndr/default.nix index 42cf6f07f4d0..197f48dbbfb5 100644 --- a/nixpkgs/pkgs/development/tools/vndr/default.nix +++ b/nixpkgs/pkgs/development/tools/vndr/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vndr-unstable-${version}"; + pname = "vndr-unstable"; version = "2018-06-23"; rev = "81cb8916aad3c8d06193f008dba3e16f82851f52"; diff --git a/nixpkgs/pkgs/development/tools/vogl/default.nix b/nixpkgs/pkgs/development/tools/vogl/default.nix index e87ba2b52c14..b0768ca4b7e5 100644 --- a/nixpkgs/pkgs/development/tools/vogl/default.nix +++ b/nixpkgs/pkgs/development/tools/vogl/default.nix @@ -8,7 +8,7 @@ }: mkDerivation rec { - name = "vogl-${version}"; + pname = "vogl"; version = "2016-05-13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index 3c189d09f1c1..36d018682df9 100644 --- a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang -, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: +, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }: + stdenv.mkDerivation rec { - name = "vulkan-validation-layers-${version}"; - version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! + pname = "vulkan-validation-layers"; + version = "1.1.114.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp"; + sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/nixpkgs/pkgs/development/tools/vultr/default.nix b/nixpkgs/pkgs/development/tools/vultr/default.nix index 8e17c531547d..7cc8ce6fe134 100644 --- a/nixpkgs/pkgs/development/tools/vultr/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vultr-${version}"; + pname = "vultr"; version = "1.15.0"; goPackagePath = "github.com/JamesClonk/vultr"; diff --git a/nixpkgs/pkgs/development/tools/wabt/default.nix b/nixpkgs/pkgs/development/tools/wabt/default.nix index e9ced0e753a0..f8936e27516a 100644 --- a/nixpkgs/pkgs/development/tools/wabt/default.nix +++ b/nixpkgs/pkgs/development/tools/wabt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { - name = "wabt-${version}"; + pname = "wabt"; version = "1.0.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/watchman/default.nix b/nixpkgs/pkgs/development/tools/watchman/default.nix index 4a056db6c0c2..3a58e1088ea2 100644 --- a/nixpkgs/pkgs/development/tools/watchman/default.nix +++ b/nixpkgs/pkgs/development/tools/watchman/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "watchman-${version}"; + pname = "watchman"; version = "4.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/wiiload/default.nix b/nixpkgs/pkgs/development/tools/wiiload/default.nix index aaf1b20ea6f7..8db830b3284e 100644 --- a/nixpkgs/pkgs/development/tools/wiiload/default.nix +++ b/nixpkgs/pkgs/development/tools/wiiload/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, zlib }: stdenv.mkDerivation rec { version = "v0.5.1"; - name = "wiiload-${version}"; + pname = "wiiload"; nativeBuildInputs = [ autoconf automake ]; buildInputs = [ zlib ]; diff --git a/nixpkgs/pkgs/development/tools/ws/default.nix b/nixpkgs/pkgs/development/tools/ws/default.nix index 17c64f0548b3..da1b493b0d2a 100644 --- a/nixpkgs/pkgs/development/tools/ws/default.nix +++ b/nixpkgs/pkgs/development/tools/ws/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "ws-${version}"; + pname = "ws"; version = "0.2.1"; rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; diff --git a/nixpkgs/pkgs/development/tools/xcbuild/default.nix b/nixpkgs/pkgs/development/tools/xcbuild/default.nix index 29717d75394a..0874c9e55155 100644 --- a/nixpkgs/pkgs/development/tools/xcbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/xcbuild/default.nix @@ -16,7 +16,7 @@ let sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; }; in stdenv.mkDerivation rec { - name = "xcbuild-${version}"; + pname = "xcbuild"; # Once a version is released that includes # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, diff --git a/nixpkgs/pkgs/development/tools/xqilla/default.nix b/nixpkgs/pkgs/development/tools/xqilla/default.nix index c163c4cbcf69..44a7254a3d7f 100644 --- a/nixpkgs/pkgs/development/tools/xqilla/default.nix +++ b/nixpkgs/pkgs/development/tools/xqilla/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xercesc }: stdenv.mkDerivation rec { - name = "xqilla-${version}"; + pname = "xqilla"; version = "2.3.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/tools/yaml2json/default.nix b/nixpkgs/pkgs/development/tools/yaml2json/default.nix index 1a8d7f13aff5..ece440c692f7 100644 --- a/nixpkgs/pkgs/development/tools/yaml2json/default.nix +++ b/nixpkgs/pkgs/development/tools/yaml2json/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { - name = "yaml2json-${version}"; + pname = "yaml2json"; version = "unstable-2017-05-03"; goPackagePath = "github.com/bronze1man/yaml2json"; diff --git a/nixpkgs/pkgs/development/tools/yj/default.nix b/nixpkgs/pkgs/development/tools/yj/default.nix index 3520bcfc1b12..a2076668f604 100644 --- a/nixpkgs/pkgs/development/tools/yj/default.nix +++ b/nixpkgs/pkgs/development/tools/yj/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "yj-${version}"; + pname = "yj"; version = "4.0.0"; rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558"; diff --git a/nixpkgs/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix new file mode 100644 index 000000000000..3180131c6f78 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -0,0 +1,31 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# buildGoModule is not supported by the project +# See https://github.com/mikefarah/yq/issues/227 +buildGoPackage rec { + pname = "yq-go"; + version = "2.4.0"; + + goPackagePath = "gopkg.in/mikefarah/yq.v2"; + + src = fetchFromGitHub { + owner = "mikefarah"; + rev = version; + repo = "yq"; + sha256 = "0nizg08mdpb8g6hj887kk5chljba6x9v0f5ysqf28py511yp0dym"; + }; + + goDeps = ./deps.nix; + + postInstall = '' + mv $bin/bin/yq.v2 $bin/bin/yq + ''; + + meta = with stdenv.lib; { + description = "Portable command-line YAML processor"; + homepage = http://mikefarah.github.io/yq/; + license = [ licenses.mit ]; + maintainers = [ maintainers.lewo ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/yq-go/deps.nix b/nixpkgs/pkgs/development/tools/yq-go/deps.nix new file mode 100644 index 000000000000..ec2057964ec1 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/yq-go/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "972238283c0625cf3e881de7699ba8f2524c340a"; + sha256 = "194h0lq3s27wcxcgahjl350x46v116x81zgkgh98q9v5iydig28l"; + }; + } + { + goPackagePath = "gopkg.in/imdario/mergo.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/imdario/mergo.v0"; + rev = "7c29201646fa3de8506f701213473dd407f19646"; + sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; + }; + } + { + goPackagePath = "gopkg.in/mikefarah/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mikefarah/yaml.v2"; + rev = "1a71b09ff830e9b158685a8657c85f6462559726"; + sha256 = "0rvix49in3bm3i90v1dp1s49b14m1pyyqm3fv27mgg0spvcqy7vr"; + }; + } + { + goPackagePath = "gopkg.in/op/go-logging.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/op/go-logging.v1"; + rev = "b2cb9fa56473e98db8caba80237377e83fe44db5"; + sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn"; + }; + } + { + goPackagePath = "gopkg.in/spf13/cobra.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/spf13/cobra.v0"; + rev = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"; + sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; + }; + } +] diff --git a/nixpkgs/pkgs/development/tools/yuicompressor/default.nix b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix index c157ddd65a87..82fac9f6be79 100644 --- a/nixpkgs/pkgs/development/tools/yuicompressor/default.nix +++ b/nixpkgs/pkgs/development/tools/yuicompressor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "yuicompressor-${version}"; + pname = "yuicompressor"; version = "2.4.8"; src = fetchurl { - url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar"; + url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; }; diff --git a/nixpkgs/pkgs/development/web/csslint/default.nix b/nixpkgs/pkgs/development/web/csslint/default.nix index 4159e3690490..4db0da4f418b 100644 --- a/nixpkgs/pkgs/development/web/csslint/default.nix +++ b/nixpkgs/pkgs/development/web/csslint/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.10.0"; - name = "csslint-${version}"; + pname = "csslint"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/${name}.tgz"; + url = "https://registry.npmjs.org/csslint/-/${pname}-${version}.tgz"; sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid"; }; diff --git a/nixpkgs/pkgs/development/web/grails/default.nix b/nixpkgs/pkgs/development/web/grails/default.nix index 24f567891983..5427f66478f3 100644 --- a/nixpkgs/pkgs/development/web/grails/default.nix +++ b/nixpkgs/pkgs/development/web/grails/default.nix @@ -10,7 +10,7 @@ let ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { - name = "grails-${version}"; + pname = "grails"; version = "4.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix index 26cec8f37306..81417f6287b1 100644 --- a/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -17,7 +17,7 @@ let stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "insomnia-${version}"; + pname = "insomnia"; version = "6.5.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/web/kcgi/default.nix b/nixpkgs/pkgs/development/web/kcgi/default.nix index 485c4026afae..ec1ec527c5ef 100644 --- a/nixpkgs/pkgs/development/web/kcgi/default.nix +++ b/nixpkgs/pkgs/development/web/kcgi/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "kcgi"; version = "0.10.8"; underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "kristapsdz"; diff --git a/nixpkgs/pkgs/development/web/now-cli/default.nix b/nixpkgs/pkgs/development/web/now-cli/default.nix index 91b4fe15e5a0..eb3254dcd3ab 100644 --- a/nixpkgs/pkgs/development/web/now-cli/default.nix +++ b/nixpkgs/pkgs/development/web/now-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "now-cli-${version}"; + pname = "now-cli"; version = "15.8.7"; # TODO: switch to building from source, if possible diff --git a/nixpkgs/pkgs/development/web/postman/default.nix b/nixpkgs/pkgs/development/web/postman/default.nix index 58b0f0e876f8..1767eaab8bce 100644 --- a/nixpkgs/pkgs/development/web/postman/default.nix +++ b/nixpkgs/pkgs/development/web/postman/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { - name = "postman-${version}"; + pname = "postman"; version = "7.0.7"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/web/remarkjs/default.nix b/nixpkgs/pkgs/development/web/remarkjs/default.nix index 24e04842dc9e..d56819be0195 100644 --- a/nixpkgs/pkgs/development/web/remarkjs/default.nix +++ b/nixpkgs/pkgs/development/web/remarkjs/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - name = "remarkjs-${version}"; + pname = "remarkjs"; version = "0.7.0"; diff --git a/nixpkgs/pkgs/development/web/valum/default.nix b/nixpkgs/pkgs/development/web/valum/default.nix index 266217d94e24..a625a815603d 100644 --- a/nixpkgs/pkgs/development/web/valum/default.nix +++ b/nixpkgs/pkgs/development/web/valum/default.nix @@ -2,7 +2,7 @@ , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { - name = "valum-${version}"; + pname = "valum"; version = "0.3.15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/web/woff2/default.nix b/nixpkgs/pkgs/development/web/woff2/default.nix index bda6dab14d8a..b77184e56525 100644 --- a/nixpkgs/pkgs/development/web/woff2/default.nix +++ b/nixpkgs/pkgs/development/web/woff2/default.nix @@ -1,7 +1,7 @@ { brotli, cmake, fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { - name = "woff2-${version}"; + pname = "woff2"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/web/xmlindent/default.nix b/nixpkgs/pkgs/development/web/xmlindent/default.nix index f0966357d93d..b9b0ccf7272c 100644 --- a/nixpkgs/pkgs/development/web/xmlindent/default.nix +++ b/nixpkgs/pkgs/development/web/xmlindent/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex }: stdenv.mkDerivation rec { - name = "xmlindent-${version}"; + pname = "xmlindent"; version = "0.2.17"; src = fetchurl { - url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${pname}-${version}.tar.gz"; sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs"; }; diff --git a/nixpkgs/pkgs/games/0ad/data.nix b/nixpkgs/pkgs/games/0ad/data.nix index 2cfddd1066ba..eeedae924405 100644 --- a/nixpkgs/pkgs/games/0ad/data.nix +++ b/nixpkgs/pkgs/games/0ad/data.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zeroad-unwrapped }: stdenv.mkDerivation rec { - name = "0ad-data-${version}"; + pname = "0ad-data"; inherit (zeroad-unwrapped) version; src = fetchurl { diff --git a/nixpkgs/pkgs/games/0ad/game.nix b/nixpkgs/pkgs/games/0ad/game.nix index 74bc52875d22..ef285f8cb935 100644 --- a/nixpkgs/pkgs/games/0ad/game.nix +++ b/nixpkgs/pkgs/games/0ad/game.nix @@ -9,7 +9,7 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { - name = "0ad-${version}"; + pname = "0ad"; version = "0.0.23b"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/2048-in-terminal/default.nix b/nixpkgs/pkgs/games/2048-in-terminal/default.nix index 5d91bc04114b..446252062fac 100644 --- a/nixpkgs/pkgs/games/2048-in-terminal/default.nix +++ b/nixpkgs/pkgs/games/2048-in-terminal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "2048-in-terminal-${version}"; + pname = "2048-in-terminal"; version = "2017-11-29"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/airstrike/default.nix b/nixpkgs/pkgs/games/airstrike/default.nix index 02ea6f688069..19d2a01b4729 100644 --- a/nixpkgs/pkgs/games/airstrike/default.nix +++ b/nixpkgs/pkgs/games/airstrike/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, SDL, SDL_image }: stdenv.mkDerivation rec { - name = "airstrike-pre-${version}"; + pname = "airstrike-pre"; version = "6a"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/amoeba/data.nix b/nixpkgs/pkgs/games/amoeba/data.nix index b5c7f4b730b8..fcde2d591f13 100644 --- a/nixpkgs/pkgs/games/amoeba/data.nix +++ b/nixpkgs/pkgs/games/amoeba/data.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "amoeba-data-${version}"; + pname = "amoeba-data"; version = "1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/angband/default.nix b/nixpkgs/pkgs/games/angband/default.nix index 435329bdc4ab..46eb054bc8ef 100644 --- a/nixpkgs/pkgs/games/angband/default.nix +++ b/nixpkgs/pkgs/games/angband/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { + pname = "angband"; version = "4.2.0"; - name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; diff --git a/nixpkgs/pkgs/games/anki/default.nix b/nixpkgs/pkgs/games/anki/default.nix index b0efc54db363..ebfdc0e13738 100644 --- a/nixpkgs/pkgs/games/anki/default.nix +++ b/nixpkgs/pkgs/games/anki/default.nix @@ -18,6 +18,7 @@ , pytest , glibcLocales , nose +, jsonschema , send2trash , CoreAudio # This little flag adds a huge number of dependencies, but we assume that @@ -31,13 +32,14 @@ let # when updating, also update rev-manual to a recent version of # https://github.com/dae/ankidocs # The manual is distributed independently of the software. - version = "2.1.11"; - sha256-pkg = "0rcjam7f017yg0fx5apdc309lsx59lfw33nikczz7hrw6gby6z3q"; - rev-manual = "f933104fecd8a83c33494bdb2b59817a3318202f"; - sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h"; + version = "2.1.15"; + sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss"; + rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139"; + sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml"; manual = stdenv.mkDerivation { - name = "anki-manual-${version}"; + pname = "anki-manual"; + inherit version; src = fetchFromGitHub { owner = "dae"; repo = "ankidocs"; @@ -68,11 +70,12 @@ let in buildPythonApplication rec { - name = "anki-${version}"; + pname = "anki"; + inherit version; src = fetchurl { urls = [ - "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" + "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz" # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" # "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz" @@ -84,7 +87,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator - markdown + markdown jsonschema ] ++ lib.optional plotsSupport matplotlib ++ lib.optional stdenv.isDarwin [ CoreAudio ] diff --git a/nixpkgs/pkgs/games/armagetronad/default.nix b/nixpkgs/pkgs/games/armagetronad/default.nix index 5318108c4913..70c23664dc04 100644 --- a/nixpkgs/pkgs/games/armagetronad/default.nix +++ b/nixpkgs/pkgs/games/armagetronad/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "armagetron-${version}"; + pname = "armagetron"; + inherit version; src = fetchurl { url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2"; sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3"; diff --git a/nixpkgs/pkgs/games/arx-libertatis/default.nix b/nixpkgs/pkgs/games/arx-libertatis/default.nix index a8e9063a35f4..5b1f240e7b5f 100644 --- a/nixpkgs/pkgs/games/arx-libertatis/default.nix +++ b/nixpkgs/pkgs/games/arx-libertatis/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "arx-libertatis-${version}"; + pname = "arx-libertatis"; version = "2019-02-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/astromenace/default.nix b/nixpkgs/pkgs/games/astromenace/default.nix index b2c86222f2b0..37593d3bd726 100644 --- a/nixpkgs/pkgs/games/astromenace/default.nix +++ b/nixpkgs/pkgs/games/astromenace/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.2"; - name = "astromenace-${version}"; + pname = "astromenace"; src = fetchurl { url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/games/atanks/default.nix b/nixpkgs/pkgs/games/atanks/default.nix index de9eb9bbb580..b11a177e0455 100644 --- a/nixpkgs/pkgs/games/atanks/default.nix +++ b/nixpkgs/pkgs/games/atanks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { - name = "atanks-${version}"; + pname = "atanks"; version = "6.5"; src = fetchurl { - url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/atanks/atanks/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j"; }; diff --git a/nixpkgs/pkgs/games/bastet/default.nix b/nixpkgs/pkgs/games/bastet/default.nix index 27ddec616bc8..85b6fcefdd28 100644 --- a/nixpkgs/pkgs/games/bastet/default.nix +++ b/nixpkgs/pkgs/games/bastet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }: stdenv.mkDerivation rec { - name = "bastet-${version}"; + pname = "bastet"; version = "0.43.2"; buildInputs = [ ncurses boost ]; diff --git a/nixpkgs/pkgs/games/blobby/default.nix b/nixpkgs/pkgs/games/blobby/default.nix index af1228108d8f..d3eb2348a0d5 100644 --- a/nixpkgs/pkgs/games/blobby/default.nix +++ b/nixpkgs/pkgs/games/blobby/default.nix @@ -2,7 +2,7 @@ , pkgconfig, unzip}: stdenv.mkDerivation rec { version = "1.0"; - name = "blobby-volley-${version}"; + pname = "blobby-volley"; src = fetchurl { url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; diff --git a/nixpkgs/pkgs/games/braincurses/default.nix b/nixpkgs/pkgs/games/braincurses/default.nix index 808d7e378074..deb542e3a86f 100644 --- a/nixpkgs/pkgs/games/braincurses/default.nix +++ b/nixpkgs/pkgs/games/braincurses/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "braincurses-${version}"; + pname = "braincurses"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/brogue/default.nix b/nixpkgs/pkgs/games/brogue/default.nix index 5040886eaa00..e34dfc383a1a 100644 --- a/nixpkgs/pkgs/games/brogue/default.nix +++ b/nixpkgs/pkgs/games/brogue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }: stdenv.mkDerivation rec { - name = "brogue-${version}"; + pname = "brogue"; version = "1.7.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/bzflag/default.nix b/nixpkgs/pkgs/games/bzflag/default.nix index 6c7e9ac76a99..56d2866a2355 100644 --- a/nixpkgs/pkgs/games/bzflag/default.nix +++ b/nixpkgs/pkgs/games/bzflag/default.nix @@ -3,12 +3,11 @@ , Carbon, CoreServices }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "bzflag"; version = "2.4.18"; src = fetchurl { - url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; + url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2"; sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx"; }; diff --git a/nixpkgs/pkgs/games/chessx/default.nix b/nixpkgs/pkgs/games/chessx/default.nix index 47432bca1633..3b460daefd1a 100644 --- a/nixpkgs/pkgs/games/chessx/default.nix +++ b/nixpkgs/pkgs/games/chessx/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "chessx-${version}"; + pname = "chessx"; version = "1.5.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/ckan/default.nix b/nixpkgs/pkgs/games/ckan/default.nix index 47ab73ca269e..81f1ee0cd153 100644 --- a/nixpkgs/pkgs/games/ckan/default.nix +++ b/nixpkgs/pkgs/games/ckan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }: stdenv.mkDerivation rec { - name = "ckan-${version}"; + pname = "ckan"; version = "1.16.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/commandergenius/default.nix b/nixpkgs/pkgs/games/commandergenius/default.nix index a38678882c86..56164cfc017f 100644 --- a/nixpkgs/pkgs/games/commandergenius/default.nix +++ b/nixpkgs/pkgs/games/commandergenius/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "commandergenius-${version}"; + pname = "commandergenius"; version = "2.3.3"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/games/construo/default.nix b/nixpkgs/pkgs/games/construo/default.nix index c6ccac69b8cb..9528c6d06cb4 100644 --- a/nixpkgs/pkgs/games/construo/default.nix +++ b/nixpkgs/pkgs/games/construo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }: stdenv.mkDerivation rec { - name = "construo-${version}"; + pname = "construo"; version = "0.2.3"; src = fetchurl { - url = "https://github.com/Construo/construo/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/Construo/construo/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa"; }; diff --git a/nixpkgs/pkgs/games/crafty/default.nix b/nixpkgs/pkgs/games/crafty/default.nix index 9526512f15cc..c9dcd2d9d400 100644 --- a/nixpkgs/pkgs/games/crafty/default.nix +++ b/nixpkgs/pkgs/games/crafty/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "crafty-${version}"; + pname = "crafty"; version = "25.0.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/crrcsim/default.nix b/nixpkgs/pkgs/games/crrcsim/default.nix index 98baafbb2fd2..b9d3a69d87b3 100644 --- a/nixpkgs/pkgs/games/crrcsim/default.nix +++ b/nixpkgs/pkgs/games/crrcsim/default.nix @@ -3,10 +3,11 @@ let version = "0.9.13"; in stdenv.mkDerivation rec { - name = "crrcsim-${version}"; + pname = "crrcsim"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/crrcsim/${name}.tar.gz"; + url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz"; sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698"; }; diff --git a/nixpkgs/pkgs/games/cutemaze/default.nix b/nixpkgs/pkgs/games/cutemaze/default.nix index e0f35fe6d6dc..24077697218d 100644 --- a/nixpkgs/pkgs/games/cutemaze/default.nix +++ b/nixpkgs/pkgs/games/cutemaze/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }: mkDerivation rec { - name = "cutemaze-${version}"; + pname = "cutemaze"; version = "1.2.5"; src = fetchurl { - url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; + url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj"; }; diff --git a/nixpkgs/pkgs/games/cuyo/default.nix b/nixpkgs/pkgs/games/cuyo/default.nix index 19d857a8e78c..f4e5290df27b 100644 --- a/nixpkgs/pkgs/games/cuyo/default.nix +++ b/nixpkgs/pkgs/games/cuyo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_mixer, zlib }: stdenv.mkDerivation rec { - name = "cuyo-${version}"; + pname = "cuyo"; version = "2.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/dhewm3/default.nix b/nixpkgs/pkgs/games/dhewm3/default.nix index 8b92c2e9d6fb..441e9f66981c 100644 --- a/nixpkgs/pkgs/games/dhewm3/default.nix +++ b/nixpkgs/pkgs/games/dhewm3/default.nix @@ -2,7 +2,7 @@ , openal, curl }: stdenv.mkDerivation rec { - name = "dhewm3-${version}"; + pname = "dhewm3"; version = "1.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix index a77250543107..0b25af645cfa 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -84,7 +84,8 @@ let ''; dfhack = stdenv.mkDerivation rec { - name = "dfhack-base-${version}"; + pname = "dfhack-base"; + inherit version; # Beware of submodules src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 652e4c184753..bcef336f342a 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,7 +2,7 @@ , qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { - name = "dwarf-therapist-${version}"; + pname = "dwarf-therapist"; version = "41.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/dwarf-fortress/soundsense.nix b/nixpkgs/pkgs/games/dwarf-fortress/soundsense.nix index caa9adeefd06..a59c87306903 100644 --- a/nixpkgs/pkgs/games/dwarf-fortress/soundsense.nix +++ b/nixpkgs/pkgs/games/dwarf-fortress/soundsense.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; dfVersion = "0.44.12"; inherit soundPack; - name = "soundsense-${version}"; + pname = "soundsense"; src = fetchzip { url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip"; sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk"; diff --git a/nixpkgs/pkgs/games/dxx-rebirth/default.nix b/nixpkgs/pkgs/games/dxx-rebirth/default.nix index 86d233b03785..518b63ed483c 100644 --- a/nixpkgs/pkgs/games/dxx-rebirth/default.nix +++ b/nixpkgs/pkgs/games/dxx-rebirth/default.nix @@ -9,7 +9,7 @@ let }; in stdenv.mkDerivation rec { - name = "dxx-rebirth-${version}"; + pname = "dxx-rebirth"; version = "0.59.100"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/easyrpg-player/default.nix b/nixpkgs/pkgs/games/easyrpg-player/default.nix index 68dbe12bb733..dfa57a728649 100644 --- a/nixpkgs/pkgs/games/easyrpg-player/default.nix +++ b/nixpkgs/pkgs/games/easyrpg-player/default.nix @@ -4,7 +4,7 @@ , mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }: stdenv.mkDerivation rec { - name = "easyrpg-player-${version}"; + pname = "easyrpg-player"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/eduke32/default.nix b/nixpkgs/pkgs/games/eduke32/default.nix index 3407659d977b..2999da8fcaaf 100644 --- a/nixpkgs/pkgs/games/eduke32/default.nix +++ b/nixpkgs/pkgs/games/eduke32/default.nix @@ -18,7 +18,8 @@ let wrapper = "eduke32-wrapper"; in stdenv.mkDerivation { - name = "eduke32-${version}"; + pname = "eduke32"; + inherit version; src = fetchurl { url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz"; diff --git a/nixpkgs/pkgs/games/empty-epsilon/default.nix b/nixpkgs/pkgs/games/empty-epsilon/default.nix index 6815041c96b4..18c83b8c5a4c 100644 --- a/nixpkgs/pkgs/games/empty-epsilon/default.nix +++ b/nixpkgs/pkgs/games/empty-epsilon/default.nix @@ -9,7 +9,7 @@ let version = "${major}.${minor}.${patch}"; serious-proton = stdenv.mkDerivation rec { - name = "serious-proton-${version}"; + pname = "serious-proton"; inherit version; src = fetchFromGitHub { @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { - name = "empty-epsilon-${version}"; + pname = "empty-epsilon"; inherit version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/endless-sky/default.nix b/nixpkgs/pkgs/games/endless-sky/default.nix index 447724a2043f..a138b46f81bd 100644 --- a/nixpkgs/pkgs/games/endless-sky/default.nix +++ b/nixpkgs/pkgs/games/endless-sky/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation rec { - name = "endless-sky-${version}"; + pname = "endless-sky"; + inherit version; src = fetchFromGitHub { owner = "endless-sky"; diff --git a/nixpkgs/pkgs/games/enyo-doom/default.nix b/nixpkgs/pkgs/games/enyo-doom/default.nix index 742ca9591357..af002a690e4d 100644 --- a/nixpkgs/pkgs/games/enyo-doom/default.nix +++ b/nixpkgs/pkgs/games/enyo-doom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, cmake, qtbase }: stdenv.mkDerivation rec { - name = "enyo-doom-${version}"; + pname = "enyo-doom"; version = "1.06.9"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/games/eternity-engine/default.nix b/nixpkgs/pkgs/games/eternity-engine/default.nix index 911308a078a5..86a83d68f021 100644 --- a/nixpkgs/pkgs/games/eternity-engine/default.nix +++ b/nixpkgs/pkgs/games/eternity-engine/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "eternity-engine-${version}"; + pname = "eternity-engine"; version = "3.42.02"; src = fetchFromGitHub { owner = "team-eternity"; diff --git a/nixpkgs/pkgs/games/extremetuxracer/default.nix b/nixpkgs/pkgs/games/extremetuxracer/default.nix index fba1ce01c45a..30788c7ec5c8 100644 --- a/nixpkgs/pkgs/games/extremetuxracer/default.nix +++ b/nixpkgs/pkgs/games/extremetuxracer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.7.5"; - name = "extremetuxracer-${version}"; + pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/games/ezquake/default.nix b/nixpkgs/pkgs/games/ezquake/default.nix index 85433e116fbc..e06975e8db41 100644 --- a/nixpkgs/pkgs/games/ezquake/default.nix +++ b/nixpkgs/pkgs/games/ezquake/default.nix @@ -3,7 +3,6 @@ , pkgconfig, SDL2, vim }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "ezquake"; version = "3.0.1"; diff --git a/nixpkgs/pkgs/games/fairymax/default.nix b/nixpkgs/pkgs/games/fairymax/default.nix index 1aab0933b1bf..44ed91da1685 100644 --- a/nixpkgs/pkgs/games/fairymax/default.nix +++ b/nixpkgs/pkgs/games/fairymax/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "fairymax-${version}"; + pname = "fairymax"; version = "4.8"; src = fetchurl { url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c"; diff --git a/nixpkgs/pkgs/games/fish-fillets-ng/default.nix b/nixpkgs/pkgs/games/fish-fillets-ng/default.nix index 2ab6e04e2d82..47f72c52c1f0 100644 --- a/nixpkgs/pkgs/games/fish-fillets-ng/default.nix +++ b/nixpkgs/pkgs/games/fish-fillets-ng/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}: stdenv.mkDerivation rec { - name = "fish-fillets-ng-${version}"; + pname = "fish-fillets-ng"; version = "1.0.1"; src = fetchurl { url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/games/flightgear/default.nix b/nixpkgs/pkgs/games/flightgear/default.nix index 5a04e75030f6..19851341da0c 100644 --- a/nixpkgs/pkgs/games/flightgear/default.nix +++ b/nixpkgs/pkgs/games/flightgear/default.nix @@ -9,7 +9,8 @@ let version = "2019.1.1"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { - name = "flightgear-base-${version}"; + pname = "flightgear-base"; + inherit version; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; diff --git a/nixpkgs/pkgs/games/fltrator/default.nix b/nixpkgs/pkgs/games/fltrator/default.nix index ef46ea840b79..957452aa1629 100644 --- a/nixpkgs/pkgs/games/fltrator/default.nix +++ b/nixpkgs/pkgs/games/fltrator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, fltk, which, libjpeg }: stdenv.mkDerivation rec { - name = "fltrator-${version}"; + pname = "fltrator"; version = "2.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/freecell-solver/default.nix b/nixpkgs/pkgs/games/freecell-solver/default.nix index 35bc22e87897..3ba383c74273 100644 --- a/nixpkgs/pkgs/games/freecell-solver/default.nix +++ b/nixpkgs/pkgs/games/freecell-solver/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "freecell-solver-${version}"; + pname = "freecell-solver"; version = "4.18.0"; src = fetchurl { - url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; + url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz"; sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn"; }; diff --git a/nixpkgs/pkgs/games/freedink/default.nix b/nixpkgs/pkgs/games/freedink/default.nix index d5efe2b3ebd9..3b8bc1288efc 100644 --- a/nixpkgs/pkgs/games/freedink/default.nix +++ b/nixpkgs/pkgs/games/freedink/default.nix @@ -5,10 +5,11 @@ let version = "1.08.20121209"; freedink_data = stdenv.mkDerivation rec { - name = "freedink-data-${version}"; + pname = "freedink-data"; + inherit version; src = fetchurl { - url = "mirror://gnu/freedink/${name}.tar.gz"; + url = "mirror://gnu/freedink/${pname}-${version}.tar.gz"; sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j"; }; @@ -16,10 +17,11 @@ let }; in stdenv.mkDerivation rec { - name = "freedink-${version}"; + pname = "freedink"; + inherit version; src = fetchurl { - url = "mirror://gnu/freedink/${name}.tar.gz"; + url = "mirror://gnu/freedink/${pname}-${version}.tar.gz"; sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr"; }; diff --git a/nixpkgs/pkgs/games/freedroidrpg/default.nix b/nixpkgs/pkgs/games/freedroidrpg/default.nix index 2ebb60f3d5db..b269a5d12d6d 100644 --- a/nixpkgs/pkgs/games/freedroidrpg/default.nix +++ b/nixpkgs/pkgs/games/freedroidrpg/default.nix @@ -3,7 +3,8 @@ let version = "0.16.1"; in stdenv.mkDerivation rec { - name = "freedroidrpg-${version}"; + pname = "freedroidrpg"; + inherit version; src = fetchurl { url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/games/freeorion/default.nix b/nixpkgs/pkgs/games/freeorion/default.nix index 125f02005a33..d0f514f239d5 100644 --- a/nixpkgs/pkgs/games/freeorion/default.nix +++ b/nixpkgs/pkgs/games/freeorion/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4.8"; - name = "freeorion-${version}"; + pname = "freeorion"; src = fetchFromGitHub { owner = "freeorion"; diff --git a/nixpkgs/pkgs/games/freesweep/default.nix b/nixpkgs/pkgs/games/freesweep/default.nix index dd0707fe5c39..94efe1b650a7 100644 --- a/nixpkgs/pkgs/games/freesweep/default.nix +++ b/nixpkgs/pkgs/games/freesweep/default.nix @@ -2,7 +2,7 @@ updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { - name = "freesweep-${version}"; + pname = "freesweep"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/frotz/default.nix b/nixpkgs/pkgs/games/frotz/default.nix index 3b4fb6842dbb..3dbd7bd928b6 100644 --- a/nixpkgs/pkgs/games/frotz/default.nix +++ b/nixpkgs/pkgs/games/frotz/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.44"; - name = "frotz-${version}"; + pname = "frotz"; src = fetchFromGitHub { owner = "DavidGriffith"; diff --git a/nixpkgs/pkgs/games/galaxis/default.nix b/nixpkgs/pkgs/games/galaxis/default.nix index dd27f96f7d40..f5089b6395f4 100644 --- a/nixpkgs/pkgs/games/galaxis/default.nix +++ b/nixpkgs/pkgs/games/galaxis/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "galaxis-${version}"; + pname = "galaxis"; version = "1.10"; src = fetchurl{ - url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz"; + url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz"; sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r"; }; diff --git a/nixpkgs/pkgs/games/gambatte/default.nix b/nixpkgs/pkgs/games/gambatte/default.nix index dabcfb19db04..de4a89eac07f 100644 --- a/nixpkgs/pkgs/games/gambatte/default.nix +++ b/nixpkgs/pkgs/games/gambatte/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, scons, qt4 }: stdenv.mkDerivation rec { - name = "gambatte-${version}"; + pname = "gambatte"; version = "2016-05-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix b/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix index 066cadb13b17..4c57538e234e 100644 --- a/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix +++ b/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, allegro }: stdenv.mkDerivation rec { - name = "garden-of-coloured-lights-${version}"; + pname = "garden-of-coloured-lights"; version = "1.0.9"; buildInputs = [ allegro autoconf automake ]; diff --git a/nixpkgs/pkgs/games/gcs/default.nix b/nixpkgs/pkgs/games/gcs/default.nix index b718a92143cb..3665467407a9 100644 --- a/nixpkgs/pkgs/games/gcs/default.nix +++ b/nixpkgs/pkgs/games/gcs/default.nix @@ -29,10 +29,10 @@ let sha256 = "085jpp9mpv5kw00zds9sywmfq31mrlbrgahnwcjkx0z9i22amz4g"; }; in stdenv.mkDerivation rec { - name = "gcs-${version}"; + pname = "gcs"; version = "4.8.0"; - src = runCommand "${name}-src" { preferLocalBuild = true; } '' + src = runCommand "${pname}-${version}-src" { preferLocalBuild = true; } '' mkdir -p $out cd $out diff --git a/nixpkgs/pkgs/games/gemrb/default.nix b/nixpkgs/pkgs/games/gemrb/default.nix index fc7bf7168ddf..72afca4cd2cf 100644 --- a/nixpkgs/pkgs/games/gemrb/default.nix +++ b/nixpkgs/pkgs/games/gemrb/default.nix @@ -3,7 +3,7 @@ , libiconv }: stdenv.mkDerivation rec { - name = "gemrb-${version}"; + pname = "gemrb"; version = "0.8.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/gl-117/default.nix b/nixpkgs/pkgs/games/gl-117/default.nix index b9694811fa51..fb60808bab70 100644 --- a/nixpkgs/pkgs/games/gl-117/default.nix +++ b/nixpkgs/pkgs/games/gl-117/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gl-117-${version}"; + pname = "gl-117"; version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${name}.tar.bz2"; + url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${pname}-${version}.tar.bz2"; sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4"; }; diff --git a/nixpkgs/pkgs/games/gnugo/default.nix b/nixpkgs/pkgs/games/gnugo/default.nix index 2952edaa78d9..fa8d59c05030 100644 --- a/nixpkgs/pkgs/games/gnugo/default.nix +++ b/nixpkgs/pkgs/games/gnugo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gnugo-${version}"; + pname = "gnugo"; version = "3.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/gnujump/default.nix b/nixpkgs/pkgs/games/gnujump/default.nix index 64c3954ba485..4bf460836d98 100644 --- a/nixpkgs/pkgs/games/gnujump/default.nix +++ b/nixpkgs/pkgs/games/gnujump/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: stdenv.mkDerivation rec { - name = "gnujump-${version}"; + pname = "gnujump"; version = "1.0.8"; src = fetchurl { - url = "mirror://gnu/gnujump/${name}.tar.gz"; + url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz"; sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; }; buildInputs = [ SDL SDL_image SDL_mixer ]; diff --git a/nixpkgs/pkgs/games/gnushogi/default.nix b/nixpkgs/pkgs/games/gnushogi/default.nix index e85674550308..381b4fd59593 100644 --- a/nixpkgs/pkgs/games/gnushogi/default.nix +++ b/nixpkgs/pkgs/games/gnushogi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gnushogi-${version}"; + pname = "gnushogi"; version = "1.4.2"; buildInputs = [ zlib ]; src = fetchurl { - url = "mirror://gnu/gnushogi/${name}.tar.gz"; + url = "mirror://gnu/gnushogi/${pname}-${version}.tar.gz"; sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"; }; diff --git a/nixpkgs/pkgs/games/gogui/default.nix b/nixpkgs/pkgs/games/gogui/default.nix index e89d16b788a6..f9ae137bb626 100644 --- a/nixpkgs/pkgs/games/gogui/default.nix +++ b/nixpkgs/pkgs/games/gogui/default.nix @@ -3,7 +3,8 @@ let version = "1.4.9"; in stdenv.mkDerivation { - name = "gogui-${version}"; + pname = "gogui"; + inherit version; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; diff --git a/nixpkgs/pkgs/games/gtypist/default.nix b/nixpkgs/pkgs/games/gtypist/default.nix index b29b045a4217..6031762d1d6b 100644 --- a/nixpkgs/pkgs/games/gtypist/default.nix +++ b/nixpkgs/pkgs/games/gtypist/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, libiconv, ncurses, perl, fortune}: stdenv.mkDerivation rec { - name = "gtypist-${version}"; + pname = "gtypist"; version = "2.9.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/gzdoom/default.nix b/nixpkgs/pkgs/games/gzdoom/default.nix index 043be5e23d9b..3ccbdf525ce0 100644 --- a/nixpkgs/pkgs/games/gzdoom/default.nix +++ b/nixpkgs/pkgs/games/gzdoom/default.nix @@ -3,7 +3,7 @@ , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { - name = "gzdoom-${version}"; + pname = "gzdoom"; version = "4.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/hawkthorne/default.nix b/nixpkgs/pkgs/games/hawkthorne/default.nix index 470e1d090fcd..97aee425fd16 100644 --- a/nixpkgs/pkgs/games/hawkthorne/default.nix +++ b/nixpkgs/pkgs/games/hawkthorne/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.12.1"; - name = "hawkthorne-${version}"; + pname = "hawkthorne"; src = fetchgit { url = "https://github.com/hawkthorne/hawkthorne-journey.git"; diff --git a/nixpkgs/pkgs/games/hedgewars/default.nix b/nixpkgs/pkgs/games/hedgewars/default.nix index ea229db6a747..7ef5c6a49b3e 100644 --- a/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/nixpkgs/pkgs/games/hedgewars/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { version = "1.0.0-beta1"; - name = "hedgewars-${version}"; + pname = "hedgewars"; src = fetchhg { url = "https://hg.hedgewars.org/hedgewars/"; rev = "7ab5cf405686"; diff --git a/nixpkgs/pkgs/games/holdingnuts/default.nix b/nixpkgs/pkgs/games/holdingnuts/default.nix index e6d6febeac6f..c20cce723c26 100644 --- a/nixpkgs/pkgs/games/holdingnuts/default.nix +++ b/nixpkgs/pkgs/games/holdingnuts/default.nix @@ -2,12 +2,11 @@ let mirror = "http://download.holdingnuts.net"; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "holdingnuts"; version = "0.0.5"; src = fetchurl { - url = "${mirror}/release/${version}/${name}.tar.bz2"; + url = "${mirror}/release/${version}/${pname}-${version}.tar.bz2"; sha256 = "0iw25jmnqzscg34v66d4zz70lvgjp4l7gi16nna6491xnqha5a8g"; }; diff --git a/nixpkgs/pkgs/games/hyperrogue/default.nix b/nixpkgs/pkgs/games/hyperrogue/default.nix index 760d82c026d2..b4f5e4f7f630 100644 --- a/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -2,7 +2,7 @@ libpng, glew, makeDesktopItem }: stdenv.mkDerivation rec { - name = "hyperrogue-${version}"; + pname = "hyperrogue"; version = "10.5e"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/instead-launcher/default.nix b/nixpkgs/pkgs/games/instead-launcher/default.nix index 39324843e5e5..10d29657d7cf 100644 --- a/nixpkgs/pkgs/games/instead-launcher/default.nix +++ b/nixpkgs/pkgs/games/instead-launcher/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }: stdenv.mkDerivation rec { - name = "instead-launcher-${version}"; + pname = "instead-launcher"; version = "0.7.0"; diff --git a/nixpkgs/pkgs/games/ivan/default.nix b/nixpkgs/pkgs/games/ivan/default.nix index f84b83a3010d..86f3f7214466 100644 --- a/nixpkgs/pkgs/games/ivan/default.nix +++ b/nixpkgs/pkgs/games/ivan/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "ivan-${version}"; + pname = "ivan"; version = "056"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/ja2-stracciatella/default.nix b/nixpkgs/pkgs/games/ja2-stracciatella/default.nix index 37c45e7aa603..94c614598bfe 100644 --- a/nixpkgs/pkgs/games/ja2-stracciatella/default.nix +++ b/nixpkgs/pkgs/games/ja2-stracciatella/default.nix @@ -27,7 +27,7 @@ let }; in stdenv.mkDerivation rec { - name = "ja2-stracciatella-${version}"; + pname = "ja2-stracciatella"; inherit src; inherit version; diff --git a/nixpkgs/pkgs/games/klavaro/default.nix b/nixpkgs/pkgs/games/klavaro/default.nix index 4cea30c79e6d..e2a4cff291ba 100644 --- a/nixpkgs/pkgs/games/klavaro/default.nix +++ b/nixpkgs/pkgs/games/klavaro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }: stdenv.mkDerivation rec { - name = "klavaro-${version}"; + pname = "klavaro"; version = "3.08"; src = fetchurl { - url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; + url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc"; }; diff --git a/nixpkgs/pkgs/games/lbreakout2/default.nix b/nixpkgs/pkgs/games/lbreakout2/default.nix index b5f858b99ad7..0e6941a8acd5 100644 --- a/nixpkgs/pkgs/games/lbreakout2/default.nix +++ b/nixpkgs/pkgs/games/lbreakout2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: stdenv.mkDerivation rec { - name = "lbreakout2-${version}"; + pname = "lbreakout2"; version = "2.6.5"; buildInputs = [ SDL SDL_mixer zlib libpng libintl ]; src = fetchurl { - url = "mirror://sourceforge/lgames/${name}.tar.gz"; + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; }; diff --git a/nixpkgs/pkgs/games/leela-zero/default.nix b/nixpkgs/pkgs/games/leela-zero/default.nix index d00072d24551..d4621682cc67 100644 --- a/nixpkgs/pkgs/games/leela-zero/default.nix +++ b/nixpkgs/pkgs/games/leela-zero/default.nix @@ -2,7 +2,7 @@ , opencl-headers, ocl-icd, qtbase , zlib }: stdenv.mkDerivation rec { - name = "leela-zero-${version}"; + pname = "leela-zero"; version = "0.17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/lgogdownloader/default.nix b/nixpkgs/pkgs/games/lgogdownloader/default.nix index daf7dd7f61f4..505d98c92dbe 100644 --- a/nixpkgs/pkgs/games/lgogdownloader/default.nix +++ b/nixpkgs/pkgs/games/lgogdownloader/default.nix @@ -2,7 +2,7 @@ , htmlcxx, rhash, tinyxml-2, help2man }: stdenv.mkDerivation rec { - name = "lgogdownloader-${version}"; + pname = "lgogdownloader"; version = "3.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/liberal-crime-squad/default.nix b/nixpkgs/pkgs/games/liberal-crime-squad/default.nix index fef6e11d9be9..0e819278dc39 100644 --- a/nixpkgs/pkgs/games/liberal-crime-squad/default.nix +++ b/nixpkgs/pkgs/games/liberal-crime-squad/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2016-07-06"; - name = "liberal-crime-squad-${version}"; + pname = "liberal-crime-squad"; src = fetchFromGitHub { owner = "Kamal-Sadek"; diff --git a/nixpkgs/pkgs/games/lincity/default.nix b/nixpkgs/pkgs/games/lincity/default.nix index 0abbfda33c7b..fb98b1a3811b 100644 --- a/nixpkgs/pkgs/games/lincity/default.nix +++ b/nixpkgs/pkgs/games/lincity/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }: stdenv.mkDerivation rec { - name = "lincity-${version}"; + pname = "lincity"; version = "1.13.1"; src = fetchurl { - url = "mirror://sourceforge/lincity/${name}.tar.gz"; + url = "mirror://sourceforge/lincity/${pname}-${version}.tar.gz"; sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v"; }; diff --git a/nixpkgs/pkgs/games/lincity/ng.nix b/nixpkgs/pkgs/games/lincity/ng.nix index b860d2ee58b1..cfc06e11e191 100644 --- a/nixpkgs/pkgs/games/lincity/ng.nix +++ b/nixpkgs/pkgs/games/lincity/ng.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "lincity-ng-${version}"; + pname = "lincity-ng"; version = "2.9beta.20170715"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/linux-steam-integration/default.nix b/nixpkgs/pkgs/games/linux-steam-integration/default.nix index 1fcf9c9527bd..f57571b2a2c4 100644 --- a/nixpkgs/pkgs/games/linux-steam-integration/default.nix +++ b/nixpkgs/pkgs/games/linux-steam-integration/default.nix @@ -5,7 +5,8 @@ let version = "0.7.3"; in stdenv.mkDerivation rec { - name = "linux-steam-integration-${version}"; + pname = "linux-steam-integration"; + inherit version; src = fetchFromGitHub { owner = "clearlinux"; diff --git a/nixpkgs/pkgs/games/liquidwar/5.nix b/nixpkgs/pkgs/games/liquidwar/5.nix index d748c96da242..0bd90f77b240 100644 --- a/nixpkgs/pkgs/games/liquidwar/5.nix +++ b/nixpkgs/pkgs/games/liquidwar/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { version = "5.6.4"; - name = "liquidwar5-${version}"; + pname = "liquidwar5"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz"; sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j"; diff --git a/nixpkgs/pkgs/games/liquidwar/default.nix b/nixpkgs/pkgs/games/liquidwar/default.nix index af7101f216d5..800ac0fc4c7a 100644 --- a/nixpkgs/pkgs/games/liquidwar/default.nix +++ b/nixpkgs/pkgs/games/liquidwar/default.nix @@ -6,11 +6,11 @@ , libogg, libvorbis, libcaca, csound, cunit } : stdenv.mkDerivation rec { - name = "liquidwar6-${version}"; + pname = "liquidwar6"; version = "0.6.3902"; src = fetchurl { - url = "mirror://gnu/liquidwar6/${name}.tar.gz"; + url = "mirror://gnu/liquidwar6/${pname}-${version}.tar.gz"; sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn"; }; diff --git a/nixpkgs/pkgs/games/ltris/default.nix b/nixpkgs/pkgs/games/ltris/default.nix index 10a79a696732..d580d7586ff9 100644 --- a/nixpkgs/pkgs/games/ltris/default.nix +++ b/nixpkgs/pkgs/games/ltris/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, SDL, SDL_mixer }: stdenv.mkDerivation rec { - name = "ltris-${version}"; + pname = "ltris"; version = "1.0.19"; buildInputs = [ SDL SDL_mixer ]; src = fetchurl { - url = "mirror://sourceforge/lgames/${name}.tar.gz"; + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg"; }; diff --git a/nixpkgs/pkgs/games/mar1d/default.nix b/nixpkgs/pkgs/games/mar1d/default.nix index da711f59af02..ed0b2be0d978 100644 --- a/nixpkgs/pkgs/games/mar1d/default.nix +++ b/nixpkgs/pkgs/games/mar1d/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - name = "MAR1D-${version}"; + pname = "MAR1D"; version = "0.2.0"; options = "-w${toString width}" + " -s${toString sensitivity}" diff --git a/nixpkgs/pkgs/games/megaglest/default.nix b/nixpkgs/pkgs/games/megaglest/default.nix index de67afe45a94..df613bb44470 100644 --- a/nixpkgs/pkgs/games/megaglest/default.nix +++ b/nixpkgs/pkgs/games/megaglest/default.nix @@ -17,7 +17,8 @@ let }; in stdenv.mkDerivation { - name = "megaglest-${version}"; + pname = "megaglest"; + inherit version; src = fetchFromGitHub { owner = "MegaGlest"; diff --git a/nixpkgs/pkgs/games/meritous/default.nix b/nixpkgs/pkgs/games/meritous/default.nix index 21d2ad87dfb8..8b0808d8e8cc 100644 --- a/nixpkgs/pkgs/games/meritous/default.nix +++ b/nixpkgs/pkgs/games/meritous/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: stdenv.mkDerivation rec { - name = "meritous-${version}"; + pname = "meritous"; version = "1.4"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/games/minecraft-server/default.nix b/nixpkgs/pkgs/games/minecraft-server/default.nix index 4fd44880b827..9ddae8b65bf3 100644 --- a/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/nixpkgs/pkgs/games/minecraft-server/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "minecraft-server-${version}"; + pname = "minecraft-server"; version = "1.14.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/minetest/default.nix b/nixpkgs/pkgs/games/minetest/default.nix index 17366ae99040..52a911655373 100644 --- a/nixpkgs/pkgs/games/minetest/default.nix +++ b/nixpkgs/pkgs/games/minetest/default.nix @@ -24,7 +24,8 @@ let }; }; in stdenv.mkDerivation { - name = "minetest-${version}"; + pname = "minetest"; + inherit version; src = sources.src; diff --git a/nixpkgs/pkgs/games/mudlet/default.nix b/nixpkgs/pkgs/games/mudlet/default.nix index dab83ddc900d..4dcc7a6262f0 100644 --- a/nixpkgs/pkgs/games/mudlet/default.nix +++ b/nixpkgs/pkgs/games/mudlet/default.nix @@ -2,7 +2,7 @@ , boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }: stdenv.mkDerivation rec { - name = "mudlet-${version}"; + pname = "mudlet"; version = "3.0.0-delta"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/newtonwars/default.nix b/nixpkgs/pkgs/games/newtonwars/default.nix index c806dfa5b806..c465b413db12 100644 --- a/nixpkgs/pkgs/games/newtonwars/default.nix +++ b/nixpkgs/pkgs/games/newtonwars/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: stdenv.mkDerivation rec { - name = "newtonwars-${version}"; + pname = "newtonwars"; version = "20150609"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/nexuiz/default.nix b/nixpkgs/pkgs/games/nexuiz/default.nix index 39b3ae36f506..72d60eae7f66 100644 --- a/nixpkgs/pkgs/games/nexuiz/default.nix +++ b/nixpkgs/pkgs/games/nexuiz/default.nix @@ -13,7 +13,8 @@ let version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; in stdenv.mkDerivation { - name = "nexuiz-${version}"; + pname = "nexuiz"; + inherit version; src = fetchurl { url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip"; diff --git a/nixpkgs/pkgs/games/openarena/default.nix b/nixpkgs/pkgs/games/openarena/default.nix index 8ac020f3ce09..b39519193e77 100644 --- a/nixpkgs/pkgs/games/openarena/default.nix +++ b/nixpkgs/pkgs/games/openarena/default.nix @@ -1,7 +1,7 @@ { fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: stdenv.mkDerivation rec { - name = "openarena-${version}"; + pname = "openarena"; version = "0.8.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/openclonk/default.nix b/nixpkgs/pkgs/games/openclonk/default.nix index fa0411196318..cce643e9f7db 100644 --- a/nixpkgs/pkgs/games/openclonk/default.nix +++ b/nixpkgs/pkgs/games/openclonk/default.nix @@ -11,7 +11,7 @@ let }; in stdenv.mkDerivation rec { version = "8.1"; - name = "openclonk-${version}"; + pname = "openclonk"; src = fetchurl { url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; diff --git a/nixpkgs/pkgs/games/opendune/default.nix b/nixpkgs/pkgs/games/opendune/default.nix index d2f1e27b10ec..751eb6d5933e 100644 --- a/nixpkgs/pkgs/games/opendune/default.nix +++ b/nixpkgs/pkgs/games/opendune/default.nix @@ -7,7 +7,7 @@ # - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php stdenv.mkDerivation rec { - name = "opendune-${version}"; + pname = "opendune"; version = "0.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/opendungeons/default.nix b/nixpkgs/pkgs/games/opendungeons/default.nix index 3c4e85a91e5a..d59afc330a79 100644 --- a/nixpkgs/pkgs/games/opendungeons/default.nix +++ b/nixpkgs/pkgs/games/opendungeons/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }: stdenv.mkDerivation rec { - name = "opendungeons-${version}"; + pname = "opendungeons"; version = "0.7.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/openmw/default.nix b/nixpkgs/pkgs/games/openmw/default.nix index 8cfcb1478288..d9c992199c40 100644 --- a/nixpkgs/pkgs/games/openmw/default.nix +++ b/nixpkgs/pkgs/games/openmw/default.nix @@ -12,12 +12,12 @@ let }); in mkDerivation rec { version = "0.45.0"; - name = "openmw-${version}"; + pname = "openmw"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4"; }; diff --git a/nixpkgs/pkgs/games/openrw/default.nix b/nixpkgs/pkgs/games/openrw/default.nix index 63fb24dc4d7d..fab4de64ee2c 100644 --- a/nixpkgs/pkgs/games/openrw/default.nix +++ b/nixpkgs/pkgs/games/openrw/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2017-09-17"; - name = "openrw-${version}"; + pname = "openrw"; src = fetchgit { url = "https://github.com/rwengine/openrw"; diff --git a/nixpkgs/pkgs/games/openspades/default.nix b/nixpkgs/pkgs/games/openspades/default.nix index e0acf60144ed..de05e1944f39 100644 --- a/nixpkgs/pkgs/games/openspades/default.nix +++ b/nixpkgs/pkgs/games/openspades/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "openspades-${version}"; + pname = "openspades"; version = "0.1.3"; devPakVersion = "33"; diff --git a/nixpkgs/pkgs/games/openttd/default.nix b/nixpkgs/pkgs/games/openttd/default.nix index 91969a335f8f..e3c23ad26716 100644 --- a/nixpkgs/pkgs/games/openttd/default.nix +++ b/nixpkgs/pkgs/games/openttd/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { - name = "openttd-${version}"; + pname = "openttd"; version = "1.9.2"; src = fetchurl { - url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; + url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr"; }; diff --git a/nixpkgs/pkgs/games/opentyrian/default.nix b/nixpkgs/pkgs/games/opentyrian/default.nix index c91f9807581e..2dae58df9765 100644 --- a/nixpkgs/pkgs/games/opentyrian/default.nix +++ b/nixpkgs/pkgs/games/opentyrian/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fetchzip, SDL, SDL_net}: stdenv.mkDerivation rec { - name = "opentyrian-${version}"; + pname = "opentyrian"; version = "2.1.20130907"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/openxcom/default.nix b/nixpkgs/pkgs/games/openxcom/default.nix index 211172cee203..9b3d92a350d3 100644 --- a/nixpkgs/pkgs/games/openxcom/default.nix +++ b/nixpkgs/pkgs/games/openxcom/default.nix @@ -3,7 +3,8 @@ let version = "1.0.0.2018.10.08"; in stdenv.mkDerivation { - name = "openxcom-${version}"; + pname = "openxcom"; + inherit version; src = fetchFromGitHub { owner = "SupSuper"; repo = "OpenXcom"; diff --git a/nixpkgs/pkgs/games/pacvim/default.nix b/nixpkgs/pkgs/games/pacvim/default.nix index 59e7c874d141..a0169debfef8 100644 --- a/nixpkgs/pkgs/games/pacvim/default.nix +++ b/nixpkgs/pkgs/games/pacvim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "pacvim-${version}"; + pname = "pacvim"; version = "2018-05-16"; src = fetchFromGitHub { owner = "jmoon018"; diff --git a/nixpkgs/pkgs/games/performous/default.nix b/nixpkgs/pkgs/games/performous/default.nix index c73c346512f9..28487a7f8e8a 100644 --- a/nixpkgs/pkgs/games/performous/default.nix +++ b/nixpkgs/pkgs/games/performous/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "performous-${version}"; + pname = "performous"; version = "1.1"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/games/pro-office-calculator/default.nix b/nixpkgs/pkgs/games/pro-office-calculator/default.nix index 6991735962d7..4cfd7de6a55f 100644 --- a/nixpkgs/pkgs/games/pro-office-calculator/default.nix +++ b/nixpkgs/pkgs/games/pro-office-calculator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: stdenv.mkDerivation rec { version = "1.0.13"; - name = "pro-office-calculator-${version}"; + pname = "pro-office-calculator"; src = fetchFromGitHub { owner = "RobJinman"; diff --git a/nixpkgs/pkgs/games/qgo/default.nix b/nixpkgs/pkgs/games/qgo/default.nix index 924101c2d4a8..924292181789 100644 --- a/nixpkgs/pkgs/games/qgo/default.nix +++ b/nixpkgs/pkgs/games/qgo/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "qgo-${version}"; + pname = "qgo"; version = "unstable-2017-12-18"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/games/qqwing/default.nix b/nixpkgs/pkgs/games/qqwing/default.nix index dfd384761921..f161f53bfe1e 100644 --- a/nixpkgs/pkgs/games/qqwing/default.nix +++ b/nixpkgs/pkgs/games/qqwing/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "qqwing-${version}"; + pname = "qqwing"; version = "1.3.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/quake2/yquake2/default.nix b/nixpkgs/pkgs/games/quake2/yquake2/default.nix index 1564ba19bd2e..0602aace319a 100644 --- a/nixpkgs/pkgs/games/quake2/yquake2/default.nix +++ b/nixpkgs/pkgs/games/quake2/yquake2/default.nix @@ -14,7 +14,7 @@ let wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; }; yquake2 = stdenv.mkDerivation rec { - name = "yquake2-${version}"; + pname = "yquake2"; version = "7.30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/quake3/content/demo.nix b/nixpkgs/pkgs/games/quake3/content/demo.nix index 88ba8679e8a7..0d8a64f14cdc 100644 --- a/nixpkgs/pkgs/games/quake3/content/demo.nix +++ b/nixpkgs/pkgs/games/quake3/content/demo.nix @@ -3,7 +3,8 @@ let version = "1.11-6"; in stdenv.mkDerivation { - name = "quake3-demodata-${version}"; + pname = "quake3-demodata"; + inherit version; src = fetchurl { url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh"; diff --git a/nixpkgs/pkgs/games/quake3/content/pointrelease.nix b/nixpkgs/pkgs/games/quake3/content/pointrelease.nix index f35aaaad3527..e34064d93b05 100644 --- a/nixpkgs/pkgs/games/quake3/content/pointrelease.nix +++ b/nixpkgs/pkgs/games/quake3/content/pointrelease.nix @@ -3,7 +3,8 @@ let version = "1.32b-3"; in stdenv.mkDerivation { - name = "quake3-pointrelease-${version}"; + pname = "quake3-pointrelease"; + inherit version; src = fetchurl { url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run"; diff --git a/nixpkgs/pkgs/games/quake3/ioquake/default.nix b/nixpkgs/pkgs/games/quake3/ioquake/default.nix index 7bc0863a33f8..7f0fb6fd0623 100644 --- a/nixpkgs/pkgs/games/quake3/ioquake/default.nix +++ b/nixpkgs/pkgs/games/quake3/ioquake/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ioquake3-git-${version}"; + pname = "ioquake3-git"; version = "2019-05-29"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/quakespasm/default.nix b/nixpkgs/pkgs/games/quakespasm/default.nix index f61b0e237925..a8d740ea5128 100644 --- a/nixpkgs/pkgs/games/quakespasm/default.nix +++ b/nixpkgs/pkgs/games/quakespasm/default.nix @@ -1,6 +1,6 @@ { stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: stdenv.mkDerivation rec { - name = "quakespasm-${version}"; + pname = "quakespasm"; majorVersion = "0.93"; version = "${majorVersion}.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd"; }; - sourceRoot = "${name}/Quake"; + sourceRoot = "${pname}-${version}/Quake"; buildInputs = [ gzip SDL libvorbis libmad diff --git a/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/nixpkgs/pkgs/games/quakespasm/vulkan.nix index 4cd073869dc8..114f862888d4 100644 --- a/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/nixpkgs/pkgs/games/quakespasm/vulkan.nix @@ -1,7 +1,7 @@ { stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: stdenv.mkDerivation rec { - name = "vkquake-${version}"; + pname = "vkquake"; majorVersion = "1.01"; version = "${majorVersion}.0"; diff --git a/nixpkgs/pkgs/games/residualvm/default.nix b/nixpkgs/pkgs/games/residualvm/default.nix index c44072309b19..79d657e668dc 100644 --- a/nixpkgs/pkgs/games/residualvm/default.nix +++ b/nixpkgs/pkgs/games/residualvm/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.1.1"; - name = "residualvm-${version}"; + pname = "residualvm"; src = fetchurl { url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2"; diff --git a/nixpkgs/pkgs/games/rftg/default.nix b/nixpkgs/pkgs/games/rftg/default.nix index b6a74ad8be65..9ab63553053f 100644 --- a/nixpkgs/pkgs/games/rftg/default.nix +++ b/nixpkgs/pkgs/games/rftg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "rftg-${version}"; + pname = "rftg"; version = "0.9.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/rigsofrods/default.nix b/nixpkgs/pkgs/games/rigsofrods/default.nix index 274a095de6f4..09550339f83d 100644 --- a/nixpkgs/pkgs/games/rigsofrods/default.nix +++ b/nixpkgs/pkgs/games/rigsofrods/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4.7.0"; - name = "rigsofrods-${version}"; + pname = "rigsofrods"; src = fetchFromGitHub { owner = "RigsOfRods"; diff --git a/nixpkgs/pkgs/games/riko4/default.nix b/nixpkgs/pkgs/games/riko4/default.nix index 7cbfacd0b409..780025f52226 100644 --- a/nixpkgs/pkgs/games/riko4/default.nix +++ b/nixpkgs/pkgs/games/riko4/default.nix @@ -5,7 +5,7 @@ let # and this library does not have a proper release version, so let the # derivation for this stay next to the Riko4 derivation for now. sdl-gpu = stdenv.mkDerivation rec { - name = "sdl-gpu-${version}"; + pname = "sdl-gpu"; version = "2018-11-01"; src = fetchFromGitHub { owner = "grimfang4"; @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { - name = "riko4-${version}"; + pname = "riko4"; version = "0.1.0"; src = fetchFromGitHub { owner = "incinirate"; diff --git a/nixpkgs/pkgs/games/robotfindskitten/default.nix b/nixpkgs/pkgs/games/robotfindskitten/default.nix index 00d73f95bdb3..fa1eb338a89b 100644 --- a/nixpkgs/pkgs/games/robotfindskitten/default.nix +++ b/nixpkgs/pkgs/games/robotfindskitten/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "robotfindskitten-${version}"; + pname = "robotfindskitten"; version = "2.7182818.701"; src = fetchurl { - url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${name}.tar.gz"; + url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${pname}-${version}.tar.gz"; sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp"; }; diff --git a/nixpkgs/pkgs/games/rrootage/default.nix b/nixpkgs/pkgs/games/rrootage/default.nix index 8b07a38c7bb7..459ff238b4a4 100644 --- a/nixpkgs/pkgs/games/rrootage/default.nix +++ b/nixpkgs/pkgs/games/rrootage/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "rrootage-${version}"; + pname = "rrootage"; + inherit version; src = fetchurl { url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz"; sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln"; diff --git a/nixpkgs/pkgs/games/runelite/default.nix b/nixpkgs/pkgs/games/runelite/default.nix index a56365778fb1..eaf1b3dc4fda 100644 --- a/nixpkgs/pkgs/games/runelite/default.nix +++ b/nixpkgs/pkgs/games/runelite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }: stdenv.mkDerivation rec { - name = "runelite-${version}"; + pname = "runelite"; version = "1.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/scid-vs-pc/default.nix b/nixpkgs/pkgs/games/scid-vs-pc/default.nix index 79fef6740023..345ce33fca0a 100644 --- a/nixpkgs/pkgs/games/scid-vs-pc/default.nix +++ b/nixpkgs/pkgs/games/scid-vs-pc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { - name = "scid-vs-pc-${version}"; + pname = "scid-vs-pc"; version = "4.20"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/scid/default.nix b/nixpkgs/pkgs/games/scid/default.nix index 301991c1a6fd..040902ffd73d 100644 --- a/nixpkgs/pkgs/games/scid/default.nix +++ b/nixpkgs/pkgs/games/scid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: stdenv.mkDerivation rec { - name = "scid-${version}"; + pname = "scid"; version = "4.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/scorched3d/default.nix b/nixpkgs/pkgs/games/scorched3d/default.nix index 430b22c9ba97..1527f61c4d0f 100644 --- a/nixpkgs/pkgs/games/scorched3d/default.nix +++ b/nixpkgs/pkgs/games/scorched3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "44"; - name = "scorched3d-${version}"; + pname = "scorched3d"; src = fetchurl { url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz"; sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw"; diff --git a/nixpkgs/pkgs/games/scummvm/default.nix b/nixpkgs/pkgs/games/scummvm/default.nix index 2ebc2c82e506..cb8223daa2b0 100644 --- a/nixpkgs/pkgs/games/scummvm/default.nix +++ b/nixpkgs/pkgs/games/scummvm/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "scummvm-${version}"; + pname = "scummvm"; version = "2.0.0"; src = fetchurl { - url = "http://scummvm.org/frs/scummvm/${version}/${name}.tar.xz"; + url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p"; }; diff --git a/nixpkgs/pkgs/games/sdlmame/default.nix b/nixpkgs/pkgs/games/sdlmame/default.nix index 9f90c9f14aac..7811b4b7373f 100644 --- a/nixpkgs/pkgs/games/sdlmame/default.nix +++ b/nixpkgs/pkgs/games/sdlmame/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { version = "0.151.u0-1"; - name = "sdlmame-${version}"; + pname = "sdlmame"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-x86_64.pkg.tar.xz"; + url = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-x86_64.pkg.tar.xz"; sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9"; } else fetchurl { - url = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-i686.pkg.tar.xz"; + url = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-i686.pkg.tar.xz"; sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7"; }; diff --git a/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/nixpkgs/pkgs/games/sgt-puzzles/default.nix index ce8d38ca5d1d..428be470b3e7 100644 --- a/nixpkgs/pkgs/games/sgt-puzzles/default.nix +++ b/nixpkgs/pkgs/games/sgt-puzzles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sgt-puzzles-r${version}"; - version = "20180429.31384ca"; + version = "20190415.e2135d5"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0r97kyy0rxgzw78lby2kwi8fg1yimw8a3biy5psgd983d0nwcf9l"; + sha256 = "02p9kpvmqa0cm9y0lzdy7g8h4b4mqma8d9jfvgi2yysbgjfzq2ak"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/games/sil/default.nix b/nixpkgs/pkgs/games/sil/default.nix index de91f26d95de..a998a86370d9 100644 --- a/nixpkgs/pkgs/games/sil/default.nix +++ b/nixpkgs/pkgs/games/sil/default.nix @@ -9,7 +9,7 @@ let ''; in stdenv.mkDerivation rec { - name = "Sil-${version}"; + pname = "Sil"; version = "1.3.0"; src = fetchzip { diff --git a/nixpkgs/pkgs/games/simutrans/default.nix b/nixpkgs/pkgs/games/simutrans/default.nix index 5cbb3c1796f1..e6889731619f 100644 --- a/nixpkgs/pkgs/games/simutrans/default.nix +++ b/nixpkgs/pkgs/games/simutrans/default.nix @@ -107,7 +107,8 @@ let }; binaries = stdenv.mkDerivation rec { - name = "simutrans-${version}"; + pname = "simutrans"; + inherit version; src = binary_src; diff --git a/nixpkgs/pkgs/games/snipes/default.nix b/nixpkgs/pkgs/games/snipes/default.nix index e8d915dd31a5..1334f555bbde 100644 --- a/nixpkgs/pkgs/games/snipes/default.nix +++ b/nixpkgs/pkgs/games/snipes/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "snipes-${version}"; + pname = "snipes"; version = "20180930"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/soi/default.nix b/nixpkgs/pkgs/games/soi/default.nix index 7f9f49f363a8..2ffd3f3d053b 100644 --- a/nixpkgs/pkgs/games/soi/default.nix +++ b/nixpkgs/pkgs/games/soi/default.nix @@ -2,12 +2,12 @@ , boost, eigen2, lua, luabind, libGLU_combined, SDL }: stdenv.mkDerivation rec { - name = "soi-${version}"; + pname = "soi"; version = "0.1.2"; src = fetchurl { url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2"; - name = "${name}.tar.bz2"; + name = "${pname}-${version}.tar.bz2"; sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd"; }; diff --git a/nixpkgs/pkgs/games/space-orbit/default.nix b/nixpkgs/pkgs/games/space-orbit/default.nix index 162db9672699..2b69dfccad15 100644 --- a/nixpkgs/pkgs/games/space-orbit/default.nix +++ b/nixpkgs/pkgs/games/space-orbit/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "space-orbit-${version}"; + pname = "space-orbit"; version = "1.01"; patchversion = "9"; diff --git a/nixpkgs/pkgs/games/spring/default.nix b/nixpkgs/pkgs/games/spring/default.nix index 1dcf432ccd48..9bfd917d1aa0 100644 --- a/nixpkgs/pkgs/games/spring/default.nix +++ b/nixpkgs/pkgs/games/spring/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { - name = "spring-${version}"; + pname = "spring"; version = "104.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/spring/springlobby.nix b/nixpkgs/pkgs/games/spring/springlobby.nix index 8df4450d13d1..b7c9b691c043 100644 --- a/nixpkgs/pkgs/games/spring/springlobby.nix +++ b/nixpkgs/pkgs/games/spring/springlobby.nix @@ -3,7 +3,7 @@ , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: stdenv.mkDerivation rec { - name = "springlobby-${version}"; + pname = "springlobby"; version = "0.267"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/stardust/default.nix b/nixpkgs/pkgs/games/stardust/default.nix index 1408b66ab41b..9de9bd37e8dc 100644 --- a/nixpkgs/pkgs/games/stardust/default.nix +++ b/nixpkgs/pkgs/games/stardust/default.nix @@ -2,11 +2,11 @@ , libXi, libXmu, libXext, libGLU_combined }: stdenv.mkDerivation rec { - name = "stardust-${version}"; + pname = "stardust"; version = "0.1.13"; src = fetchurl { - url = "http://iwar.free.fr/IMG/gz/${name}.tar.gz"; + url = "http://iwar.free.fr/IMG/gz/${pname}-${version}.tar.gz"; sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp"; }; diff --git a/nixpkgs/pkgs/games/steam/steam.nix b/nixpkgs/pkgs/games/steam/steam.nix index 9bbdf0474e1a..1d1912d97a15 100644 --- a/nixpkgs/pkgs/games/steam/steam.nix +++ b/nixpkgs/pkgs/games/steam/steam.nix @@ -5,7 +5,8 @@ let version = "1.0.0.61"; in stdenv.mkDerivation rec { - name = "steam-original-${version}"; + pname = "steam-original"; + inherit version; src = fetchurl { url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/games/steam/steamcmd.nix b/nixpkgs/pkgs/games/steam/steamcmd.nix index 1ea7f0677877..be865d20f2f4 100644 --- a/nixpkgs/pkgs/games/steam/steamcmd.nix +++ b/nixpkgs/pkgs/games/steam/steamcmd.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "steamcmd-${version}"; + pname = "steamcmd"; version = "20180104"; # According to steamcmd_linux.tar.gz mtime src = fetchurl { diff --git a/nixpkgs/pkgs/games/stepmania/default.nix b/nixpkgs/pkgs/games/stepmania/default.nix index 864888741660..b29d22dfe736 100644 --- a/nixpkgs/pkgs/games/stepmania/default.nix +++ b/nixpkgs/pkgs/games/stepmania/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "stepmania-${version}"; + pname = "stepmania"; version = "5.1.0-b2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/stockfish/default.nix b/nixpkgs/pkgs/games/stockfish/default.nix index 13033c7f9f0a..eea92b43b520 100644 --- a/nixpkgs/pkgs/games/stockfish/default.nix +++ b/nixpkgs/pkgs/games/stockfish/default.nix @@ -9,7 +9,8 @@ in stdenv.mkDerivation { - name = "stockfish-${version}"; + pname = "stockfish"; + inherit version; src = fetchurl { url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/games/stuntrally/default.nix b/nixpkgs/pkgs/games/stuntrally/default.nix index 3865d8fbef9e..6b3da08b70c7 100644 --- a/nixpkgs/pkgs/games/stuntrally/default.nix +++ b/nixpkgs/pkgs/games/stuntrally/default.nix @@ -2,7 +2,7 @@ , makeWrapper, enet, libXcursor, bullet, openal }: stdenv.mkDerivation rec { - name = "stunt-rally-${version}"; + pname = "stunt-rally"; version = "2.6.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/supertux/default.nix b/nixpkgs/pkgs/games/supertux/default.nix index cee65bfa5638..6cfabc4ee6a7 100644 --- a/nixpkgs/pkgs/games/supertux/default.nix +++ b/nixpkgs/pkgs/games/supertux/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "supertux-${version}"; + pname = "supertux"; version = "0.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/terraria-server/default.nix b/nixpkgs/pkgs/games/terraria-server/default.nix index 13d296e5961a..5432824ce6c0 100644 --- a/nixpkgs/pkgs/games/terraria-server/default.nix +++ b/nixpkgs/pkgs/games/terraria-server/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, file, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "terraria-server-${version}"; + pname = "terraria-server"; version = "1.3.5.3"; urlVersion = lib.replaceChars ["."] [""] version; diff --git a/nixpkgs/pkgs/games/the-butterfly-effect/default.nix b/nixpkgs/pkgs/games/the-butterfly-effect/default.nix index 68114bb75652..9cc3bf7149ff 100644 --- a/nixpkgs/pkgs/games/the-butterfly-effect/default.nix +++ b/nixpkgs/pkgs/games/the-butterfly-effect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, qt5, box2d, which, cmake, gettext }: stdenv.mkDerivation rec { - name = "tbe-${version}"; + pname = "tbe"; version = "0.9.3.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/games/the-powder-toy/default.nix b/nixpkgs/pkgs/games/the-powder-toy/default.nix index 929641cfab54..b0901fcb9a0f 100644 --- a/nixpkgs/pkgs/games/the-powder-toy/default.nix +++ b/nixpkgs/pkgs/games/the-powder-toy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "the-powder-toy-${version}"; + pname = "the-powder-toy"; version = "94.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/tinyfugue/default.nix b/nixpkgs/pkgs/games/tinyfugue/default.nix index f230a70c0880..fb3ebf36db3b 100644 --- a/nixpkgs/pkgs/games/tinyfugue/default.nix +++ b/nixpkgs/pkgs/games/tinyfugue/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; assert sslSupport -> openssl != null; stdenv.mkDerivation rec { - name = "tinyfugue-${version}"; + pname = "tinyfugue"; version = "50b8"; verUrl = "5.0%20beta%208"; diff --git a/nixpkgs/pkgs/games/trackballs/default.nix b/nixpkgs/pkgs/games/trackballs/default.nix index 8549a860d8e8..b5ff38b93a10 100644 --- a/nixpkgs/pkgs/games/trackballs/default.nix +++ b/nixpkgs/pkgs/games/trackballs/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "trackballs-${version}"; + pname = "trackballs"; version = "1.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/tremulous/default.nix b/nixpkgs/pkgs/games/tremulous/default.nix index 470856af90e6..802bdb08a87c 100644 --- a/nixpkgs/pkgs/games/tremulous/default.nix +++ b/nixpkgs/pkgs/games/tremulous/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { - name = "tremulous-${version}"; + pname = "tremulous"; version = "1.1.0"; src1 = fetchurl { - url = "mirror://sourceforge/tremulous/${name}.zip"; + url = "mirror://sourceforge/tremulous/${pname}-${version}.zip"; sha256 = "11w96y7ggm2sn5ncyaffsbg0vy9pblz2av71vqp9725wbbsndfy7"; }; # http://tremulous.net/wiki/Client_versions diff --git a/nixpkgs/pkgs/games/tuxpaint/default.nix b/nixpkgs/pkgs/games/tuxpaint/default.nix index ddf0782b210d..603fb3ef491b 100644 --- a/nixpkgs/pkgs/games/tuxpaint/default.nix +++ b/nixpkgs/pkgs/games/tuxpaint/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "0.9.22"; - name = "tuxpaint-${version}"; + pname = "tuxpaint"; src = fetchurl { - url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; }; diff --git a/nixpkgs/pkgs/games/ue4/default.nix b/nixpkgs/pkgs/games/ue4/default.nix index fa28dcefa5e0..a32da556cc90 100644 --- a/nixpkgs/pkgs/games/ue4/default.nix +++ b/nixpkgs/pkgs/games/ue4/default.nix @@ -18,7 +18,7 @@ let ]; in stdenv.mkDerivation rec { - name = "ue4-${version}"; + pname = "ue4"; version = "4.10.2"; sourceRoot = "UnrealEngine-${version}-release"; src = requireFile { diff --git a/nixpkgs/pkgs/games/ultrastardx/default.nix b/nixpkgs/pkgs/games/ultrastardx/default.nix index f3eec52098d0..8dd8222e55e4 100644 --- a/nixpkgs/pkgs/games/ultrastardx/default.nix +++ b/nixpkgs/pkgs/games/ultrastardx/default.nix @@ -11,7 +11,7 @@ let ]; in stdenv.mkDerivation rec { - name = "ultrastardx-${version}"; + pname = "ultrastardx"; version = "2017.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; diff --git a/nixpkgs/pkgs/games/unnethack/default.nix b/nixpkgs/pkgs/games/unnethack/default.nix index be1b5bd11956..ee3890aeea5b 100644 --- a/nixpkgs/pkgs/games/unnethack/default.nix +++ b/nixpkgs/pkgs/games/unnethack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, utillinux, ncurses, flex, bison }: stdenv.mkDerivation rec { - name = "unnethack-${version}"; + pname = "unnethack"; version = "5.2.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/games/uqm/default.nix b/nixpkgs/pkgs/games/uqm/default.nix index 00592f7c39bb..638900c9e898 100644 --- a/nixpkgs/pkgs/games/uqm/default.nix +++ b/nixpkgs/pkgs/games/uqm/default.nix @@ -27,7 +27,7 @@ let ]; in stdenv.mkDerivation rec { - name = "uqm-${version}"; + pname = "uqm"; version = "0.7.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/urbanterror/default.nix b/nixpkgs/pkgs/games/urbanterror/default.nix index 1cd87541b8c3..999799de58d8 100644 --- a/nixpkgs/pkgs/games/urbanterror/default.nix +++ b/nixpkgs/pkgs/games/urbanterror/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { - name = "urbanterror-${version}"; + pname = "urbanterror"; version = "4.3.4"; srcs = diff --git a/nixpkgs/pkgs/games/ut2004/demo.nix b/nixpkgs/pkgs/games/ut2004/demo.nix index 7039ff44a09b..1790f0830638 100644 --- a/nixpkgs/pkgs/games/ut2004/demo.nix +++ b/nixpkgs/pkgs/games/ut2004/demo.nix @@ -7,7 +7,7 @@ let else throw "Unsupported architecture"; in stdenv.mkDerivation rec { - name = "ut2004-demo-${version}"; + pname = "ut2004-demo"; version = "3334"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/vdrift/default.nix b/nixpkgs/pkgs/games/vdrift/default.nix index 6c571da561c5..e018dfd664d3 100644 --- a/nixpkgs/pkgs/games/vdrift/default.nix +++ b/nixpkgs/pkgs/games/vdrift/default.nix @@ -10,7 +10,8 @@ let version = "git"; bin = stdenv.mkDerivation { - name = "vdrift-${version}"; + pname = "vdrift"; + inherit version; src = fetchFromGitHub { owner = "vdrift"; diff --git a/nixpkgs/pkgs/games/vitetris/default.nix b/nixpkgs/pkgs/games/vitetris/default.nix index d57559a4d804..7f552bdd5d66 100644 --- a/nixpkgs/pkgs/games/vitetris/default.nix +++ b/nixpkgs/pkgs/games/vitetris/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lib }: stdenv.mkDerivation rec { - name = "vitetris-${version}"; + pname = "vitetris"; version = "0.58.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/vms-empire/default.nix b/nixpkgs/pkgs/games/vms-empire/default.nix index 91f77277d9ec..1d4545f17b14 100644 --- a/nixpkgs/pkgs/games/vms-empire/default.nix +++ b/nixpkgs/pkgs/games/vms-empire/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "vms-empire-${version}"; + pname = "vms-empire"; version = "1.14"; src = fetchurl{ - url = "http://www.catb.org/~esr/vms-empire/${name}.tar.gz"; + url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz"; sha256 = "0cymzhivvaahgqz0p11w25a710ls4w0jhyqj789jas5s07nvd890"; }; diff --git a/nixpkgs/pkgs/games/voxelands/default.nix b/nixpkgs/pkgs/games/voxelands/default.nix index c1a9a2a7defb..9ea9ec7bd12f 100644 --- a/nixpkgs/pkgs/games/voxelands/default.nix +++ b/nixpkgs/pkgs/games/voxelands/default.nix @@ -2,11 +2,11 @@ , libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { - name = "voxelands-${version}"; + pname = "voxelands"; version = "1512.00"; src = fetchurl { - url = "http://voxelands.com/downloads/${name}-src.tar.bz2"; + url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2"; sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw"; }; diff --git a/nixpkgs/pkgs/games/warmux/default.nix b/nixpkgs/pkgs/games/warmux/default.nix index 04712b3ebff6..a861e3725a2d 100644 --- a/nixpkgs/pkgs/games/warmux/default.nix +++ b/nixpkgs/pkgs/games/warmux/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "warmux-${version}"; + pname = "warmux"; version = "unstable-2017-10-20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/warsow/default.nix b/nixpkgs/pkgs/games/warsow/default.nix index 5333dad68798..6282658fc152 100644 --- a/nixpkgs/pkgs/games/warsow/default.nix +++ b/nixpkgs/pkgs/games/warsow/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, warsow-engine, makeWrapper }: stdenv.mkDerivation rec { - name = "warsow-${version}"; + pname = "warsow"; version = "2.1.2"; src = fetchurl { - url = "http://slice.sh/warsow/${name}.tar.gz"; + url = "http://slice.sh/warsow/${pname}-${version}.tar.gz"; sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; diff --git a/nixpkgs/pkgs/games/wesnoth/default.nix b/nixpkgs/pkgs/games/wesnoth/default.nix index bf9e1cdd6354..64231b9c39c7 100644 --- a/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/nixpkgs/pkgs/games/wesnoth/default.nix @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { pname = "wesnoth"; version = "1.14.7"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7"; }; diff --git a/nixpkgs/pkgs/games/widelands/default.nix b/nixpkgs/pkgs/games/widelands/default.nix index daf56b27e5d2..6f3bc2c11959 100644 --- a/nixpkgs/pkgs/games/widelands/default.nix +++ b/nixpkgs/pkgs/games/widelands/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "widelands-${version}"; + pname = "widelands"; version = "19"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/games/xjump/default.nix b/nixpkgs/pkgs/games/xjump/default.nix index 028b5f49b66a..dd59ebbedd94 100644 --- a/nixpkgs/pkgs/games/xjump/default.nix +++ b/nixpkgs/pkgs/games/xjump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }: stdenv.mkDerivation rec { - name = "xjump-${version}"; + pname = "xjump"; version = "2.9.3"; src = fetchFromGitHub { owner = "hugomg"; diff --git a/nixpkgs/pkgs/games/xmoto/default.nix b/nixpkgs/pkgs/games/xmoto/default.nix index a0fc6d5ca718..d9bba3fdbdce 100644 --- a/nixpkgs/pkgs/games/xmoto/default.nix +++ b/nixpkgs/pkgs/games/xmoto/default.nix @@ -3,7 +3,7 @@ , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: stdenv.mkDerivation rec { - name = "xmoto-${version}"; + pname = "xmoto"; version = "0.5.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix b/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix index cd927a820aaa..aefc8ad98767 100644 --- a/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix +++ b/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.5.0"; - name = "bloodspilot-client-${version}"; + pname = "bloodspilot-client"; src = fetchurl { url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix b/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix index 42bcb3263169..2f37680bbaab 100644 --- a/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix +++ b/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, expat }: stdenv.mkDerivation rec { - name = "bloodspilot-xpilot-fxi-server-${version}"; + pname = "bloodspilot-xpilot-fxi-server"; version = "1.4.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/games/xpilot/default.nix b/nixpkgs/pkgs/games/xpilot/default.nix index 2ae25e957bb2..d0fe9f61896e 100644 --- a/nixpkgs/pkgs/games/xpilot/default.nix +++ b/nixpkgs/pkgs/games/xpilot/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf , SDL_image, zlib, libXxf86misc }: stdenv.mkDerivation rec { - name = "xpilot-ng-${version}"; + pname = "xpilot-ng"; version = "4.7.3"; src = fetchurl { - url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/xpilot/xpilot_ng/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/games/xsnow/default.nix b/nixpkgs/pkgs/games/xsnow/default.nix index 07ed50d4e7b3..b3011fbce77a 100644 --- a/nixpkgs/pkgs/games/xsnow/default.nix +++ b/nixpkgs/pkgs/games/xsnow/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.42"; - name = "xsnow-${version}"; + pname = "xsnow"; src = fetchurl { - url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; + url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; diff --git a/nixpkgs/pkgs/games/xsok/default.nix b/nixpkgs/pkgs/games/xsok/default.nix index 0aa0c97f07d2..62cdaccc2975 100644 --- a/nixpkgs/pkgs/games/xsok/default.nix +++ b/nixpkgs/pkgs/games/xsok/default.nix @@ -2,7 +2,6 @@ , withNethackLevels ? true }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xsok"; version = "1.02"; diff --git a/nixpkgs/pkgs/games/xsokoban/default.nix b/nixpkgs/pkgs/games/xsokoban/default.nix index cf08db68cf03..3f6062c4f686 100644 --- a/nixpkgs/pkgs/games/xsokoban/default.nix +++ b/nixpkgs/pkgs/games/xsokoban/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }: stdenv.mkDerivation rec { - name = "xsokoban-${version}"; + pname = "xsokoban"; version = "3.3c"; src = fetchurl { - url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz"; + url = "https://www.cs.cornell.edu/andru/release/${pname}-${version}.tar.gz"; sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9"; }; diff --git a/nixpkgs/pkgs/games/xtris/default.nix b/nixpkgs/pkgs/games/xtris/default.nix index 9203389355c7..8f5f832058cc 100644 --- a/nixpkgs/pkgs/games/xtris/default.nix +++ b/nixpkgs/pkgs/games/xtris/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, xorg }: stdenv.mkDerivation rec { - name = "xtris-${version}"; + pname = "xtris"; version = "1.15"; src = fetchzip { diff --git a/nixpkgs/pkgs/games/zandronum/fmod.nix b/nixpkgs/pkgs/games/zandronum/fmod.nix index a5d9098242bd..3d5160bb591c 100644 --- a/nixpkgs/pkgs/games/zandronum/fmod.nix +++ b/nixpkgs/pkgs/games/zandronum/fmod.nix @@ -6,7 +6,7 @@ let in stdenv.mkDerivation rec { - name = "fmod-${version}"; + pname = "fmod"; version = "4.44.64"; shortVersion = builtins.replaceStrings [ "." ] [ "" ] version; diff --git a/nixpkgs/pkgs/games/zangband/default.nix b/nixpkgs/pkgs/games/zangband/default.nix index 3d5da2391157..0722e4bbbf95 100644 --- a/nixpkgs/pkgs/games/zangband/default.nix +++ b/nixpkgs/pkgs/games/zangband/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "zangband"; version = "2.7.4b"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${pname}-${version}.tar.gz"; sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j"; }; diff --git a/nixpkgs/pkgs/games/zdoom/default.nix b/nixpkgs/pkgs/games/zdoom/default.nix index d2b94a14fe41..f6fde241129b 100644 --- a/nixpkgs/pkgs/games/zdoom/default.nix +++ b/nixpkgs/pkgs/games/zdoom/default.nix @@ -3,7 +3,7 @@ , libsndfile, mpg123 }: stdenv.mkDerivation rec { - name = "zdoom-${version}"; + pname = "zdoom"; majorVersion = "2.8"; version = "${majorVersion}.1"; diff --git a/nixpkgs/pkgs/games/zdoom/zdbsp.nix b/nixpkgs/pkgs/games/zdoom/zdbsp.nix index fa2cafa298ac..430d5269a68e 100644 --- a/nixpkgs/pkgs/games/zdoom/zdbsp.nix +++ b/nixpkgs/pkgs/games/zdoom/zdbsp.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, unzip, zlib }: stdenv.mkDerivation rec { - name = "zdbsp-${version}"; + pname = "zdbsp"; version = "1.19"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/brightnessctl/default.nix b/nixpkgs/pkgs/misc/brightnessctl/default.nix index 6292b8183b28..83bf552b8b78 100644 --- a/nixpkgs/pkgs/misc/brightnessctl/default.nix +++ b/nixpkgs/pkgs/misc/brightnessctl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, coreutils }: stdenv.mkDerivation rec { - name = "brightnessctl-${version}"; + pname = "brightnessctl"; version = "0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix b/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix index f0be3cad723c..5e7596032b3d 100644 --- a/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix +++ b/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.6"; - name = "cups-pk-helper-${version}"; + pname = "cups-pk-helper"; src = fetchurl { url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix index 789aabce0435..b28374ab6357 100644 --- a/nixpkgs/pkgs/misc/cups/default.nix +++ b/nixpkgs/pkgs/misc/cups/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cups-${version}"; + pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ version = if stdenv.isDarwin then "2.2.6" else "2.2.11"; diff --git a/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix index 08cc222e4a5b..948e5ed72ab1 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/brlaser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib, cups }: stdenv.mkDerivation rec { - name = "brlaser-${version}"; + pname = "brlaser"; version = "4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 2634b7128719..abd50850b182 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -2,7 +2,7 @@ , withDebug ? false }: stdenv.mkDerivation rec { - name = "cnijfilter2-${version}"; + pname = "cnijfilter2"; version = "5.30"; diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index 27b86ab89198..15e3a1d97a90 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -7,7 +7,7 @@ file included in the tarball */ stdenv.mkDerivation rec { - name = "cnijfilter-${version}"; + pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use versions in a non-standard way. the version indicates which diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index c8e5ddd09b14..ba8cffc0e654 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -12,7 +12,7 @@ let arch = else throw "Unsupported system ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { - name = "cnijfilter-${version}"; + pname = "cnijfilter"; /* important note about versions: cnijfilter packages seem to use versions in a non-standard way. the version indicates which diff --git a/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix index 8abda27a5cf2..c2b912007d88 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/dymo/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, cups, ... }: stdenv.mkDerivation rec { - name = "cups-dymo-${version}"; + pname = "cups-dymo"; version = "1.4.0.5"; # exposed version and 'real' version may differ diff --git a/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix index 83093da9c0aa..a2fdd1abc192 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/estudio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "cups-toshiba-estudio-${version}"; + pname = "cups-toshiba-estudio"; version = "7.89"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index ffcc46d66e36..23651a57df8c 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -6,7 +6,7 @@ let else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { - name = "fxlinuxprint-${version}"; + pname = "fxlinuxprint"; version = "1.1.2-1"; src = fetchzip { diff --git a/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix index b3fc87fbf1da..0dcd518de842 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/googlecloudprint/default.nix @@ -14,7 +14,7 @@ let pythonEnv = python2.buildEnv.override { }; in stdenv.mkDerivation rec { - name = "cups-googlecloudprint-${version}"; + pname = "cups-googlecloudprint"; version = "20160502"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 55b0deea9717..90f9a8e943ab 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "hll2390dw-cups-${version}"; + pname = "hll2390dw-cups"; version = "4.0.0-1"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix b/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix index 9b40e4ff50e1..21a276f9d142 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/kyocera/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - name = "cups-kyocera-${version}"; + pname = "cups-kyocera"; version = "1.1203"; dontPatchELF = true; diff --git a/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix b/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix index bcd2914da0ce..fa16a136f977 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -15,7 +15,7 @@ let debRegion = if region == "EU" then "EU." else ""; in stdenv.mkDerivation rec { - name = "cups-kyodialog3-${version}"; + pname = "cups-kyodialog3"; version = "8.1601"; dontStrip = true; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 72a40f41f885..c7484e6d30b0 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: stdenv.mkDerivation rec { - name = "mfcj470dw-cupswrapper-${version}"; + pname = "mfcj470dw-cupswrapper"; version = "3.0.0-1"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index f31dd9061ec3..befafd855bcf 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }: stdenv.mkDerivation rec { - name = "mfcj470dw-cupswrapper-${version}"; + pname = "mfcj470dw-cupswrapper"; version = "3.0.0-1"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4b31ccf38774..4ec9e3fc6c8e 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}: stdenv.mkDerivation rec { - name = "mfcj6510dw-cupswrapper-${version}"; + pname = "mfcj6510dw-cupswrapper"; version = "3.0.0-1"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 9d9535ce37b0..b12ef18e46c4 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -20,7 +20,7 @@ # The user can run brprintconf_mfcj6510dw in the shell. stdenv.mkDerivation rec { - name = "mfcj6510dwlpr-${version}"; + pname = "mfcj6510dwlpr"; version = "3.0.0-1"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 8e31cd2956a5..91110104bc96 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -1,11 +1,11 @@ { coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }: stdenv.mkDerivation rec { - name = "mfcl2700dnlpr-${version}"; + pname = "mfcl2700dnlpr"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102085/${pname}-${version}.i386.deb"; sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m"; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index 2099291d434b..b58e7b4faa44 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }: stdenv.mkDerivation rec { - name = "mfcl2720dwcupswrapper-${version}"; + pname = "mfcl2720dwcupswrapper"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101802/${pname}-${version}.i386.deb"; sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598"; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 8dbc56fe846d..b4b16563610a 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -1,11 +1,11 @@ { pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { - name = "mfcl2720dwlpr-${version}"; + pname = "mfcl2720dwlpr"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101801/${pname}-${version}.i386.deb"; sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af"; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index 0da85498723f..f2303a45a2f3 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }: stdenv.mkDerivation rec { - name = "mfcl2740dwcupswrapper-${version}"; + pname = "mfcl2740dwcupswrapper"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101726/${pname}-${version}.i386.deb"; sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb"; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index 6d3cf18e5296..c2209806724a 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -1,11 +1,11 @@ { pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }: stdenv.mkDerivation rec { - name = "mfcl2740dwlpr-${version}"; + pname = "mfcl2740dwlpr"; version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101727/${pname}-${version}.i386.deb"; sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf"; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 17040498acc0..50f3b583e42f 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -2,11 +2,11 @@ mfcl8690cdwlpr, perl, stdenv}: stdenv.mkDerivation rec { - name = "mfcl8690cdwcupswrapper-${version}"; + pname = "mfcl8690cdwcupswrapper"; version = "1.4.0-0"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb"; + url = "http://download.brother.com/welcome/dlf103250/${pname}-${version}.i386.deb"; sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2"; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index a521b3ea0218..0e088401c0a0 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -2,11 +2,11 @@ makeWrapper, perl, pkgs, stdenv, which }: stdenv.mkDerivation rec { - name = "mfcl8690cdwlpr-${version}"; + pname = "mfcl8690cdwlpr"; version = "1.3.0-0"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb"; + url = "http://download.brother.com/welcome/dlf103241/${pname}-${version}.i386.deb"; sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v"; }; diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index b395d73a2669..8c906db642e1 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -7,7 +7,7 @@ let else "i386"; in stdenv.mkDerivation rec { - name = "samsung-unified-linux-driver-${version}"; + pname = "samsung-unified-linux-driver"; version = "1.00.36"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix index b2c4bbb0f203..9135441a6e7d 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -7,7 +7,7 @@ let else "i386"; in stdenv.mkDerivation rec { - name = "samsung-unified-linux-driver-${version}"; + pname = "samsung-unified-linux-driver"; version = "1.00.37"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index df0a270a5b2b..5dc397930706 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -18,7 +18,7 @@ let cups' = stdenv.lib.getLib cups; in stdenv.mkDerivation rec { - name = "samsung-UnifiedLinuxDriver-${version}"; + pname = "samsung-UnifiedLinuxDriver"; version = "4.00.39"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 547e25b6514e..f81fa27503fd 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -20,7 +20,7 @@ let appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { - name = "samsung-UnifiedLinuxDriver-${version}"; + pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix index 9321cf526bee..b70b5daa7662 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/zj-58/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "cups-zj-58"; version = "2018-02-22"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "klirichek"; diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix index 2a0a4369860a..927755fdb743 100644 --- a/nixpkgs/pkgs/misc/cups/filters.nix +++ b/nixpkgs/pkgs/misc/cups/filters.nix @@ -8,11 +8,11 @@ let binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; in stdenv.mkDerivation rec { - name = "cups-filters-${version}"; + pname = "cups-filters"; version = "1.25.0"; src = fetchurl { - url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; + url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1"; }; diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index d865a8906cfb..a232552712d6 100644 --- a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -200,7 +200,7 @@ let fwdir = symlinkJoin { }; in let iscan-data = stdenv.mkDerivation rec { - name = "iscan-data-${version}"; + pname = "iscan-data"; version = "1.39.0-1"; src = fetchurl { @@ -216,7 +216,7 @@ let iscan-data = stdenv.mkDerivation rec { }; in stdenv.mkDerivation rec { - name = "iscan-${version}"; + pname = "iscan"; version = "2.30.3-1"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix b/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix index c61bfb806c59..0fa637e040e2 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-201106w/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation { - name = "epson-201106w-${version}"; + pname = "epson-201106w"; + inherit version; src = fetchurl { url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"; diff --git a/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix b/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix index 1dac6034fdab..fe52b104a528 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix @@ -9,7 +9,8 @@ let }; in stdenv.mkDerivation { - name = "epson-alc1100-${version}"; + pname = "epson-alc1100"; + inherit version; src = fetchurl { url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz"; diff --git a/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix index ce95ca00e110..c65c13e886ff 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cups }: stdenv.mkDerivation rec { - name = "epson-escpr-${version}"; + pname = "epson-escpr"; version = "1.6.16"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index 9ce6f5d7b010..2110de6e4c11 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cups, busybox }: stdenv.mkDerivation rec { - name = "epson-inkjet-printer-escpr2-${version}"; + pname = "epson-inkjet-printer-escpr2"; version = "1.0.29"; src = fetchurl { - url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${name}-1lsb3.2.src.rpm"; + url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm"; sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5"; }; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { unpackPhase = '' rpm2cpio $src | cpio -idmv - tar xvf ${name}-1lsb3.2.tar.gz - cd ${name} + tar xvf ${pname}-${version}-1lsb3.2.tar.gz + cd ${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix b/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix index 2a92f8a59d91..9da1a8269ab1 100644 --- a/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson_201207w/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "epson_201207w-${version}"; + pname = "epson_201207w"; + inherit version; src = fetchurl { url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm"; diff --git a/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix index 31b13baf7964..fb6b4956ef17 100644 --- a/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix +++ b/nixpkgs/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { - name = "moltengamepad-git-${version}"; + pname = "moltengamepad-git"; version = "2016-05-04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix b/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix index a7d5710a2793..cd322bf8fdb7 100644 --- a/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/nixpkgs/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -3,7 +3,8 @@ let version = "20160218"; in stdenv.mkDerivation { - name = "postscript-lexmark-${version}"; + pname = "postscript-lexmark"; + inherit version; src = fetchurl { url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; diff --git a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix index d44c90d198a9..366535b51c65 100644 --- a/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix +++ b/nixpkgs/pkgs/misc/drivers/steamcontroller/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - name = "steamcontroller-${version}"; + pname = "steamcontroller"; version = "2017-08-11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/drivers/sundtek/default.nix b/nixpkgs/pkgs/misc/drivers/sundtek/default.nix index 35a9bd2e3844..be199936426c 100644 --- a/nixpkgs/pkgs/misc/drivers/sundtek/default.nix +++ b/nixpkgs/pkgs/misc/drivers/sundtek/default.nix @@ -17,7 +17,8 @@ in url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz"; sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; }; - name = "sundtek-${version}"; + pname = "sundtek"; + inherit version; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix b/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix index c942ec59f37e..1ed279d2998b 100644 --- a/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix +++ b/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix @@ -4,7 +4,8 @@ let version = "0.8.8"; in stdenv.mkDerivation { - name = "xboxdrv-${version}"; + pname = "xboxdrv"; + inherit version; src = fetchurl { url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/misc/dumb/default.nix b/nixpkgs/pkgs/misc/dumb/default.nix index 36f6ca5b8c0c..829367aa3299 100644 --- a/nixpkgs/pkgs/misc/dumb/default.nix +++ b/nixpkgs/pkgs/misc/dumb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, allegro, SDL2 }: stdenv.mkDerivation rec { - name = "dumb-${version}"; + pname = "dumb"; version = "2.0.3"; enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/misc/emulators/atari++/default.nix b/nixpkgs/pkgs/misc/emulators/atari++/default.nix index 5a37b1b32c5b..2e6ccd0a4918 100644 --- a/nixpkgs/pkgs/misc/emulators/atari++/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari++/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "atari++-${version}"; + pname = "atari++"; version = "1.81"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/atari800/default.nix b/nixpkgs/pkgs/misc/emulators/atari800/default.nix index 4806c7f9e0f1..228da6870947 100644 --- a/nixpkgs/pkgs/misc/emulators/atari800/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari800/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "atari800-${version}"; + pname = "atari800"; version = "4.0.0"; src = fetchurl { - url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz"; sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88"; }; diff --git a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix index 601503dc07ec..a725d9c9b086 100644 --- a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix +++ b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "attract-mode-${version}"; + pname = "attract-mode"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/blastem/default.nix b/nixpkgs/pkgs/misc/emulators/blastem/default.nix index 666f953f6b57..88e8556ec6c3 100644 --- a/nixpkgs/pkgs/misc/emulators/blastem/default.nix +++ b/nixpkgs/pkgs/misc/emulators/blastem/default.nix @@ -3,7 +3,7 @@ let vasm = stdenv.mkDerivation rec { - name = "vasm-${version}"; + pname = "vasm"; version = "1.8c"; src = fetchFromGitHub { owner = "mbitsnbites"; @@ -19,7 +19,7 @@ let }; in stdenv.mkDerivation rec { - name = "blastem-${version}"; + pname = "blastem"; version = "0.5.1"; src = fetchurl { url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz"; diff --git a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix index a560ecd0a21d..13cd21391f11 100644 --- a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix @@ -34,7 +34,8 @@ let in stdenv.mkDerivation rec { - name = "ccemux-${version}"; + pname = "ccemux"; + inherit version; src = jar; dontUnpack = true; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix index 33c5d3cebf14..71beaf125481 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - name = "vhba-${version}"; + pname = "vhba"; version = "20190410"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix index 3e8f78c44115..efa1a881f4ab 100644 --- a/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: stdenv.mkDerivation rec { - name = "citra-${version}"; + pname = "citra"; version = "2019-05-25"; # Submodules diff --git a/nixpkgs/pkgs/misc/emulators/darcnes/default.nix b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix index 70e7351e295c..bdec34e396f7 100644 --- a/nixpkgs/pkgs/misc/emulators/darcnes/default.nix +++ b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXt, libXext, libXaw }: stdenv.mkDerivation rec { - name = "darcnes-${version}"; + pname = "darcnes"; version = "9b0401"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/desmume/default.nix b/nixpkgs/pkgs/misc/emulators/desmume/default.nix index d177012546e9..6bb5be3c7137 100644 --- a/nixpkgs/pkgs/misc/emulators/desmume/default.nix +++ b/nixpkgs/pkgs/misc/emulators/desmume/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "desmume-${version}"; + pname = "desmume"; version = "0.9.11"; src = fetchurl { - url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/desmume/desmume/${version}/${pname}-${version}.tar.gz"; sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"; }; diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix index a14f18da4669..813730d435d0 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix @@ -5,7 +5,7 @@ , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-${version}"; + pname = "dolphin-emu"; version = "5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index ab8ec6868cf2..e96b2e07890e 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,7 +20,7 @@ let startupNotify = "false"; }; in stdenv.mkDerivation rec { - name = "dolphin-emu-${version}"; + pname = "dolphin-emu"; version = "5.0-10879"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix index 9dec1ecacae0..7312ad41ada5 100644 --- a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix +++ b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix @@ -2,7 +2,7 @@ , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: stdenv.mkDerivation rec { - name = "emulationstation-${version}"; + pname = "emulationstation"; version = "2.0.1a"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix index edf4fe017a2e..6950e12e889a 100644 --- a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "epsxe-${version}"; + pname = "epsxe"; version = "2.0.5"; src = let diff --git a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix index 882bf13f4eaf..079af05e794d 100644 --- a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: stdenv.mkDerivation rec { - name = "firebird-emu-${version}"; + pname = "firebird-emu"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix index 9856c93eda2d..7e1272faf11b 100644 --- a/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix +++ b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fs-uae-${version}"; + pname = "fs-uae"; version = "2.8.4"; src = fetchurl { - url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; + url = "https://fs-uae.net/fs-uae/stable/${version}/${pname}-${version}.tar.gz"; sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj"; }; diff --git a/nixpkgs/pkgs/misc/emulators/gxemul/default.nix b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix index ea2d6bbfecc8..04c5b441f013 100644 --- a/nixpkgs/pkgs/misc/emulators/gxemul/default.nix +++ b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gxemul-${version}"; + pname = "gxemul"; version = "0.6.0.1"; src = fetchurl { - url = "http://gxemul.sourceforge.net/src/${name}.tar.gz"; + url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz"; sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407"; }; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin; - mkdir -p $out/share/${name}; + mkdir -p $out/share/${pname}-${version}; cp gxemul $out/bin; - cp -r doc $out/share/${name}; - cp -r demos $out/share/${name}; + cp -r doc $out/share/${pname}-${version}; + cp -r demos $out/share/${pname}-${version}; cp -r ./man $out/; ''; diff --git a/nixpkgs/pkgs/misc/emulators/higan/default.nix b/nixpkgs/pkgs/misc/emulators/higan/default.nix index 1349fa0f0b6f..ad96ca36bc16 100644 --- a/nixpkgs/pkgs/misc/emulators/higan/default.nix +++ b/nixpkgs/pkgs/misc/emulators/higan/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "higan-${version}"; + pname = "higan"; version = "106"; sourceName = "higan_v${version}-source"; diff --git a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix index 32d3013d842c..c2494d702708 100644 --- a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix +++ b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix @@ -4,7 +4,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation rec { - name = "kega-fusion-${version}"; + pname = "kega-fusion"; version = "3.63x"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index 32201c48ee98..edb70ba72648 100644 --- a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdsk-${version}"; + pname = "libdsk"; version = "1.5.10"; src = fetchurl { - url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; + url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; }; diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix index 9101c1587c25..74c456cfb105 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix @@ -2,11 +2,11 @@ , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { - name = "mednafen-${version}"; + pname = "mednafen"; version = "0.9.48"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; + url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; }; diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/server.nix b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix index 75eeeea4c008..146d53202614 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/server.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mednafen-server-${version}"; + pname = "mednafen-server"; version = "0.5.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix index c62d9c90ca79..40390068e7be 100644 --- a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "mednaffe-${version}"; + pname = "mednaffe"; version = "0.8.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix index 039bc57e6031..6dc7bc30f322 100644 --- a/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -14,7 +14,7 @@ let startupNotify = "false"; }; in stdenv.mkDerivation rec { - name = "mgba-${version}"; + pname = "mgba"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix index 9ff99110eccf..460dd7ad5fb5 100644 --- a/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: stdenv.mkDerivation rec { - name = "mupen64plus-${version}"; + pname = "mupen64plus"; version = "2.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix index 5bc7bcec9d41..6bef474d7ea4 100644 --- a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix +++ b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.47"; - name = "nestopia-${version}"; + pname = "nestopia"; src = fetchFromGitHub { owner = "rdanbrook"; diff --git a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix index d2539cbc8171..8a95d6f28837 100644 --- a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { - name = "openmsx-${version}"; + pname = "openmsx"; version = "git-2017-11-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix index 851c05c0578b..1924452e2abe 100644 --- a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix +++ b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix @@ -3,7 +3,7 @@ , wxGTK30, zlib }: stdenv.mkDerivation rec { - name = "pcsx2-${version}"; + pname = "pcsx2"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix index 5af3042bde4d..8f1e5e02c186 100644 --- a/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix +++ b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix @@ -3,7 +3,7 @@ , fetchpatch }: stdenv.mkDerivation rec { - name = "pcsxr-${version}"; + pname = "pcsxr"; version = "1.9.94"; # codeplex does not support direct downloading @@ -67,14 +67,14 @@ stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" + mkdir -p "$out/share/doc/${pname}-${version}" cp README \ AUTHORS \ doc/keys.txt \ doc/tweaks.txt \ ChangeLog.df \ ChangeLog \ - "$out/share/doc/${name}" + "$out/share/doc/${pname}-${version}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix index 159eefad6662..619938ba5c64 100644 --- a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "ppsspp-${version}"; + pname = "ppsspp"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/qmc2/default.nix b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix index 65cc0bd9c05a..ca8d87b38005 100644 --- a/nixpkgs/pkgs/misc/emulators/qmc2/default.nix +++ b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { - name = "qmc2-${version}"; + pname = "qmc2"; version = "0.195"; src = fetchurl { - url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz"; sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns"; }; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index ee7ff114ec8f..f26769cd28dd 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -26,7 +26,7 @@ let }; in stdenv.mkDerivation rec { - name = "retroarch-bare-${version}"; + pname = "retroarch-bare"; version = "1.7.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 1072a66e0eac..8bdc79f2d8ec 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { - name = "kodi-retroarch-advanced-launchers-${version}"; + pname = "kodi-retroarch-advanced-launchers"; version = "0.2"; dontBuild = true; diff --git a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix index 2537669bbc42..25af4f8d50a7 100644 --- a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "retrofe-${version}"; + pname = "retrofe"; version = "0.6.169"; src = fetchhg { diff --git a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index 4c44377c11e6..ae1b1bf6bda2 100644 --- a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -10,7 +10,7 @@ let gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in stdenv.mkDerivation rec { - name = "rpcs3-${version}"; + pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; src = fetchgit { diff --git a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix index a58f95875ccf..0ae92121cab1 100644 --- a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -2,7 +2,7 @@ , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: stdenv.mkDerivation rec { - name = "snes9x-gtk-${version}"; + pname = "snes9x-gtk"; version = "1.57"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/stella/default.nix b/nixpkgs/pkgs/misc/emulators/stella/default.nix index 41ba5a3b2e61..c2d98cda060d 100644 --- a/nixpkgs/pkgs/misc/emulators/stella/default.nix +++ b/nixpkgs/pkgs/misc/emulators/stella/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "stella-${version}"; + pname = "stella"; version = "4.6.1"; src = fetchurl { - url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz"; + url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz"; sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; }; diff --git a/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix index c8712d208590..4df9086a317f 100644 --- a/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "visualboyadvance-m-${version}"; + pname = "visualboyadvance-m"; version = "2.1.3"; src = fetchFromGitHub { owner = "visualboyadvance-m"; diff --git a/nixpkgs/pkgs/misc/emulators/yabause/default.nix b/nixpkgs/pkgs/misc/emulators/yabause/default.nix index a2d462fd990e..ed8652d08f1b 100644 --- a/nixpkgs/pkgs/misc/emulators/yabause/default.nix +++ b/nixpkgs/pkgs/misc/emulators/yabause/default.nix @@ -2,11 +2,11 @@ , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { - name = "yabause-${version}"; + pname = "yabause"; version = "0.9.15"; src = fetchurl { - url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; + url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23"; }; diff --git a/nixpkgs/pkgs/misc/ghostscript/default.nix b/nixpkgs/pkgs/misc/ghostscript/default.nix index 446aac629829..5b80a5536259 100644 --- a/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -36,10 +36,11 @@ let in stdenv.mkDerivation rec { - name = "ghostscript-${version}"; + pname = "ghostscript"; + inherit version; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz"; inherit sha512; }; diff --git a/nixpkgs/pkgs/misc/gnash/default.nix b/nixpkgs/pkgs/misc/gnash/default.nix index 991be274ecc9..0f2abedd3b53 100644 --- a/nixpkgs/pkgs/misc/gnash/default.nix +++ b/nixpkgs/pkgs/misc/gnash/default.nix @@ -65,7 +65,7 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled"; stdenv.mkDerivation rec { - name = "gnash-${version}"; + pname = "gnash"; version = "0.8.11-2019-30-01"; src = fetchgit { diff --git a/nixpkgs/pkgs/misc/jackaudio/jack1.nix b/nixpkgs/pkgs/misc/jackaudio/jack1.nix index 8c9838ccec53..cb487677881a 100644 --- a/nixpkgs/pkgs/misc/jackaudio/jack1.nix +++ b/nixpkgs/pkgs/misc/jackaudio/jack1.nix @@ -14,7 +14,7 @@ let optCelt = shouldUsePkg celt; in stdenv.mkDerivation rec { - name = "jack1-${version}"; + pname = "jack1"; version = "0.125.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/libcardiacarrest/default.nix b/nixpkgs/pkgs/misc/libcardiacarrest/default.nix index 7f355bc81560..0c3370814bc3 100644 --- a/nixpkgs/pkgs/misc/libcardiacarrest/default.nix +++ b/nixpkgs/pkgs/misc/libcardiacarrest/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libcardiacarrest-${version}"; + pname = "libcardiacarrest"; version = "12.2.8"; # <PA API version>.<version> src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/lightspark/default.nix b/nixpkgs/pkgs/misc/lightspark/default.nix new file mode 100644 index 000000000000..bb3ade6b616f --- /dev/null +++ b/nixpkgs/pkgs/misc/lightspark/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg, glew, pcre +, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm +, llvm_39, glibmm +}: + +stdenv.mkDerivation rec { + pname = "lightspark"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "lightspark"; + repo = "lightspark"; + rev = "${version}"; + sha256 = "0chydd516wfi73n8dvivk6nwxb9kjimdfghyv9sffmqmza0mv13s"; + }; + + patchPhase = '' + sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt + ''; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ + curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg + gnome2.pango lzma nasm llvm_39 glibmm + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open source Flash Player implementation"; + homepage = "https://lightspark.github.io/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ jchw ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/misc/long-shebang/default.nix b/nixpkgs/pkgs/misc/long-shebang/default.nix index 1a064e8c627d..5af75be690cb 100644 --- a/nixpkgs/pkgs/misc/long-shebang/default.nix +++ b/nixpkgs/pkgs/misc/long-shebang/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl }: let version = "1.2.0"; in stdenv.mkDerivation { - name = "long-shebang-${version}"; + pname = "long-shebang"; + inherit version; src = fetchurl { url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/misc/mnemonicode/default.nix b/nixpkgs/pkgs/misc/mnemonicode/default.nix index d977d822351e..06a6a7e65505 100644 --- a/nixpkgs/pkgs/misc/mnemonicode/default.nix +++ b/nixpkgs/pkgs/misc/mnemonicode/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mnemonicode-${version}"; + pname = "mnemonicode"; version = "2015-11-30"; src = fetchFromGitHub { owner = "singpolyma"; diff --git a/nixpkgs/pkgs/misc/mxt-app/default.nix b/nixpkgs/pkgs/misc/mxt-app/default.nix index fe9e8d3f4b00..d701bd654d21 100644 --- a/nixpkgs/pkgs/misc/mxt-app/default.nix +++ b/nixpkgs/pkgs/misc/mxt-app/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ version="1.28"; - name = "mxt-app-${version}"; + pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; diff --git a/nixpkgs/pkgs/misc/sailsd/default.nix b/nixpkgs/pkgs/misc/sailsd/default.nix index 25441a30d86b..eefd83c72600 100644 --- a/nixpkgs/pkgs/misc/sailsd/default.nix +++ b/nixpkgs/pkgs/misc/sailsd/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { version = "0.2.0"; - name = "sailsd-${version}"; + pname = "sailsd"; src = fetchFromGitHub { owner = "sails-simulator"; repo = "sailsd"; diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix index cd5db3067f41..d25f253bd005 100644 --- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "betterlockscreen-${version}"; + pname = "betterlockscreen"; version = "3.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index 6b28c39f7679..b1c2ec5c3bda 100644 --- a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -3,7 +3,6 @@ , glee }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "electricsheep"; version = "2.7b33-2017-10-20"; diff --git a/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix index b3c48cb40249..ae61291b0879 100644 --- a/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -1,7 +1,7 @@ { stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }: stdenv.mkDerivation rec { - name = "i3lock-pixeled-${version}"; + pname = "i3lock-pixeled"; version = "1.2.1"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix index 0b840448f2c0..e3d3b109d1a9 100644 --- a/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig + wrapGAppsHook ]; buildInputs = [ @@ -45,7 +46,6 @@ stdenv.mkDerivation rec { libXext libXxf86vm systemd - wrapGAppsHook ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/misc/screensavers/physlock/default.nix b/nixpkgs/pkgs/misc/screensavers/physlock/default.nix index 9855e8688867..5cfddaaea571 100644 --- a/nixpkgs/pkgs/misc/screensavers/physlock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/physlock/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "11-dev"; - name = "physlock-${version}"; + pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; repo = "physlock"; diff --git a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix index 404346bba631..fb80f9922ce9 100644 --- a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgs }: stdenv.mkDerivation rec { - name = "pipes-${version}"; + pname = "pipes"; version = "1.3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix b/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix index e8b9346a8727..7f6d99297ab1 100644 --- a/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.1"; - name = "rss-glx-${version}"; + pname = "rss-glx"; src = fetchurl { url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix index b6f82cd45d7c..4d4e1c1fc418 100644 --- a/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "xautolock-${version}"; + pname = "xautolock"; version = "2.2-7-ga23dd5c"; # This repository contains xautolock-2.2 plus various useful patches that diff --git a/nixpkgs/pkgs/misc/seafile-shared/default.nix b/nixpkgs/pkgs/misc/seafile-shared/default.nix index d68ac0f9fc19..1dcf16585f0b 100644 --- a/nixpkgs/pkgs/misc/seafile-shared/default.nix +++ b/nixpkgs/pkgs/misc/seafile-shared/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "7.0.2"; - name = "seafile-shared-${version}"; + pname = "seafile-shared"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/nixpkgs/pkgs/misc/sndio/default.nix b/nixpkgs/pkgs/misc/sndio/default.nix index 2556e7d9d837..1993b4bcce40 100644 --- a/nixpkgs/pkgs/misc/sndio/default.nix +++ b/nixpkgs/pkgs/misc/sndio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib }: stdenv.mkDerivation rec { - name = "sndio-${version}"; + pname = "sndio"; version = "1.6.0"; enableParallelBuilding = true; buildInputs = [ alsaLib ]; diff --git a/nixpkgs/pkgs/misc/sound-of-sorting/default.nix b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix index 6db3b44b6866..f61c9f5e1b9b 100644 --- a/nixpkgs/pkgs/misc/sound-of-sorting/default.nix +++ b/nixpkgs/pkgs/misc/sound-of-sorting/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "sound-of-sorting-${version}"; + pname = "sound-of-sorting"; version = "unstable-2015-07-21"; src = fetchgit { diff --git a/nixpkgs/pkgs/misc/stabber/default.nix b/nixpkgs/pkgs/misc/stabber/default.nix index ec8ef076c2fc..b5dc7a13f183 100644 --- a/nixpkgs/pkgs/misc/stabber/default.nix +++ b/nixpkgs/pkgs/misc/stabber/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "stabber-unstable-${version}"; + pname = "stabber-unstable"; version = "2016-11-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/adapta-kde/default.nix b/nixpkgs/pkgs/misc/themes/adapta-kde/default.nix index 875973c9d3f5..a7624d2889bb 100644 --- a/nixpkgs/pkgs/misc/themes/adapta-kde/default.nix +++ b/nixpkgs/pkgs/misc/themes/adapta-kde/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "adapta-kde-theme-${version}"; + pname = "adapta-kde-theme"; version = "20180512"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/adapta/default.nix b/nixpkgs/pkgs/misc/themes/adapta/default.nix index 6d2a16cbfd23..5fd8f1a594ea 100644 --- a/nixpkgs/pkgs/misc/themes/adapta/default.nix +++ b/nixpkgs/pkgs/misc/themes/adapta/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { - name = "adapta-gtk-theme-${version}"; + pname = "adapta-gtk-theme"; version = "3.95.0.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/albatross/default.nix b/nixpkgs/pkgs/misc/themes/albatross/default.nix index 14fe0f21d80e..870b348cc320 100644 --- a/nixpkgs/pkgs/misc/themes/albatross/default.nix +++ b/nixpkgs/pkgs/misc/themes/albatross/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "Albatross-${version}"; + pname = "Albatross"; version = "1.7.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/arc-kde/default.nix b/nixpkgs/pkgs/misc/themes/arc-kde/default.nix index 42ff954a46ba..054cd1aeffc3 100644 --- a/nixpkgs/pkgs/misc/themes/arc-kde/default.nix +++ b/nixpkgs/pkgs/misc/themes/arc-kde/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "arc-kde-theme-${version}"; + pname = "arc-kde-theme"; version = "2017-11-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/blackbird/default.nix b/nixpkgs/pkgs/misc/themes/blackbird/default.nix index 4b7702ed6359..3a0636a658af 100644 --- a/nixpkgs/pkgs/misc/themes/blackbird/default.nix +++ b/nixpkgs/pkgs/misc/themes/blackbird/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "Blackbird"; version = "2017-12-13"; - name = "${pname}-${version}"; src = fetchFromGitHub { repo = "${pname}"; diff --git a/nixpkgs/pkgs/misc/themes/clearlooks-phenix/default.nix b/nixpkgs/pkgs/misc/themes/clearlooks-phenix/default.nix index daeb7d7ad36d..04929a4cb4d1 100644 --- a/nixpkgs/pkgs/misc/themes/clearlooks-phenix/default.nix +++ b/nixpkgs/pkgs/misc/themes/clearlooks-phenix/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "7.0.1"; - name = "clearlooks-phenix-${version}"; + pname = "clearlooks-phenix"; src = fetchurl { url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/misc/themes/e17gtk/default.nix b/nixpkgs/pkgs/misc/themes/e17gtk/default.nix index f0bb2bf729dc..9cdefb9bb54b 100644 --- a/nixpkgs/pkgs/misc/themes/e17gtk/default.nix +++ b/nixpkgs/pkgs/misc/themes/e17gtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "e17gtk-${version}"; + pname = "e17gtk"; version = "3.22.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix b/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix index bc4b57e8b58e..1a4241be8654 100644 --- a/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix +++ b/nixpkgs/pkgs/misc/themes/equilux-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { - name = "equilux-theme-${version}"; + pname = "equilux-theme"; version = "20181029"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/jade1/default.nix b/nixpkgs/pkgs/misc/themes/jade1/default.nix index e6096ef829d0..ebeb7f2d8665 100644 --- a/nixpkgs/pkgs/misc/themes/jade1/default.nix +++ b/nixpkgs/pkgs/misc/themes/jade1/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "theme-jade1-${version}"; + pname = "theme-jade1"; version = "3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/kde2/default.nix b/nixpkgs/pkgs/misc/themes/kde2/default.nix index 8adf6a1e4330..fac8c38eecae 100644 --- a/nixpkgs/pkgs/misc/themes/kde2/default.nix +++ b/nixpkgs/pkgs/misc/themes/kde2/default.nix @@ -5,7 +5,8 @@ let version = "2017-03-15"; in mkDerivation rec { - name = "kde2-decoration-${version}"; + pname = "kde2-decoration"; + inherit version; src = fetchFromGitHub { owner = "repos-holder"; diff --git a/nixpkgs/pkgs/misc/themes/numix-solarized/default.nix b/nixpkgs/pkgs/misc/themes/numix-solarized/default.nix index 97a018f929e3..4fd06fae61bc 100644 --- a/nixpkgs/pkgs/misc/themes/numix-solarized/default.nix +++ b/nixpkgs/pkgs/misc/themes/numix-solarized/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20170810"; - name = "numix-solarized-gtk-theme-${version}"; + pname = "numix-solarized-gtk-theme"; src = fetchFromGitHub { owner = "Ferdi265"; diff --git a/nixpkgs/pkgs/misc/themes/numix-sx/default.nix b/nixpkgs/pkgs/misc/themes/numix-sx/default.nix index 9001ad9e5a3a..dfa788f6ea7b 100644 --- a/nixpkgs/pkgs/misc/themes/numix-sx/default.nix +++ b/nixpkgs/pkgs/misc/themes/numix-sx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2017-04-24"; - name = "numix-sx-gtk-theme-${version}"; + pname = "numix-sx-gtk-theme"; src = fetchurl { url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz"; diff --git a/nixpkgs/pkgs/misc/themes/numix/default.nix b/nixpkgs/pkgs/misc/themes/numix/default.nix index eb4b8c76301b..e01f8174e9ea 100644 --- a/nixpkgs/pkgs/misc/themes/numix/default.nix +++ b/nixpkgs/pkgs/misc/themes/numix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.6.7"; - name = "numix-gtk-theme-${version}"; + pname = "numix-gtk-theme"; src = fetchFromGitHub { repo = "numix-gtk-theme"; diff --git a/nixpkgs/pkgs/misc/themes/onestepback/default.nix b/nixpkgs/pkgs/misc/themes/onestepback/default.nix index 5e4f8ffa3d46..64ead2f75f4b 100644 --- a/nixpkgs/pkgs/misc/themes/onestepback/default.nix +++ b/nixpkgs/pkgs/misc/themes/onestepback/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "onestepback-${version}"; + pname = "onestepback"; version = "0.991"; srcs = [ diff --git a/nixpkgs/pkgs/misc/themes/paper/default.nix b/nixpkgs/pkgs/misc/themes/paper/default.nix index 8bcb48812a3e..2f7a53dc2d43 100644 --- a/nixpkgs/pkgs/misc/themes/paper/default.nix +++ b/nixpkgs/pkgs/misc/themes/paper/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2016-08-16"; - name = "paper-gtk-theme-${version}"; + pname = "paper-gtk-theme"; src = fetchFromGitHub { owner = "snwh"; diff --git a/nixpkgs/pkgs/misc/themes/qtcurve/default.nix b/nixpkgs/pkgs/misc/themes/qtcurve/default.nix index 348b4ae4eb94..0071e386e88c 100644 --- a/nixpkgs/pkgs/misc/themes/qtcurve/default.nix +++ b/nixpkgs/pkgs/misc/themes/qtcurve/default.nix @@ -8,7 +8,8 @@ let version = "1.9"; in mkDerivation { - name = "qtcurve-${version}"; + pname = "qtcurve"; + inherit version; src = fetchurl { url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz"; sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8"; diff --git a/nixpkgs/pkgs/misc/themes/solarc/default.nix b/nixpkgs/pkgs/misc/themes/solarc/default.nix index 55cd6e1dac04..3d9403b84f46 100644 --- a/nixpkgs/pkgs/misc/themes/solarc/default.nix +++ b/nixpkgs/pkgs/misc/themes/solarc/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "solarc-gtk-theme-${version}"; + pname = "solarc-gtk-theme"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/themes/vertex/default.nix b/nixpkgs/pkgs/misc/themes/vertex/default.nix index 06d42da79362..81c681f53715 100644 --- a/nixpkgs/pkgs/misc/themes/vertex/default.nix +++ b/nixpkgs/pkgs/misc/themes/vertex/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "theme-vertex"; version = "20170128"; diff --git a/nixpkgs/pkgs/misc/uq/default.nix b/nixpkgs/pkgs/misc/uq/default.nix new file mode 100755 index 000000000000..9dcfae41ea82 --- /dev/null +++ b/nixpkgs/pkgs/misc/uq/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "uq"; + version = "unstable-2018-05-27"; + + src = fetchFromGitHub { + owner = "lostutils"; + repo = "uq"; + rev = "118bc2f3b1cf292afdffbc1cb4415d150b323165"; + sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; + }; + + cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w"; + + meta = with lib; { + description = "A simple, user-friendly alternative to sort | uniq"; + homepage = "https://github.com/lostutils/uq"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/misc/urbit/default.nix b/nixpkgs/pkgs/misc/urbit/default.nix index e10fa1b06b78..a0b6be3a418c 100644 --- a/nixpkgs/pkgs/misc/urbit/default.nix +++ b/nixpkgs/pkgs/misc/urbit/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "urbit-${version}"; + pname = "urbit"; version = "0.7.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 4dcfbeecb76d..cf1ea84a9c5b 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-08-12"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4"; - sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq"; + rev = "73812c3e41c1c7fcf1705811f35ac4c9ccec003e"; + sha256 = "166hgzyx1j1n717icj0mq2n8jkg4kpi1iy5gk3q0l28nd88w5hlb"; }; }; @@ -138,12 +138,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-07-28"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "6b89c217ffa50f92a7afdcb01d2af071ff9b80a0"; - sha256 = "03d12fi90kbhf74p1yh721nfa26r2ns7ad5k6a7n6fwl3anrq4g4"; + rev = "112b534f5a2b3c919cd9aa04767827bceae9ed18"; + sha256 = "09lhlllzapjawhhhsz5av11h1k944nq3bsg55xrfqsx8yghgdy7z"; }; }; @@ -281,12 +281,12 @@ let coc-emmet = buildVimPluginFrom2Nix { pname = "coc-emmet"; - version = "2019-06-17"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-emmet"; - rev = "557bc1b88a84d9191337169484603a56fdb30adb"; - sha256 = "1fla5i3fimm5h31qrivralbmhb88n1pkwzdfj74i6rd20fmv4xcx"; + rev = "0fd6e93dcab3507240962a480b42e08e818d1fa9"; + sha256 = "196cvnynkm34sa90gznp81l2l3wl2sxfishqzwr8xxlk2cdcshxn"; }; }; @@ -303,23 +303,23 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-08-11"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "30021c6a3aa7a33617ce1cb187468851bbaf1eb5"; - sha256 = "09r0ygsjv5d3v6js1ghb49j74plp0jkja2pmd1pbjgafxm02mb2y"; + rev = "d778033c08580768d2a48b78f4c1b7ab63af12bd"; + sha256 = "1bxx8y5yp9v95clp8dic8q8zr85dl7i2qq4iibmazg9hzcigc3s6"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-08-06"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "3f2748c87c89242c59d3583e8effa0de76c8abe7"; - sha256 = "1c7v1j3vny20dkc898hgr6val3jk1vc2aswsqm3cb2c3mqwhsrls"; + rev = "27ef3358055b68c5b592c920c9d0e8aa1522c71e"; + sha256 = "1v1lwkxzwi1l20561m1nxbmgmjgzn83lvx0mb2c4z3p7brbjmv0y"; }; }; @@ -435,12 +435,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-07-27"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "a1ed2aff825b9c48d4be98207470db0a19b2e2c6"; - sha256 = "0n8famcsy05vzaf48fczbfz68868wjkaq8bl4k6206glppmxybw3"; + rev = "65ff16f71ead209e83d34c639594a66df2e19c49"; + sha256 = "11bmf8rzdkgrmanyfmjckm2s3nby143lnra80q9bj2fs3dh9l5hd"; }; }; @@ -479,12 +479,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-07-26"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "bcfc9ecbf5e31e89a321a2f6e6bf6c3042aef166"; - sha256 = "1nkkl7j3328gjmmdrbpqvypsd52vqggaa9cxw98r2qn754nx2gwi"; + rev = "ffd2b091e5bb5995aac95d1ebe98f87f3df763b1"; + sha256 = "1n23nvfh99jvnmf901g5zck8hyx3qq5cr4vz119a7ra5dj4bka95"; }; }; @@ -501,23 +501,23 @@ let coc-stylelint = buildVimPluginFrom2Nix { pname = "coc-stylelint"; - version = "2019-06-19"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-stylelint"; - rev = "627d6aa41f4d64fba5bee5830a9fc0b9799ab5d5"; - sha256 = "1jgd2w9kxgrf3sg55jfg8i2afwvsyvjs656fhb48ynhw0dxf0nvp"; + rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad"; + sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x"; }; }; coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-08-11"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "819e2c523df6f809e0f83e4b5079bc9702adbe66"; - sha256 = "1l1hajj7hihm5klar28j6jqsad6bnjcy3h2cddvhavm696azibfv"; + rev = "d6617d0ae2b2ba0f415961fed1ffc3827d06db54"; + sha256 = "1drxhjr6yv4qja0z9pypq14lj18rkw0hpwcg0ji2fgiqrf2l9ywj"; }; }; @@ -545,23 +545,23 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-08-01"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "8daf0e45d513ab3b9eb91e126e50c48b901d8cf9"; - sha256 = "1zf75zahvcq5kcrpn5m69i0sj3dv4g2m8x3jffjqnx3cnirm42r4"; + rev = "c80ae7b19b038f380639e1c5b5e3c3a0b9252f6c"; + sha256 = "06pd5k72sa3d6psdkcdar70b456p2dqzbbk2x166gkxavjqjkyid"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-07-09"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "ebd982bde36db01d85e02ca48898be303d878d38"; - sha256 = "0dxwvx9mwhlxpa1wn1cy3psb2s2rafibmvin4rnzxb467bkwbgiz"; + rev = "444c297e2a418d816b6094446b57f2333ef9047a"; + sha256 = "01d51z6iyl2p5lhkr86a3gri0d8g7ydb8qvlp0xqrr2fy97xdx9v"; }; }; @@ -656,12 +656,12 @@ let context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2019-02-25"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "c3f806b4d06230607bc0a3bf619bf9c3ec1c9d95"; - sha256 = "17acbqlws0i82japyd2a94wf1arn6y8mb6sfbm6xzicvicffyqmd"; + rev = "9d495ce4ddfdae8f0b268fcec3a7a5e0062456e8"; + sha256 = "0g5ixgg8p2vrpjhyy52xln7a5f8rcbglgyir620ynzhz1phdilg4"; }; }; @@ -799,12 +799,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-08-17"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0"; - sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n"; + rev = "161d4a7cd490dad3a708e8461e11f3bf2af2c0ea"; + sha256 = "026lkyd768v4a0pyfzrlsqyln4bvmhp99p4vjhmmi079vjs7z7b1"; }; }; @@ -912,12 +912,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-08-14"; + version = "2019-08-31"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "bb2b16309b94695a3344c713282368b3329a2412"; - sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9"; + rev = "93722cc5d0a1877fdad0845330b3a41c5e392a34"; + sha256 = "0ay5j8drbd0m8hn9zpxsd56z2y07imm8lmkvfamja353mwb8nlh9"; }; }; @@ -990,12 +990,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-07-24"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "461700696ea317722c4a8d92a31a7267cdcc0bfb"; - sha256 = "1jfz9n875lqnhxi09rddw1wpacjda1l36xyc3a4yyaxbfb62sqxf"; + rev = "10b3746ecb52064d44bbcb1fdf6b21cca551f30c"; + sha256 = "1crm0qj8wwizgvzn4jlwbpnjbddp08fs9i46nr56q38hc6mgir4x"; fetchSubmodules = true; }; }; @@ -1024,12 +1024,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-08-14"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "d642592f062c5e4d195e627ac4104d4e0355a125"; - sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac"; + rev = "f5ec61dade10692257e5f45609bb42f8fbf07c23"; + sha256 = "08j1rhah96k7w4x569w84qxgn4ishia0xxy102z8v5zgxjpcyhld"; }; }; @@ -1135,12 +1135,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-08-07"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "f7aee1f324d2a731a13b4495260a1aeaf0c0b52a"; - sha256 = "1s0byckwkxwhrzrhdhjvfzzyg3pvbkbc3pikp395pzcf8kmpmvcv"; + rev = "12cbd4cf3109459a1577be30da82cffe22bdf4b6"; + sha256 = "0wzcpk9wsdhmz888g2x9b1ljf437agq536bd2d801dzv3ynqf4jl"; }; }; @@ -1179,12 +1179,12 @@ let gitv = buildVimPluginFrom2Nix { pname = "gitv"; - version = "2019-03-02"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "gregsexton"; repo = "gitv"; - rev = "89af431fb0fabe55bd3287d268f6b12ee336f666"; - sha256 = "0d60xf7kdl3ipjgw2cliky783jj5jsrz8bgd7gv5z08r853y76pv"; + rev = "a73599c34202709eaa7da78f4fe32b97c6ef83f8"; + sha256 = "0hhamv2q3z8cy4n9yzxq0jvs2x8qx4wx6c2qpsk82jsnghmzipd6"; }; }; @@ -1256,12 +1256,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-07-20"; + version = "2019-08-31"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "c94e82ab8c62c2b6f09c00752199692e4af1c836"; - sha256 = "00vpwcq0ap4ss60v57gbhbdp4vx632qlfxdbc7jh0iawdpm1bdsq"; + rev = "ddc3e4ea485771e4f0b939fd8259f3152eb1bd29"; + sha256 = "0128yxhafndllc383ncw4ka0r7q8mwvb3nx70f4plb6m3f07x8rm"; }; }; @@ -1333,12 +1333,12 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2019-03-22"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "e552c65165b42df79d462d9222ae022116bdb26a"; - sha256 = "0va122hl4lilakvc0ww59p5nqddj9fb9gk0hi68885fygqz0l6n5"; + rev = "9c5d1e70f5335cc995e61ceba870818a946f26c3"; + sha256 = "0ppd8x9rh2mqd743zsvxakzha878lg7c7a3as5nlfjpb89g5dmn6"; }; }; @@ -1366,12 +1366,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-08-11"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827"; - sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86"; + rev = "4f2499e4f2cb8bbecda6130a9dbb306fbb746ebe"; + sha256 = "1gnyrfx0qbap7vm2rvg0w70ybjdny7c1ixzymqd1w9wv7krz5h8y"; fetchSubmodules = true; }; }; @@ -1488,12 +1488,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-08-14"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "09c61dc3f650eccd2c165c36db8330496321aa50"; - sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb"; + rev = "8b3aa1632c08784928458b2b85faf5c89feefccf"; + sha256 = "0bxvxkk0zps2qxnzp8dip7ngpv9b1a74y2wjzjqqvxzljk81a714"; }; }; @@ -1686,12 +1686,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-08-01"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "528b5e47ec9c29fbbd470f2af71b8ad994a96bdb"; - sha256 = "09cq8a4ryhxvnpjvpbm0dq22ccqfmym59avxr4c0ablx1sqy9lhy"; + rev = "eb94d083bc0c9a4e4bec8a205fc65f6a464bd0f7"; + sha256 = "1va2dvqjjlcyl2in9wjh6c8gmnxlnl13j7gmf2g37j6jm28l16r9"; }; }; @@ -1708,12 +1708,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-08-15"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "cad94240c8284ab3502c62acc18e420ca22107de"; - sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq"; + rev = "723336c47844d7f58b7c37a6c3e62ddabcdf392b"; + sha256 = "0psiadnx4qzqzn6p2yc7az5l624xb5mczn3y39irbdrl6l2rcd81"; }; }; @@ -1763,12 +1763,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-06-22"; + version = "2019-08-20"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "f974a6e3c70f0591b76c196d6e6b2c20649e94c4"; - sha256 = "0wr4s52jfdhxm5zf6i46skrs8hjlf5w3c0wcrxjnszykza9d6whl"; + rev = "c96ff95c9a41d716bbdca41b4cc2dc62e4b188a1"; + sha256 = "0jbrgsdljh9n1cr3dpgq83gpd3hx7ss4hbc0i0hls15laczlzipc"; }; }; @@ -1796,23 +1796,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-08-07"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "a05185584d7cae7791fb40b7656cf642fdbe4938"; - sha256 = "1yri2gw2i4nkssm6fd1l8b9hkinb6h70wsavkb712ivdzqpcls6y"; + rev = "2504a3d84e97be144019ef184f0c2aed42f3152d"; + sha256 = "0djfm8k4yqaycydg4hpvnapyh2d5k0r3alhlk09rj1arsw2kzh38"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-08-09"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "184fbb6ffea6dc69726b229a08153c9d08522386"; - sha256 = "1h4wqmiplk3ay56db20dxxw90i9rij2kp2zjfhbfz525pxjg82gn"; + rev = "3d508aedce35e1d952d3ce92378ad27ea5960fa6"; + sha256 = "098g4qq3h8nklynj4qnj02f6ivw10q07c69ssdrhgjwilpgv4nrk"; }; }; @@ -1895,12 +1895,12 @@ let nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev-nvim"; - version = "2019-08-05"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "4f2f53872672f44049cef04a1f8f3cc4f921eae8"; - sha256 = "1yci56rdxqk5zfzqlkmhsw5s7c9xladhl3d4ks1j2b4dcb8gdsf5"; + rev = "d27d00b3c529adc13c9882e7a3cb5c63df038dcc"; + sha256 = "1z6i891h574yg3s1y96vwik1pxhy707rn5rsqqb7yxnfw6xy57cq"; }; }; @@ -2080,6 +2080,17 @@ let }; }; + readline-vim = buildVimPluginFrom2Nix { + pname = "readline-vim"; + version = "2019-08-24"; + src = fetchFromGitHub { + owner = "ryvnf"; + repo = "readline.vim"; + rev = "40964933819e2a719e6e34adcf3e8b2210c5c6ce"; + sha256 = "1jc8lzl49nl7r3v1b7fk6zpiba41h51qsi2w4lhf8v6lnzbazii7"; + }; + }; + Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; version = "2019-06-04"; @@ -2113,17 +2124,6 @@ let }; }; - readline-vim = buildVimPluginFrom2Nix { - pname = "readline-vim"; - version = "2019-06-10"; - src = fetchFromGitHub { - owner = "ryvnf"; - repo = "readline.vim"; - rev = "a7c754acaf0aec922d4a6bde908a636578ef82cc"; - sha256 = "16fawg7fnlipn1f41cn1qc83dhr63qhr1bwn3qmr8sy7rbk5lihr"; - }; - }; - riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; version = "2019-02-18"; @@ -2159,12 +2159,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-08-15"; + version = "2019-08-30"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff"; - sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x"; + rev = "e99f3f5bc60e15c488989f6208769a271ccf0e9f"; + sha256 = "1sq6z878llxx78x7b8y3g1z9w1c412kj7zv9kq50njff43rddjiy"; }; }; @@ -2555,12 +2555,12 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2019-03-29"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "e1d3bb9f836a8645807b790345b69666bf22bb2f"; - sha256 = "0i0lys3926s7n6iq03fg0flsp2rmvzwvfjmldcv31vjjrhzlbqmx"; + rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2"; + sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi"; }; }; @@ -2577,12 +2577,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-07-26"; + version = "2019-08-25"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "b397068789f1844ef28e207a4efc03f157874f80"; - sha256 = "15dmlzyhmg0rw8wkkln7xr2qmlz4gilqpi22wkzziwvsjc4hs2az"; + rev = "217b4cfcfbe8633693c9751cf3eeafe8c48e2846"; + sha256 = "11g2ybrxndssf6g1dxhx68gycfnkv2wmara6h7kwgy0sjn4r413x"; }; }; @@ -2819,12 +2819,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-08-11"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "a40184536b3b93b6272585da9c36dca802d47a01"; - sha256 = "0ygv6mc8fby6chzms7ah6sbq7yf7jhcnavbw52dra2sdfm2h2kch"; + rev = "6409c7b317a283333a720f48cca5f259c1ea29ef"; + sha256 = "1wr7202idpyydnjbkc7sk8wr02ipdq40x4rwhi955yx76gwl111a"; }; }; @@ -2874,12 +2874,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2019-07-08"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "a7009a968869319bf0811110fd2006738ba27370"; - sha256 = "1c0zdsxv3x0bvjbvbr633g16464lhq66yy4jpw6pwsw6h2p78iha"; + rev = "69f7f2d80d3722f62847a58443da1d6cdf81b292"; + sha256 = "0vxblych7afny8i8kyk2f85xc9k2y4sv7i9jf3mkpykimsq2w4hm"; }; }; @@ -2907,12 +2907,12 @@ let vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2019-01-25"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "f5726c4bbe84a762d5ec62d57af439138a36af76"; - sha256 = "0mk15jv0vsqvww0jk3469755lb4hhjmxqkbk7byvxch63ai8jlsy"; + rev = "a05c728a962cdc7285f31ae5814cb64404fa7efc"; + sha256 = "1aymm36hakvvwhp8bnr0ys2xsadw8b3m8681lir3ymj55vc8cl5y"; }; }; @@ -2951,12 +2951,12 @@ let vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; - version = "2019-07-19"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "t9md"; repo = "vim-choosewin"; - rev = "ee5690220fa712a448577522b9508e79a07830c6"; - sha256 = "1w42lm1rg6002030rigs5pvqf98wdpljm1pyzzikl6hgarv3c8q1"; + rev = "6da5c0b96e63f51f0801266b781dee0562e74da9"; + sha256 = "0f1x57gzvv97h8maz8i1h5dmgxqvf4lwf1bza380l0nm7m5bdpg5"; }; }; @@ -3072,12 +3072,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-06-12"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "5a31c72cc51cb11118e44fb50ff77fc596348f77"; - sha256 = "17a2i40z5145px4p4swvm003h4mdxd2hp89pyvrqal910d2g3hgb"; + rev = "1f9fe5c1f9e0a6bfc41b14d070f4d878d445ae96"; + sha256 = "0h0hdv492kw0gs8kn62gyvs29pjwvvg8gbsisx4wpw6qa6w457hn"; }; }; @@ -3105,12 +3105,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-07-08"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0c9e6faaf246767c850eb92f48c4bdc068cdf235"; - sha256 = "1kmdzf34clhvcjwxr47phvw835nfhm70swar5s6cf2pis1wllmjw"; + rev = "830f0fe48a337ed26384c43929032786f05c8d24"; + sha256 = "06lsb8lwdbb6l0nznmxb9akd4ss9cw76d03z9h4q9yfjydyqf5kn"; }; }; @@ -3127,12 +3127,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-08-05"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "3020cce00581054e9177297ee5461737a35de7de"; - sha256 = "1qvkgjfrwl2qmi2b1cvznvbmsn8rqgm4wcgb79il07ij4lnwf9g9"; + rev = "e8a213d9d0a21f03fc03319fa7560521b6cd6928"; + sha256 = "1vhjlpjjg5bdfcalf10z9gjnrnc98yf5r3ink9dhljj5vnx23zaw"; }; }; @@ -3215,12 +3215,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-08-15"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5"; - sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm"; + rev = "e9d495bb85981467105c375f665b10249b7bcc53"; + sha256 = "1lm2lhj9sqijc5b7yqa0vs56n2jg0q0xlxs4mf1pjwhdi0wmqd5y"; }; }; @@ -3259,12 +3259,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-08-12"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "8712a165da4d1de9fb6ae918322ece843ac742e0"; - sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7"; + rev = "0b46f733955c63a73dc49c316f8bc97a4119fddc"; + sha256 = "1q8mnd6sd0nl8i13jvzkl79sbz0ncvx015bihymglj8wcpzrrwni"; }; }; @@ -3325,12 +3325,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-08-16"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5"; - sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh"; + rev = "b97a9abe29c39c4e1a45ae199dbb470df362f538"; + sha256 = "0lf5r91ba9xzzy1vs6g81mdgghcyica6xiir1xpg2aqksk0aidri"; }; }; @@ -3369,12 +3369,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-08-16"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89"; - sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw"; + rev = "88d396f1b49747fadbbde5c038a85067d94954e5"; + sha256 = "02blbk7vq5p25713ys30djkivks4ywg69drh9apyb3g5mjwi60m6"; }; }; @@ -3402,12 +3402,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-08-12"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "007b69c27b63fbcbe2e0766073b09281274b0231"; - sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w"; + rev = "635b9e7f27905070788cef60c0ba520209bf4f09"; + sha256 = "0zmymzafryi7mchv8wz3ynxi8a597c69zvx2s57xyhhczpcah4ms"; }; }; @@ -3424,12 +3424,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-05-31"; + version = "2019-08-30"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "a73a9dc920bd0b3ba8b298c258bd4d4814d9a162"; - sha256 = "15dcrla2z1r5phabfn72b6vbsyji8nsw3g5lif14pkg7ps3py79n"; + rev = "1b9cec58509ba2bc212ad21e4a58eb3acf501b9f"; + sha256 = "1rhp1rb97v9fv7w4qs350k5gqslbmkjn3lrq2a5bgnhar5xybs4k"; }; }; @@ -3666,12 +3666,12 @@ let vim-javascript-syntax = buildVimPluginFrom2Nix { pname = "vim-javascript-syntax"; - version = "2019-07-22"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "jelera"; repo = "vim-javascript-syntax"; - rev = "77f90362a05eeb7733648d522ce9bf54ca3b9299"; - sha256 = "00mv80fsvngdihrjfhfgz91lq5anfizkirgcaz0ld1d9i8arqsmc"; + rev = "e65e4f01ba94761323450208c9bf7141428784db"; + sha256 = "09561jf3cmzpm8jn8k34fd3av6i1mqi6n32bisri96jkabw8dpv7"; }; }; @@ -3733,12 +3733,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-08-07"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "49a4b2e2a66b43c1335d1df378d5ebb6f381fe05"; - sha256 = "0pfscx95cjkw48ccn53x04wkrbh2kan2p3djyk2f5ml9n1ln8if5"; + rev = "9a0f7e8072f4e7e80c74b1e24fa82e359046b25a"; + sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir"; }; }; @@ -3854,12 +3854,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-08-13"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a"; - sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25"; + rev = "c2a8fad6bc39a8a90fccee32a34861969f55ad5a"; + sha256 = "16hb0lan77ics7192cpnw2i2aigbab5g63pq0j992vja7pmh6hab"; }; }; @@ -4041,12 +4041,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-07-29"; + version = "2019-08-26"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "b41a18b75dd8dee5217bca9f68d91f8fd2ea6084"; - sha256 = "0hw3znmb8zsacnkavgqcqbv4yb1b8vj9fm5h4z5lslxnnlg09pg9"; + rev = "53f14ea43997e46c2c4686a1d89bcebfec1c8c50"; + sha256 = "1qcng9hszv4fcqhzdq7sfvdhl0x4zv91blk328n2jrqp831c0ds1"; }; }; @@ -4107,12 +4107,12 @@ let vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2017-06-14"; + version = "2019-08-30"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; - sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; + rev = "4e0f08de173fcde5f3cb93da2c8129b1588e469a"; + sha256 = "1vhqcd0gls9bys1anjlfyx4mh3rfkc076g6j9h1r4j09zn0bw1qn"; }; }; @@ -4122,8 +4122,8 @@ let src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "307b0f244d99408decda3a98f58e864d49626818"; - sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw"; + rev = "ebd534c88bfd49f8d3c758d96ad04ce3f77ee6f8"; + sha256 = "1r3ic5mii9q4kqpwyq37cjbrrzj93fhj9b46zqkb5i1nw2vydl6l"; }; }; @@ -4162,12 +4162,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-07-29"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "94001f00825c36fab63b9f3ca47a204111e561a2"; - sha256 = "0pppaavma07c3lxqlbk8cghdsirncxng52mjmv5qk8yar8kxqvbr"; + rev = "b1a826329c0891416f2357bf77a43ac49b441e6d"; + sha256 = "0za2hnsg888nl3ddhawll053j64sgqhiqpxciqi05j50bz34cs8n"; }; }; @@ -4239,12 +4239,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2019-06-27"; + version = "2019-08-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "c509c7eedeea641f5b0bdae708581ff610fbff5b"; - sha256 = "19zhhnlrnkgsxacykck9q19rhk4gj31qjj6i4sl6bzi086kmf0z9"; + rev = "9edacf9d5b4d6e0570af33f88500f51ec4288c2e"; + sha256 = "0m91nvxjkgmbgaib3q27rk2nzkpxx18pa8nrv143r2k8na9bry0p"; }; }; @@ -4316,12 +4316,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-08-07"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "c176d137892f33945d3d4dd766fd21611e9b5ddf"; - sha256 = "11adqaccwph4z5a4kyycd1gbc1l9np4za0d4fbd3cnh1zqf2xzjz"; + rev = "b9febff7aac028a851d2568d3dcef91d9b6971bc"; + sha256 = "00852qj3v3py63k23rrxmx8w5yrin3q21vz9css0xg12l5r1j1wv"; }; }; @@ -4338,12 +4338,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-08-16"; + version = "2019-08-22"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad"; - sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc"; + rev = "2b5070441dea482cc4f88556b19002f2da6f3566"; + sha256 = "185c8x8nly7jxv0vpf0dsbpby2nsfqdxkyzc6mips6in7ymgg3b3"; }; }; @@ -4382,12 +4382,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2019-05-31"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "5b670df36291ca75f5ded5cd7608948d58ff6325"; - sha256 = "1s400mmp2g9n41svzxizm046901d5hd43hy4yh0ps8b5iq4kspma"; + rev = "27cc3ce0fd19f0414024a81ee1eee6b17f155122"; + sha256 = "162gvzm7f0dsgv52ixd79ggzxddgpmrxqsqa41nv72mw61s0pmax"; }; }; @@ -4459,12 +4459,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-08-15"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33"; - sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr"; + rev = "13b67af7aa6a454adbf1f0925bf41737889ed830"; + sha256 = "015vak1awjzxwwrhkq6hdwf7wb7v0llswm95ky7zvkpqv8yncxhh"; }; }; @@ -4547,23 +4547,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-08-06"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "8b0a0ee7f2463f6949a5ce778169a782b80cdab4"; - sha256 = "0d66hv8r7hnahs6nh6jj00xbly38xgfz6ilg5zlab2kgswmkzxrf"; + rev = "ed2b552cbf8d8c14a56f75d106a6efb4303f5233"; + sha256 = "0a67ayc12l6gc4b80lxic1qvr2sfbgsa6bxshdsq9p661vsmym1p"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-08-16"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b"; - sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9"; + rev = "1b82c6929e9d87ca756569c1640320d027498364"; + sha256 = "0hf76jlv916jpdncfgh2wyczpj4c7rzak3m1j3vnysav000p3vhd"; }; }; @@ -4613,12 +4613,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2019-03-26"; + version = "2019-08-18"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "f95b4a888a91cc9373cf2f801658287ff984592f"; - sha256 = "149zspfxdnp10lj8vv7lvbck8bascpxc1kxjqpn00wslw7rjs5yg"; + rev = "85ca1f5f197a30ce52d382bcdcaedeed4e132848"; + sha256 = "17lnvcw7vnwnl54yhw0jpsqnk0pni1wqg4kbm53bv4pvk8ivr95d"; }; }; @@ -4646,12 +4646,12 @@ let vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2019-02-18"; + version = "2019-08-28"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "2295e612d936671048035dbc447f5400cbee60de"; - sha256 = "1iay39zsp00d5mrqzggr40g6253qfk17wvjvmdp3xn50jraj8gwh"; + rev = "a4ec206052aa347d7df90dc4b6697b7f2b7929bc"; + sha256 = "1dgykq4vl7vvj2f8lvg58rzqddm53i278g26ljwfimgqc8l6gmqd"; }; }; @@ -4712,12 +4712,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-06-20"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "c91e356a33569bc39bb01392362b8747355b356e"; - sha256 = "07xm2289932j7lrxaf1gx3rxbzx4f059mkx78chj915pndx72q33"; + rev = "473427fc6e5aabdf69ad0ca28808de841d70bdb8"; + sha256 = "0cnj7z3r9cws283wrpg1a40ykpk0lwjkb44gp77996cggr9nqbjz"; }; }; @@ -4767,12 +4767,12 @@ let vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; - version = "2018-03-10"; + version = "2019-08-29"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-wordy"; - rev = "14b9dbf76a82e29273a74768573900361200467f"; - sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk"; + rev = "87a77cb293ed1193c01e0f93c4dd70cddde76b08"; + sha256 = "19wvm1al41ys429rb2agb7d3xfv1kh2287r8sgiy1f6whjn236z6"; }; }; @@ -4866,12 +4866,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-08-14"; + version = "2019-08-27"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "866699bdae3696130159e7115954c64de8e7bdcd"; - sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq"; + rev = "23a3b356ba1e90d4a9dbb085712376cab83ab19e"; + sha256 = "1rp3jfsx991k2jl7wr8b32la5b881pn17k6dy27lwpw0sd0x3ha4"; }; }; @@ -5009,12 +5009,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-07-14"; + version = "2019-08-23"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "632bed9406fe891da8ec7b86320ff1c274d8318e"; - sha256 = "19g2ppq0ircmbj6vv5rs00fqa8vq1faw4hv1asq2ym31f3y3ccax"; + rev = "24fa9013a5a5d053262830553e81f84d9bf7552f"; + sha256 = "17mjrlzb60vkgvyiag11xmrf8a5sp94z1rx1mzcc4ys6j1if9136"; fetchSubmodules = true; }; }; diff --git a/nixpkgs/pkgs/misc/xosd/default.nix b/nixpkgs/pkgs/misc/xosd/default.nix index c8cda8482bf1..a841acdca94e 100644 --- a/nixpkgs/pkgs/misc/xosd/default.nix +++ b/nixpkgs/pkgs/misc/xosd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXext, libXt, xorgproto }: stdenv.mkDerivation rec { - name = "xosd-${version}"; + pname = "xosd"; version = "2.2.14"; src = fetchurl { - url = "mirror://sourceforge/libxosd/${name}.tar.gz"; + url = "mirror://sourceforge/libxosd/${pname}-${version}.tar.gz"; sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg"; }; diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix index 4d33fc0f3f88..ba5002c8c48f 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -4,7 +4,7 @@ let # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { version = "10.12"; - name = "MacOS_SDK-${version}"; + pname = "MacOS_SDK"; # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by: # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix index 28dcbdcb4a2a..6a0c819a0a31 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "551.1"; - name = "objc4-${version}"; + pname = "objc4"; src = fetchapplesource { inherit version; diff --git a/nixpkgs/pkgs/os-specific/darwin/chunkwm/default.nix b/nixpkgs/pkgs/os-specific/darwin/chunkwm/default.nix index 9dd1205c1146..12b358126512 100644 --- a/nixpkgs/pkgs/os-specific/darwin/chunkwm/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/chunkwm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { - name = "chunkwm-${version}"; + pname = "chunkwm"; version = "0.4.9"; src = fetchzip { url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/os-specific/darwin/duti/default.nix b/nixpkgs/pkgs/os-specific/darwin/duti/default.nix index a9051fd1279f..5c63b8e0dfb3 100644 --- a/nixpkgs/pkgs/os-specific/darwin/duti/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/duti/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "duti"; - name = "${pname}-${version}"; version = "1.5.4pre"; src = fetchFromGitHub { owner = "moretension"; diff --git a/nixpkgs/pkgs/os-specific/darwin/goku/default.nix b/nixpkgs/pkgs/os-specific/darwin/goku/default.nix index 190c0ae22131..e374bd2f11c6 100644 --- a/nixpkgs/pkgs/os-specific/darwin/goku/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/goku/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "goku-${version}"; + pname = "goku"; version = "0.1.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/darwin/iproute2mac/default.nix b/nixpkgs/pkgs/os-specific/darwin/iproute2mac/default.nix index 3ff03aace4ee..be8554983074 100644 --- a/nixpkgs/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "iproute2mac-${version}"; + pname = "iproute2mac"; src = fetchFromGitHub { owner = "brona"; diff --git a/nixpkgs/pkgs/os-specific/darwin/khd/default.nix b/nixpkgs/pkgs/os-specific/darwin/khd/default.nix index fb7bb12a493f..90f92b0b6443 100644 --- a/nixpkgs/pkgs/os-specific/darwin/khd/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/khd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }: stdenv.mkDerivation rec { - name = "khd-${version}"; + pname = "khd"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix b/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix index 3076392ecb26..c3fa76f50960 100644 --- a/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/kwm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "kwm-${version}"; + pname = "kwm"; version = "4.0.5"; src = fetchzip { diff --git a/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix b/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix index 0b59ecb2299e..cb81c2e81495 100644 --- a/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/lsusb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "lsusb-${version}"; + pname = "lsusb"; src = fetchFromGitHub { owner = "jlhonora"; diff --git a/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix b/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix index 75f1113e9f08..12bf02bf89ff 100644 --- a/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "m-cli-${version}"; + pname = "m-cli"; version = "0.2.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/darwin/opencflite/default.nix b/nixpkgs/pkgs/os-specific/darwin/opencflite/default.nix index 960e0677da1e..23b5ded1fe61 100644 --- a/nixpkgs/pkgs/os-specific/darwin/opencflite/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/opencflite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, icu, libuuid, tzdata }: stdenv.mkDerivation rec { - name = "opencflite-${version}"; + pname = "opencflite"; version = "476.19.0"; src = fetchurl { - url = "mirror://sourceforge/opencflite/${name}.tar.gz"; + url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz"; sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; }; diff --git a/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix b/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix index 404e752c279e..77e63c779b9c 100644 --- a/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix @@ -17,7 +17,6 @@ let in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "osxfuse"; inherit version; diff --git a/nixpkgs/pkgs/os-specific/darwin/qes/default.nix b/nixpkgs/pkgs/os-specific/darwin/qes/default.nix index aa7bfb5c3be7..19ab34145e80 100644 --- a/nixpkgs/pkgs/os-specific/darwin/qes/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/qes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation rec { - name = "qes-${version}"; + pname = "qes"; version = "0.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/nixpkgs/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 631c59523e2a..9f5f8aa44228 100644 --- a/nixpkgs/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "reattach-to-user-namespace-${version}"; + pname = "reattach-to-user-namespace"; version = "2.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix b/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix index 713847313c2c..ba5d3e9255bc 100644 --- a/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation rec { - name = "skhd-${version}"; + pname = "skhd"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix b/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix index b18c603a911b..9efa230d3b72 100644 --- a/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "smimesign-${version}"; + pname = "smimesign"; version = "v0.0.13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/darwin/trash/default.nix b/nixpkgs/pkgs/os-specific/darwin/trash/default.nix index fcbcfe00a3e7..50c6d4fd2f41 100644 --- a/nixpkgs/pkgs/os-specific/darwin/trash/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/trash/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "trash-${version}"; + pname = "trash"; src = fetchFromGitHub { owner = "ali-rantakari"; diff --git a/nixpkgs/pkgs/os-specific/linux/acpi/default.nix b/nixpkgs/pkgs/os-specific/linux/acpi/default.nix index 37de98780b69..cc7317f5520a 100644 --- a/nixpkgs/pkgs/os-specific/linux/acpi/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/acpi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "acpi-${version}"; + pname = "acpi"; version = "1.7"; src = fetchurl { - url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz"; sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/alsa-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-tools/default.nix index 14b10e6752bb..743e8f3576b0 100644 --- a/nixpkgs/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/alsa-tools/default.nix @@ -3,11 +3,11 @@ # some use gtk2, some gtk3 (and some even fltk13). stdenv.mkDerivation rec { - name = "alsa-tools-${version}"; + pname = "alsa-tools"; version = "1.1.7"; src = fetchurl { - url = "mirror://alsa/tools/${name}.tar.bz2"; + url = "mirror://alsa/tools/${pname}-${version}.tar.bz2"; sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix index 09c430bcd53b..6f23d1903188 100644 --- a/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}: stdenv.mkDerivation rec { - name = "alsa-utils-${version}"; + pname = "alsa-utils"; version = "1.1.9"; src = fetchurl { - url = "mirror://alsa/utils/${name}.tar.bz2"; + url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix index b03636d6f7f6..aed0ed374a78 100644 --- a/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -5,7 +5,7 @@ # services.udev.packages = [ pkgs.android-udev-rules ]; stdenv.mkDerivation rec { - name = "android-udev-rules-${version}"; + pname = "android-udev-rules"; version = "20190315"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/atop/default.nix b/nixpkgs/pkgs/os-specific/linux/atop/default.nix index 5d002bf72eac..5144add3a37f 100644 --- a/nixpkgs/pkgs/os-specific/linux/atop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/atop/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; - name = "atop-${version}"; + pname = "atop"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix b/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix index 50c48098ab08..205d788da6e5 100644 --- a/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/beegfs/default.nix @@ -27,7 +27,8 @@ let ]; in stdenv.mkDerivation rec { - name = "beegfs-${version}"; + pname = "beegfs"; + inherit version; src = fetchurl { url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}"; diff --git a/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix index a2ebc0cdc530..7f5cd206f32c 100644 --- a/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "bpftrace-${version}"; + pname = "bpftrace"; version = "0.9.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix b/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix index d77539fb89ed..44c2cfff5a2b 100644 --- a/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/cachefilesd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cachefilesd-${version}"; + pname = "cachefilesd"; version = "0.10.10"; src = fetchurl { - url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/fscache/${pname}-${version}.tar.bz2"; sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix b/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix index 0c32c3f5e62a..0149398bfa3e 100644 --- a/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix @@ -1,7 +1,7 @@ { stdenv, kernel, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "can-isotp-${version}"; + pname = "can-isotp"; version = "20180629"; hardeningDisable = [ "pic" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix index 616c99c8f46a..7913c703b5bc 100644 --- a/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/can-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "can-utils-${version}"; + pname = "can-utils"; # There are no releases (source archives or git tags), so use the date of the # latest commit in git master as version number. version = "20170830"; diff --git a/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix b/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix index 674b695b1eee..b724112af886 100644 --- a/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/checkpolicy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, flex, libsepol }: stdenv.mkDerivation rec { - name = "checkpolicy-${version}"; + pname = "checkpolicy"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix index ba66bd309bc3..ea6a6e775722 100644 --- a/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix @@ -2,11 +2,11 @@ , kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { - name = "cifs-utils-${version}"; + pname = "cifs-utils"; version = "6.9"; src = fetchurl { - url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; + url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/conky/default.nix b/nixpkgs/pkgs/os-specific/linux/conky/default.nix index 298f5e30d018..f826ddd423d8 100644 --- a/nixpkgs/pkgs/os-specific/linux/conky/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/conky/default.nix @@ -67,7 +67,7 @@ assert journalSupport -> systemd != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "conky-${version}"; + pname = "conky"; version = "1.11.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix index 755e88b46cbc..20c441ffae2f 100644 --- a/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -3,11 +3,11 @@ , libnetfilter_cthelper, systemd }: stdenv.mkDerivation rec { - name = "conntrack-tools-${version}"; + pname = "conntrack-tools"; version = "1.4.5"; src = fetchurl { - url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix b/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix index d813376da8e5..8ea3e3445cce 100644 --- a/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/consoletools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "linuxconsoletools-${version}"; + pname = "linuxconsoletools"; version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2"; + url = "mirror://sourceforge/linuxconsole/${pname}-${version}.tar.bz2"; sha256 = "0d2r3j916fl2y7pk1y82b9fvbr10dgs1gw7rqwzfpispdidb1mp9"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/crda/default.nix b/nixpkgs/pkgs/os-specific/linux/crda/default.nix index 940913d6a6c8..84c113c648cd 100644 --- a/nixpkgs/pkgs/os-specific/linux/crda/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/crda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }: stdenv.mkDerivation rec { - name = "crda-${version}"; + pname = "crda"; version = "3.18"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/criu/default.nix b/nixpkgs/pkgs/os-specific/linux/criu/default.nix index 0821fbdc15cf..354eea40b24b 100644 --- a/nixpkgs/pkgs/os-specific/linux/criu/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/criu/default.nix @@ -3,11 +3,11 @@ , which, python, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "criu-${version}"; + pname = "criu"; version = "3.12"; src = fetchurl { - url = "https://download.openvz.org/criu/${name}.tar.bz2"; + url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix b/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix index 82b0bb2f3565..5f5005d8b97d 100644 --- a/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix @@ -2,7 +2,7 @@ , dbus, linuxHeaders, systemd }: stdenv.mkDerivation rec { - name = "dbus-broker-${version}"; + pname = "dbus-broker"; version = "21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix b/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix index e8c1e9bfe5e5..5896262ac217 100644 --- a/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/directvnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation rec { - name = "directvnc-${version}"; + pname = "directvnc"; version = "0.7.7.2015-04-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix index 2ea939ccdb09..7ce5535313c2 100644 --- a/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix @@ -10,7 +10,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ]; in stdenv.mkDerivation rec { - name = "displaylink-${version}"; + pname = "displaylink"; version = "4.4.24"; src = requireFile rec { diff --git a/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix b/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix index 534e57354474..1d67b16a4921 100644 --- a/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bash, perl, python }: stdenv.mkDerivation rec { - name = "dmtcp-${version}"; + pname = "dmtcp"; version = "2.5.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix b/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix index 936dbf719a87..f5b7e44a3fbc 100644 --- a/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "dropwatch"; version = "1.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "nhorman"; diff --git a/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix b/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix index 9d92575b6687..23bd39ff3885 100644 --- a/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ebtables/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ebtables-${version}"; + pname = "ebtables"; version = "2.0.10-4"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix b/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix index 744ab80d74f9..ddc8ee64ba00 100644 --- a/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, ncurses }: stdenv.mkDerivation rec { - name = "eventstat-${version}"; + pname = "eventstat"; version = "0.04.07"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/os-specific/linux/extrace/default.nix b/nixpkgs/pkgs/os-specific/linux/extrace/default.nix index 28a92d31eaa2..6aaaaec1b13e 100644 --- a/nixpkgs/pkgs/os-specific/linux/extrace/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/extrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "extrace-${version}"; + pname = "extrace"; version = "0.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix b/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix index 94ea85f433d9..b99f719f8361 100644 --- a/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fatrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3, which }: stdenv.mkDerivation rec { - name = "fatrace-${version}"; + pname = "fatrace"; version = "0.13"; src = fetchurl { - url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 1cc0e7ae4ca7..58cd88b4dce0 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -3,7 +3,8 @@ let version = "5.100.138"; in stdenv.mkDerivation { - name = "b43-firmware-${version}"; + pname = "b43-firmware"; + inherit version; src = fetchurl { url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 2637beb517a3..959c0c74618e 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, b43FirmwareCutter }: stdenv.mkDerivation rec { - name = "b43-firmware-${version}"; + pname = "b43-firmware"; version = "6.30.163.46"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index a57a6f1d70f6..4d5271a9ddfe 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -4,7 +4,7 @@ # this packages as they expect the firmware to be named "BCM.hcd" # see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865 stdenv.mkDerivation rec { - name = "broadcom-bt-firmware-${version}"; + pname = "broadcom-bt-firmware"; version = "12.0.1.1012"; src = fetchurl { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cabextract bt-fw-converter ]; unpackCmd = '' - mkdir -p ${name} - cabextract $src --directory ${name} + mkdir -p ${pname}-${version} + cabextract $src --directory ${pname}-${version} ''; installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index 8927e1a28e7c..9a99881be462 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: stdenv.mkDerivation rec { - name = "bt-fw-converter-${version}"; + pname = "bt-fw-converter"; version = "2017-02-19"; rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl perlPackages.RegexpGrammars bluez ]; unpackCmd = '' - mkdir -p ${name} - cp $src ${name}/bt-fw-converter.pl + mkdir -p ${pname}-${version} + cp $src ${pname}-${version}/bt-fw-converter.pl ''; installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 5f8f6c542521..c9723c944ab1 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -35,7 +35,8 @@ in stdenv.mkDerivation { - name = "facetimehd-firmware-${version}"; + pname = "facetimehd-firmware"; + inherit version; src = fetchurl { url = dmgUrl; sha256 = "0xqkl4yds0n9fdjvnk0v5mj382q02crry6wm2q7j3ncdqwsv02sv"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index c251e3963e7b..380444f02693 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "firmware-linux-nonfree-${version}"; + pname = "firmware-linux-nonfree"; version = "2019-07-17"; src = fetchgit { diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix index 5b14546c90fd..70a0bdbe2406 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -2,7 +2,8 @@ let version = "12"; in stdenv.mkDerivation { - name = "fwupdate-${version}"; + pname = "fwupdate"; + inherit version; src = fetchurl { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index b60ce6f1b4af..421a3300f7b0 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openelec-dvb-firmware-${version}"; + pname = "openelec-dvb-firmware"; version = "0.0.51"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index e64c4c09ebd9..26ed20206359 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "raspberrypi-wireless-firmware-${version}"; + pname = "raspberrypi-wireless-firmware"; version = "2018-08-20"; srcs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 4685f6757179..321ce8ffc06d 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "raspberrypi-tools-${version}"; + pname = "raspberrypi-tools"; version = "2018-10-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix index 0a6364f07df5..0abd458aa8f3 100644 --- a/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/flashbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "flashbench-${version}"; + pname = "flashbench"; version = "2012-06-06"; src = fetchgit { diff --git a/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix b/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix index 1594ddf288a9..db88ff05812e 100644 --- a/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "forkstat-${version}"; + pname = "forkstat"; version = "0.02.11"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/os-specific/linux/freefall/default.nix b/nixpkgs/pkgs/os-specific/linux/freefall/default.nix index a091b2f17c5e..09774016ef26 100644 --- a/nixpkgs/pkgs/os-specific/linux/freefall/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/freefall/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (kernel) version src; - name = "freefall-${version}"; + pname = "freefall"; postPatch = '' cd tools/laptop/freefall diff --git a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index da787d84d79d..35e1972b574b 100644 --- a/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -3,7 +3,7 @@ # Don't use this for anything important yet! buildGoPackage rec { - name = "fscrypt-${version}"; + pname = "fscrypt"; version = "0.2.4"; goPackagePath = "github.com/google/fscrypt"; diff --git a/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix b/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix index 8622dc001a87..ecab0350d789 100644 --- a/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fscryptctl/default.nix @@ -3,7 +3,7 @@ # Don't use this for anything important yet! stdenv.mkDerivation rec { - name = "fscryptctl-unstable-${version}"; + pname = "fscryptctl-unstable"; version = "2017-10-23"; goPackagePath = "github.com/google/fscrypt"; diff --git a/nixpkgs/pkgs/os-specific/linux/ftop/default.nix b/nixpkgs/pkgs/os-specific/linux/ftop/default.nix index 915431c0cb1f..4d283d5dc0c6 100644 --- a/nixpkgs/pkgs/os-specific/linux/ftop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ftop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ftop-${version}"; + pname = "ftop"; version = "1.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${pname}-${version}.tar.bz2"; sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix index f829f1da424e..35c91c5ec071 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix @@ -10,12 +10,13 @@ let isFuse3 = stdenv.lib.hasPrefix "3" version; in stdenv.mkDerivation rec { - name = "fuse-${version}"; + pname = "fuse"; + inherit version; src = fetchFromGitHub { owner = "libfuse"; repo = "libfuse"; - rev = name; + rev = "${pname}-${version}"; sha256 = sha256Hash; }; diff --git a/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index 4531de86b1b3..07252b8bc31f 100644 --- a/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -2,7 +2,7 @@ , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { - name = "fwts-${version}"; + pname = "fwts"; version = "19.07.00"; src = fetchzip { diff --git a/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix b/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix index 9fc052c5ac1b..56fa4f1d7d68 100644 --- a/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/gfxtablet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4"; - name = "gfxtablet-uinput-driver-${version}"; + pname = "gfxtablet-uinput-driver"; buildInputs = [ linuxHeaders diff --git a/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix b/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix index fc308285dd6d..03018c98818c 100644 --- a/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }: stdenv.mkDerivation rec { - name = "google-authenticator-libpam-${version}"; + pname = "google-authenticator-libpam"; version = "1.06"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix b/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix index d56253c6cedd..0325461763a2 100644 --- a/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/gpu-switch/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gpu-switch-unstable-${version}"; + pname = "gpu-switch-unstable"; version = "2017-04-28"; src = fetchFromGitHub { owner = "0xbb"; diff --git a/nixpkgs/pkgs/os-specific/linux/gradm/default.nix b/nixpkgs/pkgs/os-specific/linux/gradm/default.nix index 7f64ed227719..bea70da995bd 100644 --- a/nixpkgs/pkgs/os-specific/linux/gradm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/gradm/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gradm-${version}"; + pname = "gradm"; version = "3.1-201608131257"; src = fetchurl { - url = "http://grsecurity.net/stable/${name}.tar.gz"; + url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz"; sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix b/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix index acafa0376f5c..8e6db2a5774b 100644 --- a/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix @@ -6,7 +6,7 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "2.0.6"; - name = "guvcview-${version}"; + pname = "guvcview"; src = fetchurl { url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix b/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix index 15bdabcc3dc8..d2319fdcf5c7 100644 --- a/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hibernate/default.nix @@ -3,7 +3,8 @@ let version = "2.0"; in stdenv.mkDerivation rec { - name = "hibernate-${version}"; + pname = "hibernate"; + inherit version; src = fetchurl { url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz"; sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh"; diff --git a/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix b/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix index 7629a20473b2..e90470cd5891 100644 --- a/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { - name = "hostapd-${version}"; + pname = "hostapd"; version = "2.8"; src = fetchurl { - url = "https://w1.fi/releases/${name}.tar.gz"; + url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index dfca87e27165..38335682ddb8 100644 --- a/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hwdata-${version}"; + pname = "hwdata"; version = "0.316"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix b/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix index f89747dc200d..36ca1eb16b49 100644 --- a/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -2,7 +2,7 @@ let daemons = stdenv.mkDerivation rec { - name = "hyperv-daemons-bin-${version}"; + pname = "hyperv-daemons-bin"; inherit (kernel) src version; nativeBuildInputs = [ makeWrapper ]; @@ -55,7 +55,7 @@ let ''; in stdenv.mkDerivation rec { - name = "hyperv-daemons-${version}"; + pname = "hyperv-daemons"; inherit (kernel) version; diff --git a/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix index 5b061183356c..1b87619faa32 100644 --- a/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, read-edid }: stdenv.mkDerivation rec { - name = "i2c-tools-${version}"; + pname = "i2c-tools"; version = "4.1"; src = fetchurl { - url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz"; + url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz"; sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/i7z/default.nix b/nixpkgs/pkgs/os-specific/linux/i7z/default.nix index ac5f9fc5ba30..2f792cb7ea74 100644 --- a/nixpkgs/pkgs/os-specific/linux/i7z/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/i7z/default.nix @@ -2,7 +2,7 @@ , withGui ? false, qtbase }: stdenv.mkDerivation rec { - name = "i7z-${version}"; + pname = "i7z"; version = "0.27.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix b/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix index b9390d1d5893..1b22c1eafd3b 100644 --- a/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ifenslave/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ifenslave-${version}"; + pname = "ifenslave"; version = "1.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix index 6de3b19afd7e..69ec6560d83d 100644 --- a/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "ima-evm-utils-${version}"; + pname = "ima-evm-utils"; version = "1.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/os-specific/linux/input-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/input-utils/default.nix index cd0fc01384bc..c6248ee90836 100644 --- a/nixpkgs/pkgs/os-specific/linux/input-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/input-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, linuxHeaders }: stdenv.mkDerivation rec { - name = "input-utils-${version}"; + pname = "input-utils"; version = "1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix b/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix index 38069981723d..1f67208db8b9 100644 --- a/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/intel-ocl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: stdenv.mkDerivation rec { - name = "intel-ocl-${version}"; + pname = "intel-ocl"; version = "5.0-63503"; src = fetchzip { diff --git a/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix b/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix index 932b81438982..7b41b095091d 100644 --- a/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iomelt/default.nix @@ -2,7 +2,8 @@ let version = "0.7"; in stdenv.mkDerivation { - name = "iomelt-${version}"; + pname = "iomelt"; + inherit version; src = fetchurl { url = "http://iomelt.com/s/iomelt-${version}.tar.gz"; sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im"; diff --git a/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix b/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix index a9be26a20262..5a0555f66805 100644 --- a/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iptstate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libnetfilter_conntrack, ncurses }: stdenv.mkDerivation rec { - name = "iptstate-${version}"; + pname = "iptstate"; version = "2.2.6"; src = fetchurl { - url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix b/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix index 67a123a37648..f5d80dc5258c 100644 --- a/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ipvsadm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: stdenv.mkDerivation rec { - name = "ipvsadm-${version}"; + pname = "ipvsadm"; version = "1.30"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/kernel/ipvsadm/${pname}-${version}.tar.xz"; sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix b/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix index e606e3db6ee6..8dc9e2694d47 100644 --- a/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { - name = "irqbalance-${version}"; + pname = "irqbalance"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/kbd/default.nix b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix index a37e65f8cb50..3386a7f92062 100644 --- a/nixpkgs/pkgs/os-specific/linux/kbd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "kbd-${version}"; + pname = "kbd"; version = "2.0.4"; src = fetchurl { - url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix index 32c9f6906806..e6e898118944 100644 --- a/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/nixpkgs/pkgs/os-specific/linux/kbd/keymaps.nix @@ -2,7 +2,7 @@ { dvp = stdenv.mkDerivation rec { - name = "dvp-${version}"; + pname = "dvp"; version = "1.2.1"; src = fetchurl { @@ -19,7 +19,7 @@ }; neo = stdenv.mkDerivation rec { - name = "neo-${version}"; + pname = "neo"; version = "2476"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix b/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix index 44a63c9f1ece..6df3e4fffe70 100644 --- a/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kbdlight/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "kbdlight-${version}"; + pname = "kbdlight"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index b392dc853d35..42230fe31ecd 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -123,6 +123,7 @@ let IPV6_FOU_TUNNEL = whenAtLeast "4.7" module; NET_CLS_BPF = whenAtLeast "4.4" module; NET_ACT_BPF = whenAtLeast "4.4" module; + NET_SCHED = yes; L2TP_V3 = yes; L2TP_IP = module; L2TP_ETH = module; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix index 527811c2b8d6..2c01dcb97312 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix @@ -93,7 +93,8 @@ let configfile = stdenv.mkDerivation { inherit ignoreConfigErrors autoModules preferBuiltin kernelArch; - name = "linux-config-${version}"; + pname = "linux-config"; + inherit version; generateConfig = ./generate-config.pl; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 38078ea67282..a3b77ee8d96c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.140"; + version = "4.14.141"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1wmx7xgm21dk1hvrq14sxh3c4304284sgxr4vngg4pki2ljyspkr"; + sha256 = "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 1e3d14c140d1..fb25fbb7ddcd 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.68"; + version = "4.19.69"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ax04sivi1lsx01m3abi16w6d0jd3qvwzzq2zbn8q2lca505k1wi"; + sha256 = "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix deleted file mode 100644 index ad3b292656e9..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.1.21"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1xj1wfhjz2s5a8j6zx3fsd7rrrkvw5waszzylf2gn3ag6615yjan"; - }; -} // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix index 6f6de115ad0b..bf28ac53df09 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.10"; + version = "5.2.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0jgw7gj71i9kf4prbdi9h791ngxf24nr90302glnsa9aghwc95k0"; + sha256 = "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 5eb050cbdff9..e4a4e40f370c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -4,8 +4,8 @@ # Update this if linux_latest-libre fails to build. # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+' - rev = "16330"; - sha256 = "1d7rsq2m6lp1784cgdg95aspgrnzxm6q9dxqalxja5cac8n6p11y"; + rev = "16604"; + sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51"; } , ... }: diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch b/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch new file mode 100644 index 000000000000..2f1fa6a0daec --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch @@ -0,0 +1,283 @@ +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index dd10cf78f2d3..8f006638452b 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -28,8 +28,8 @@ + #include "trace.h" + #include "nvme.h" + +-#define SQ_SIZE(depth) (depth * sizeof(struct nvme_command)) +-#define CQ_SIZE(depth) (depth * sizeof(struct nvme_completion)) ++#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) ++#define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) + + #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) + +@@ -1344,16 +1344,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) + + static void nvme_free_queue(struct nvme_queue *nvmeq) + { +- dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq->q_depth), ++ dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq), + (void *)nvmeq->cqes, nvmeq->cq_dma_addr); + if (!nvmeq->sq_cmds) + return; + + if (test_and_clear_bit(NVMEQ_SQ_CMB, &nvmeq->flags)) { + pci_free_p2pmem(to_pci_dev(nvmeq->dev->dev), +- nvmeq->sq_cmds, SQ_SIZE(nvmeq->q_depth)); ++ nvmeq->sq_cmds, SQ_SIZE(nvmeq)); + } else { +- dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq->q_depth), ++ dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq), + nvmeq->sq_cmds, nvmeq->sq_dma_addr); + } + } +@@ -1433,12 +1433,12 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, + } + + static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, +- int qid, int depth) ++ int qid) + { + struct pci_dev *pdev = to_pci_dev(dev->dev); + + if (qid && dev->cmb_use_sqes && (dev->cmbsz & NVME_CMBSZ_SQS)) { +- nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(depth)); ++ nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(nvmeq)); + if (nvmeq->sq_cmds) { + nvmeq->sq_dma_addr = pci_p2pmem_virt_to_bus(pdev, + nvmeq->sq_cmds); +@@ -1447,11 +1447,11 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, + return 0; + } + +- pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(depth)); ++ pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(nvmeq)); + } + } + +- nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth), ++ nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(nvmeq), + &nvmeq->sq_dma_addr, GFP_KERNEL); + if (!nvmeq->sq_cmds) + return -ENOMEM; +@@ -1465,12 +1465,13 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) + if (dev->ctrl.queue_count > qid) + return 0; + +- nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(depth), ++ nvmeq->q_depth = depth; ++ nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), + &nvmeq->cq_dma_addr, GFP_KERNEL); + if (!nvmeq->cqes) + goto free_nvmeq; + +- if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth)) ++ if (nvme_alloc_sq_cmds(dev, nvmeq, qid)) + goto free_cqdma; + + nvmeq->dev = dev; +@@ -1479,15 +1480,14 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) + nvmeq->cq_head = 0; + nvmeq->cq_phase = 1; + nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; +- nvmeq->q_depth = depth; + nvmeq->qid = qid; + dev->ctrl.queue_count++; + + return 0; + + free_cqdma: +- dma_free_coherent(dev->dev, CQ_SIZE(depth), (void *)nvmeq->cqes, +- nvmeq->cq_dma_addr); ++ dma_free_coherent(dev->dev, CQ_SIZE(nvmeq), (void *)nvmeq->cqes, ++ nvmeq->cq_dma_addr); + free_nvmeq: + return -ENOMEM; + } +@@ -1515,7 +1515,7 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid) + nvmeq->cq_head = 0; + nvmeq->cq_phase = 1; + nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; +- memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq->q_depth)); ++ memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq)); + nvme_dbbuf_init(dev, nvmeq, qid); + dev->online_queues++; + wmb(); /* ensure the first interrupt sees the initialization */ +diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c +index cc09b81fc7f4..716ebe87a2b8 100644 +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -1986,6 +1986,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap) + ctrl->ctrl_config = NVME_CC_CSS_NVM; + ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT; + ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE; ++ /* Use default IOSQES. We'll update it later if needed */ + ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES; + ctrl->ctrl_config |= NVME_CC_ENABLE; + +@@ -2698,6 +2699,30 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) + ctrl->hmmin = le32_to_cpu(id->hmmin); + ctrl->hmminds = le32_to_cpu(id->hmminds); + ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); ++ ++ /* Grab required IO queue size */ ++ ctrl->iosqes = id->sqes & 0xf; ++ if (ctrl->iosqes < NVME_NVM_IOSQES) { ++ dev_err(ctrl->device, ++ "unsupported required IO queue size %d\n", ctrl->iosqes); ++ ret = -EINVAL; ++ goto out_free; ++ } ++ /* ++ * If our IO queue size isn't the default, update the setting ++ * in CC:IOSQES. ++ */ ++ if (ctrl->iosqes != NVME_NVM_IOSQES) { ++ ctrl->ctrl_config &= ~(0xfu << NVME_CC_IOSQES_SHIFT); ++ ctrl->ctrl_config |= ctrl->iosqes << NVME_CC_IOSQES_SHIFT; ++ ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, ++ ctrl->ctrl_config); ++ if (ret) { ++ dev_err(ctrl->device, ++ "error updating CC register\n"); ++ goto out_free; ++ } ++ } + } + + ret = nvme_mpath_init(ctrl, id); +diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h +index 716a876119c8..34ef35fcd8a5 100644 +--- a/drivers/nvme/host/nvme.h ++++ b/drivers/nvme/host/nvme.h +@@ -244,6 +244,7 @@ struct nvme_ctrl { + u32 hmmin; + u32 hmminds; + u16 hmmaxd; ++ u8 iosqes; + + /* Fabrics only */ + u16 sqsize; +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index 8f006638452b..54b35ea4af88 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -28,7 +28,7 @@ + #include "trace.h" + #include "nvme.h" + +-#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) ++#define SQ_SIZE(q) ((q)->q_depth << (q)->sqes) + #define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) + + #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) +@@ -162,7 +162,7 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl) + struct nvme_queue { + struct nvme_dev *dev; + spinlock_t sq_lock; +- struct nvme_command *sq_cmds; ++ void *sq_cmds; + /* only used for poll queues: */ + spinlock_t cq_poll_lock ____cacheline_aligned_in_smp; + volatile struct nvme_completion *cqes; +@@ -178,6 +178,7 @@ struct nvme_queue { + u16 last_cq_head; + u16 qid; + u8 cq_phase; ++ u8 sqes; + unsigned long flags; + #define NVMEQ_ENABLED 0 + #define NVMEQ_SQ_CMB 1 +@@ -488,7 +489,8 @@ static void nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd, + bool write_sq) + { + spin_lock(&nvmeq->sq_lock); +- memcpy(&nvmeq->sq_cmds[nvmeq->sq_tail], cmd, sizeof(*cmd)); ++ memcpy(nvmeq->sq_cmds + (nvmeq->sq_tail << nvmeq->sqes), ++ cmd, sizeof(*cmd)); + if (++nvmeq->sq_tail == nvmeq->q_depth) + nvmeq->sq_tail = 0; + nvme_write_sq_db(nvmeq, write_sq); +@@ -1465,6 +1467,7 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) + if (dev->ctrl.queue_count > qid) + return 0; + ++ nvmeq->sqes = qid ? dev->ctrl.iosqes : NVME_NVM_ADMSQES; + nvmeq->q_depth = depth; + nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), + &nvmeq->cq_dma_addr, GFP_KERNEL); +diff --git a/include/linux/nvme.h b/include/linux/nvme.h +index 01aa6a6c241d..7af18965fb57 100644 +--- a/include/linux/nvme.h ++++ b/include/linux/nvme.h +@@ -141,6 +141,7 @@ enum { + * (In bytes and specified as a power of two (2^n)). + */ + #define NVME_NVM_IOSQES 6 ++#define NVME_NVM_ADMSQES 6 + #define NVME_NVM_IOCQES 4 + + enum { +diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c +index 716ebe87a2b8..480ea24d8cf4 100644 +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -2701,7 +2701,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) + ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); + + /* Grab required IO queue size */ +- ctrl->iosqes = id->sqes & 0xf; ++ if (ctrl->quirks & NVME_QUIRK_128_BYTES_SQES) ++ ctrl->iosqes = 7; ++ else ++ ctrl->iosqes = id->sqes & 0xf; + if (ctrl->iosqes < NVME_NVM_IOSQES) { + dev_err(ctrl->device, + "unsupported required IO queue size %d\n", ctrl->iosqes); +diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h +index 34ef35fcd8a5..b2a78d08b984 100644 +--- a/drivers/nvme/host/nvme.h ++++ b/drivers/nvme/host/nvme.h +@@ -92,6 +92,16 @@ enum nvme_quirks { + * Broken Write Zeroes. + */ + NVME_QUIRK_DISABLE_WRITE_ZEROES = (1 << 9), ++ ++ /* ++ * Use only one interrupt vector for all queues ++ */ ++ NVME_QUIRK_SINGLE_VECTOR = (1 << 10), ++ ++ /* ++ * Use non-standard 128 bytes SQEs. ++ */ ++ NVME_QUIRK_128_BYTES_SQES = (1 << 11), + }; + + /* +diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c +index 54b35ea4af88..ab2358137419 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -2080,6 +2080,9 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues) + dev->io_queues[HCTX_TYPE_DEFAULT] = 1; + dev->io_queues[HCTX_TYPE_READ] = 0; + ++ if (dev->ctrl.quirks & NVME_QUIRK_SINGLE_VECTOR) ++ irq_queues = 1; ++ + return pci_alloc_irq_vectors_affinity(pdev, 1, irq_queues, + PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd); + } +@@ -3037,6 +3040,9 @@ static const struct pci_device_id nvme_id_table[] = { + { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, + { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, + { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005), ++ .driver_data = NVME_QUIRK_SINGLE_VECTOR | ++ NVME_QUIRK_128_BYTES_SQES }, + { 0, } + }; + MODULE_DEVICE_TABLE(pci, nvme_id_table); diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index e941cd4ea413..edca017b3c70 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -62,4 +62,10 @@ rec { name = "export_kernel_fpu_functions"; patch = ./export_kernel_fpu_functions.patch; }; + + # patches from https://lkml.org/lkml/2019/7/15/1748 + mac_nvme_t2 = rec { + name = "mac_nvme_t2"; + patch = ./mac-nvme-t2.patch; + }; } diff --git a/nixpkgs/pkgs/os-specific/linux/kexectools/default.nix b/nixpkgs/pkgs/os-specific/linux/kexectools/default.nix index 8adb862a265f..326afdfff464 100644 --- a/nixpkgs/pkgs/os-specific/linux/kexectools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kexectools/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "kexec-tools-${version}"; + pname = "kexec-tools"; version = "2.0.19"; src = fetchurl { urls = [ - "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" - "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" + "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz" + "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz" ]; sha256 = "03jyi4c47ywclycf3a253xpqs7p6ys8inz9q66b8m3xc6nrh307d"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix b/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix index 1d9497a7eddf..7d6ee61030c1 100644 --- a/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/keyutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "keyutils-${version}"; + pname = "keyutils"; version = "1.6"; src = fetchurl { - url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/keyutils/${pname}-${version}.tar.bz2"; sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/klibc/default.nix b/nixpkgs/pkgs/os-specific/linux/klibc/default.nix index 8cae61d56a92..8e224c8f33b8 100644 --- a/nixpkgs/pkgs/os-specific/linux/klibc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/klibc/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "klibc-${version}"; + pname = "klibc"; version = "2.0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 266c94fd8c84..55ae78219d18 100644 --- a/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -4,7 +4,8 @@ let version = "22-1.1ubuntu1"; # Zesty in stdenv.mkDerivation { - name = "kmod-blacklist-${version}"; + pname = "kmod-blacklist"; + inherit version; src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; diff --git a/nixpkgs/pkgs/os-specific/linux/ldm/default.nix b/nixpkgs/pkgs/os-specific/linux/ldm/default.nix index 0c333feab1c1..96bb91175dc8 100644 --- a/nixpkgs/pkgs/os-specific/linux/ldm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ldm/default.nix @@ -7,7 +7,8 @@ let git = https://github.com/LemonBoy/ldm.git; in stdenv.mkDerivation rec { - name = "ldm-${version}"; + pname = "ldm"; + inherit version; # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. diff --git a/nixpkgs/pkgs/os-specific/linux/libaio/default.nix b/nixpkgs/pkgs/os-specific/linux/libaio/default.nix index 949c8135df7b..fef7a3236b30 100644 --- a/nixpkgs/pkgs/os-specific/linux/libaio/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libaio/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.110"; - name = "libaio-${version}"; + pname = "libaio"; src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz"; + url = "https://fedorahosted.org/releases/l/i/libaio/${pname}-${version}.tar.gz"; sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index a23c0cb09269..1294bd3d2680 100644 --- a/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -5,7 +5,7 @@ with builtins; stdenv.mkDerivation rec { - name = "libbpf-${version}"; + pname = "libbpf"; version = "0.0.3pre114_${substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix b/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix index 981e928ba659..d0fc97d0dd35 100644 --- a/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix @@ -3,13 +3,13 @@ assert python2 != null || python3 != null -> swig != null; stdenv.mkDerivation rec { - name = "libcap-ng-${version}"; + pname = "libcap-ng"; # When updating make sure to test that the version with # all of the python bindings still works version = "0.7.9"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.gz"; + url = "${meta.homepage}/${pname}-${version}.tar.gz"; sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index 87f354aa75d3..9c730bb96597 100644 --- a/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, attr, perl, pam }: stdenv.mkDerivation rec { - name = "libcap-${version}"; + pname = "libcap"; version = "2.27"; src = fetchurl { - url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz"; + url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; }; @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { postInstall = '' rm "$lib"/lib/*.a - mkdir -p "$doc/share/doc/${name}" - cp License "$doc/share/doc/${name}/" + mkdir -p "$doc/share/doc/${pname}-${version}" + cp License "$doc/share/doc/${pname}-${version}/" '' + stdenv.lib.optionalString (pam != null) '' mkdir -p "$pam/lib/security" mv "$lib"/lib/security "$pam/lib" diff --git a/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix b/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix index 1e920247a754..026b43fc615d 100644 --- a/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { - name = "libcgroup-${version}"; + pname = "libcgroup"; version = "0.41"; src = fetchurl { - url = "mirror://sourceforge/libcg/${name}.tar.bz2"; + url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2"; sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/libnl/default.nix b/nixpkgs/pkgs/os-specific/linux/libnl/default.nix index 34d10d3aa5fb..0789d53b4344 100644 --- a/nixpkgs/pkgs/os-specific/linux/libnl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libnl/default.nix @@ -2,7 +2,7 @@ , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}: stdenv.mkDerivation rec { - name = "libnl-${version}"; + pname = "libnl"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix b/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix index 5dab4b34f466..a09bb2a6ceb4 100644 --- a/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix @@ -2,7 +2,7 @@ , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }: stdenv.mkDerivation rec { - name = "libratbag-${version}"; + pname = "libratbag"; version = "0.9.905"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix b/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix index 51e1a3220941..028c008eccf6 100644 --- a/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix @@ -8,7 +8,7 @@ assert enablePython -> swig != null && python != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "libselinux-${version}"; + pname = "libselinux"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix index 59f5f11d0769..4fe323ee23de 100644 --- a/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libsemanage/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libsemanage-${version}"; + pname = "libsemanage"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix b/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix index f16c241a0a1f..e96ea01cce42 100644 --- a/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex }: stdenv.mkDerivation rec { - name = "libsepol-${version}"; + pname = "libsepol"; version = "2.7"; se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; diff --git a/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix b/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix index 874faf7799b3..d0ae18528534 100644 --- a/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "libsmbios-${version}"; + pname = "libsmbios"; version = "2.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix b/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix index c0c6ad54579c..ecdc658f2f1e 100644 --- a/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { - name = "libudev0-shim-${version}"; + pname = "libudev0-shim"; version = "1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix b/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix index 879e85a0c945..5cccc82b8430 100644 --- a/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libwebcam/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { pname = "libwebcam"; version = "0.2.5"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/os-specific/linux/light/default.nix b/nixpkgs/pkgs/os-specific/linux/light/default.nix index 1856c8861cc4..6a0dd34d021d 100644 --- a/nixpkgs/pkgs/os-specific/linux/light/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/light/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2"; - name = "light-${version}"; + pname = "light"; src = fetchFromGitHub { owner = "haikarainen"; repo = "light"; diff --git a/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix b/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix index 0536ba064a3d..b9e58cb5a4c7 100644 --- a/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix @@ -5,7 +5,7 @@ assert sensord -> rrdtool != null; stdenv.mkDerivation rec { - name = "lm-sensors-${version}"; + pname = "lm-sensors"; version = "3.5.0"; src = fetchzip { diff --git a/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix b/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix index 3c7ceb1270c0..74abd12868d5 100644 --- a/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lockdep-${version}"; + pname = "lockdep"; version = "4.1.2"; fullver = "4.1.2"; diff --git a/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix index c215d9401940..9aa1698b7665 100644 --- a/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -4,7 +4,7 @@ # up-to-date so we simply use that instead of having to maintain our own rules stdenv.mkDerivation rec { - name = "logitech-udev-rules-${version}"; + pname = "logitech-udev-rules"; inherit (solaar) version; buildCommand = '' diff --git a/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix b/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix index 93cab433c9c6..b2d1ca4791a6 100644 --- a/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix @@ -13,7 +13,8 @@ let in stdenv.mkDerivation rec { - name = "lsiutils-${version}"; + pname = "lsiutils"; + inherit version; srcs = [ src "Source/lsiutil.tar.gz" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix index 469096d014d7..9944250bf307 100644 --- a/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "lvm2-${version}"; + pname = "lvm2"; + inherit version; src = fetchgit { url = "git://sourceware.org/git/lvm2.git"; diff --git a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix index 17063851cee2..fff66fe328a5 100644 --- a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-${version}"; + pname = "lxc"; version = "3.2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix b/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix index c335031f2e56..ec76cda97692 100644 --- a/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, texinfo }: stdenv.mkDerivation rec { - name = "macchanger-${version}"; + pname = "macchanger"; version = "1.7.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix b/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix index 9528b9be7f7d..8b62ce76409e 100644 --- a/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mbpfan-${version}"; + pname = "mbpfan"; version = "2.1.1"; src = fetchFromGitHub { owner = "dgraziotin"; diff --git a/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix b/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix index f7f2193eaa09..a58bfc321d3c 100644 --- a/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, utillinux }: stdenv.mkDerivation rec { - name = "mcelog-${version}"; + pname = "mcelog"; version = "164"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/microcode/iucode-tool.nix b/nixpkgs/pkgs/os-specific/linux/microcode/iucode-tool.nix index 485272b1401b..c81a0c9097af 100644 --- a/nixpkgs/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/nixpkgs/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, autoreconfHook }: stdenv.mkDerivation rec { - name = "iucode-tool-${version}"; + pname = "iucode-tool"; version = "2.3.1"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix b/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix index b65486cb2fe1..0edf322cce54 100644 --- a/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix @@ -2,7 +2,7 @@ , glib, readline, pcre, systemd, udev }: stdenv.mkDerivation rec { - name = "miraclecast-${version}"; + pname = "miraclecast"; version = "1.0-20190403"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix index 533cd90a2d3c..a7f0a332bebd 100644 --- a/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "mmc-utils-${version}"; + pname = "mmc-utils"; version = "2018-03-27"; src = fetchgit { diff --git a/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix b/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix index ac083e545fed..766c01eed3fc 100644 --- a/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/molly-guard/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, busybox, systemd }: stdenv.mkDerivation rec { - name = "molly-guard-${version}"; + pname = "molly-guard"; version = "0.6.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix index 128f3eac2635..f7b81bd3915d 100644 --- a/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "msr-tools-${version}"; + pname = "msr-tools"; version = "1.3"; src = fetchurl { - url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip"; + url = "https://01.org/sites/default/files/downloads/msr-tools/${pname}-${version}.zip"; sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix index 078f894f73eb..afe07a5c4dbe 100644 --- a/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { - name = "multipath-tools-${version}"; + pname = "multipath-tools"; version = "0.8.2"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz"; sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix index 42f745b02e30..3cd8f224ce46 100644 --- a/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "net-tools-${version}"; + pname = "net-tools"; version = "1.60_p20170221182432"; src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.xz"; + url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix index 7984e357c82c..3f53c0f58178 100644 --- a/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix @@ -8,12 +8,12 @@ let in stdenv.mkDerivation rec { - name = "nfs-utils-${version}"; - version = "2.3.4"; + pname = "nfs-utils"; + version = "2.4.1"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; - sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq"; + url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; + sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5"; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -47,14 +47,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; - patches = [ - # Fixes build on i686. - (fetchpatch { - name = "sqlite.c-Use-PRIx64-macro-to-print-64-bit-integers.patch"; - url = "http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff_plain;h=a8133e1fd174267536cd459e19cfe0a1cbbe037c;hp=a709f25c1da4a2fb44a1f3fd060298fbbd88aa3c"; - sha256 = "03azkw13xhp8f49777p08xziy0d7crz65qrisjbkzjnx1wczdqy5"; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid"; diff --git a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index 23852559436d..843676b9ccac 100644 --- a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -8,10 +8,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.9.1"; - name = "nftables-${version}"; + pname = "nftables"; src = fetchurl { - url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/nmon/default.nix b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix index 5f425c9685cf..cb6dd4ab946c 100644 --- a/nixpkgs/pkgs/os-specific/linux/nmon/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, ncurses }: stdenv.mkDerivation rec { - name = "nmon-${version}"; + pname = "nmon"; version = "16k"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/numactl/default.nix b/nixpkgs/pkgs/os-specific/linux/numactl/default.nix index 2db2e12bb961..4417ffb569bf 100644 --- a/nixpkgs/pkgs/os-specific/linux/numactl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/numactl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "numactl-${version}"; + pname = "numactl"; version = "2.0.12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 2290a7e80a1e..c41ce5994a1b 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -20,16 +20,16 @@ if ((!lib.versionOlder args.version "391") in rec { # Policy: use the highest stable version as the default (on our master). - stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_430 else legacy_390; + stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_43x else legacy_390; # No active beta right now beta = stable; - stable_430 = generic { - version = "430.40"; - sha256_64bit = "1myzhy1mf27dcx0admm3pbbkfdd9p66lw0cq2mz1nwds92gqj07p"; - settingsSha256 = "0rg9dxg02pnpi0a1yi3a41wn6kmlk0dm6dvfbazyqi4gbzr12qrl"; - persistencedSha256 = "0findlrs5v1m7gl0vxkpd04lh54pib80w5vp4j77qb5snhgvckhq"; + stable_43x = generic { + version = "435.21"; + sha256_64bit = "0v3pq677ab01qdmwl5dawk8hn39qlwj05p8s9qzh9irmrlnc1izs"; + settingsSha256 = "1p13cz79kncwx5067a3d7dbz6a1ibp611zynp1qdxpa65hwp2pxa"; + persistencedSha256 = "0br8znxhz2ryzdj0j4jhqzvdgw9h899q8yz0p9429xz4wxkavgdr"; }; # Last one supporting x86 diff --git a/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix b/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix index bead5f84eac9..4040d70260c5 100644 --- a/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "odp-dpdk-${version}"; + pname = "odp-dpdk"; version = "1.19.0.0_DPDK_17.11"; src = fetchurl { - url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz"; + url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/ofp/default.nix b/nixpkgs/pkgs/os-specific/linux/ofp/default.nix index 93cf33979f4b..70f46519375b 100644 --- a/nixpkgs/pkgs/os-specific/linux/ofp/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ofp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ofp-${version}"; + pname = "ofp"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix b/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix index a2644fcbc3fd..274e960a89b0 100644 --- a/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "open-iscsi-${version}"; + pname = "open-iscsi"; version = "2.0.877"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; diff --git a/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix b/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix index 21d32af3ba83..7b34c1029bae 100644 --- a/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix @@ -1,7 +1,7 @@ { stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "open-isns-${version}"; + pname = "open-isns"; version = "0.99"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix index a2a272f1b3a5..bf26b9e2b28b 100644 --- a/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,10 +8,10 @@ let _kernel = kernel; in stdenv.mkDerivation rec { version = "2.5.4"; - name = "openvswitch-${version}"; + pname = "openvswitch"; src = fetchurl { - url = "http://openvswitch.org/releases/${name}.tar.gz"; + url = "http://openvswitch.org/releases/${pname}-${version}.tar.gz"; sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix b/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix index e1525a951a96..5d7357cb8380 100644 --- a/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pagemon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "pagemon-${version}"; + pname = "pagemon"; version = "0.01.16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/nixpkgs/pkgs/os-specific/linux/pam/default.nix index 1f2a7d3edf27..d1a035d74480 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 }: stdenv.mkDerivation rec { - name = "linux-pam-${version}"; + pname = "linux-pam"; version = "1.3.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix index 10856bb52c9c..a1c91516ce00 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { - name = "pam_pgsql-${version}"; + pname = "pam_pgsql"; version = "0.7.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix index 72846e185ebd..6e9ab379dbcf 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }: stdenv.mkDerivation rec { - name = "pam_u2f-${version}"; + pname = "pam_u2f"; version = "1.0.8"; src = fetchurl { - url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix b/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix index 8fdd2356c30d..754f6bcac333 100644 --- a/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/paxctl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, elf-header }: stdenv.mkDerivation rec { - name = "paxctl-${version}"; + pname = "paxctl"; version = "0.9"; src = fetchurl { - url = "https://pax.grsecurity.net/${name}.tar.gz"; + url = "https://pax.grsecurity.net/${pname}-${version}.tar.gz"; sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix b/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix index c1500e51ac37..e01f84576ced 100644 --- a/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/paxtest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, paxctl }: stdenv.mkDerivation rec { - name = "paxtest-${version}"; + pname = "paxtest"; version = "0.9.15"; src = fetchurl { - url = "https://www.grsecurity.net/~spender/${name}.tar.gz"; + url = "https://www.grsecurity.net/~spender/${pname}-${version}.tar.gz"; sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/nixpkgs/pkgs/os-specific/linux/pcm/default.nix index 6365175290ad..9b9e563f8035 100644 --- a/nixpkgs/pkgs/os-specific/linux/pcm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pcm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "201902"; - name = "pcm-${version}"; + pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; diff --git a/nixpkgs/pkgs/os-specific/linux/pflask/default.nix b/nixpkgs/pkgs/os-specific/linux/pflask/default.nix index 1155a793b014..f3e63133d1e1 100644 --- a/nixpkgs/pkgs/os-specific/linux/pflask/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pflask/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python, wafHook }: stdenv.mkDerivation rec { - name = "pflask-${version}"; + pname = "pflask"; version = "git-2015-12-17"; rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; diff --git a/nixpkgs/pkgs/os-specific/linux/pipework/default.nix b/nixpkgs/pkgs/os-specific/linux/pipework/default.nix index 523f7382a2cf..62aa18fa643e 100644 --- a/nixpkgs/pkgs/os-specific/linux/pipework/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pipework/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pipework-${version}"; + pname = "pipework"; version = "2017-08-22"; src = fetchFromGitHub { owner = "jpetazzo"; diff --git a/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix b/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix index a7bb4a81510d..0d92c7c69098 100644 --- a/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "pktgen-${version}"; + pname = "pktgen"; version = "3.5.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/ply/default.nix b/nixpkgs/pkgs/os-specific/linux/ply/default.nix index 43f184f384dd..24213cd2fb5a 100644 --- a/nixpkgs/pkgs/os-specific/linux/ply/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ply/default.nix @@ -5,7 +5,8 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; let version = "1.0.beta1-9e810b1"; in stdenv.mkDerivation { - name = "ply-${version}"; + pname = "ply"; + inherit version; nativeBuildInputs = [ autoreconfHook flex yacc p7zip ]; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix b/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix index 2092a50041f1..b074c6d72443 100644 --- a/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "plymouth-${version}"; + pname = "plymouth"; version = "0.9.4"; src = fetchurl { - url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/plymouth/releases/${pname}-${version}.tar.xz"; sha256 = "0l8kg7b2vfxgz9gnrn0v2w4jvysj2cirp0nxads5sy05397pl6aa"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/pmount/default.nix b/nixpkgs/pkgs/os-specific/linux/pmount/default.nix index cd0e277b2c6b..0981a0b5a4bd 100644 --- a/nixpkgs/pkgs/os-specific/linux/pmount/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pmount/default.nix @@ -8,7 +8,7 @@ assert stdenv.lib.hasSuffix "/" mediaDir; stdenv.mkDerivation rec { - name = "pmount-${version}"; + pname = "pmount"; version = "0.9.23"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix b/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix index a7cac46ae6a0..fb507d4da485 100644 --- a/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }: stdenv.mkDerivation rec { - name = "policycoreutils-${version}"; + pname = "policycoreutils"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index 1a4919a5d9d4..3daab3917e84 100644 --- a/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { version = "${prl_major}.2.1-41615"; prl_major = "12"; - name = "prl-tools-${version}"; + pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso diff --git a/nixpkgs/pkgs/os-specific/linux/procdump/default.nix b/nixpkgs/pkgs/os-specific/linux/procdump/default.nix index aa7d0ec46043..0185d3022bc2 100644 --- a/nixpkgs/pkgs/os-specific/linux/procdump/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/procdump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }: stdenv.mkDerivation rec { - name = "procdump-${version}"; + pname = "procdump"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix b/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix index 1ed85bc94cb7..1f39a99ea0bf 100644 --- a/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "procps-${version}"; + pname = "procps"; version = "3.3.15"; # The project's releases are on SF, but git repo on gitlab. diff --git a/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix b/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix index 1ef3b71884fd..f8eb8c0a969f 100644 --- a/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pscircle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: stdenv.mkDerivation rec { - name = "pscircle-${version}"; + pname = "pscircle"; version = "1.3.1"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix b/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix index 68e51afdf1bb..413b7d5dcbdf 100644 --- a/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/psmisc/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "psmisc"; version = "23.2"; - name = "${pname}-${version}"; src = fetchFromGitLab { owner = pname; diff --git a/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix b/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix index 36ad73c48d68..c013a0107eab 100644 --- a/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix @@ -2,7 +2,7 @@ , ncurses, libdrm, libpciaccess, libxcb }: stdenv.mkDerivation rec { - name = "radeontop-${version}"; + pname = "radeontop"; version = "2019-06-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index e604f73de2dd..ce0e8707ff57 100644 --- a/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -7,7 +7,8 @@ let version = "25.0"; in stdenv.mkDerivation { - name = "rdma-core-${version}"; + pname = "rdma-core"; + inherit version; src = fetchFromGitHub { owner = "linux-rdma"; diff --git a/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix b/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix index 3e57bbc11bdc..815005ae290e 100644 --- a/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/read-edid/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, cmake, libx86 }: stdenv.mkDerivation rec { - name = "read-edid-${version}"; + pname = "read-edid"; version = "3.0.2"; src = fetchurl { - url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz"; + url = "http://www.polypux.org/projects/read-edid/${pname}-${version}.tar.gz"; sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/regionset/default.nix b/nixpkgs/pkgs/os-specific/linux/regionset/default.nix index ee7325edbe70..3cb964f364d3 100644 --- a/nixpkgs/pkgs/os-specific/linux/regionset/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/regionset/default.nix @@ -2,7 +2,8 @@ let version = "0.2"; in stdenv.mkDerivation { - name = "regionset-${version}"; + pname = "regionset"; + inherit version; src = fetchurl { url = "http://linvdr.org/download/regionset/regionset-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix b/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix index bd25dc65ec85..c078fb18c4ee 100644 --- a/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; - name = "reptyr-${version}"; + pname = "reptyr"; src = fetchFromGitHub { owner = "nelhage"; diff --git a/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix b/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix index 8c7b75a881f4..b1afbfea0de2 100644 --- a/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: stdenv.mkDerivation rec { - name = "rewritefs-${version}"; + pname = "rewritefs"; version = "2017-08-14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix index ecaa4e89d49d..1f5b31d0deb6 100644 --- a/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "roccat-tools-${version}"; + pname = "roccat-tools"; version = "5.9.0"; src = fetchurl { - url = "mirror://sourceforge/roccat/${name}.tar.bz2"; + url = "mirror://sourceforge/roccat/${pname}-${version}.tar.bz2"; sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix b/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix index b29b1f639cf7..447f9127d607 100644 --- a/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -5,7 +5,7 @@ with lib; let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi"; in stdenv.mkDerivation rec { - name = "rtlwifi_new-${version}"; + pname = "rtlwifi_new"; version = "2018-02-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix b/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix index 2c02ef924c3f..316c98000795 100644 --- a/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/schedtool/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "schedtool-${version}"; + pname = "schedtool"; version = "1.3.0"; src = fetchFromGitHub { owner = "freequaos"; repo = "schedtool"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix b/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix index a8d5112c63b9..5517f163b3e0 100644 --- a/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "sdparm-${version}"; + pname = "sdparm"; version = "1.10"; src = fetchurl { - url = "http://sg.danny.cz/sg/p/${name}.tar.xz"; + url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz"; sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix b/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix index 527c94de46b3..b8f80a0124c2 100644 --- a/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/selinux-python/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; with python3.pkgs; stdenv.mkDerivation rec { - name = "selinux-python-${version}"; + pname = "selinux-python"; version = "2.7"; se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; diff --git a/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix b/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix index 71d2ee6e80af..99bbfbe7287a 100644 --- a/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; with python3.pkgs; stdenv.mkDerivation rec { - name = "selinux-sandbox-${version}"; + pname = "selinux-sandbox"; version = "2.7"; se_release = "20170804"; diff --git a/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix index 10ba1a3c7d07..178d102381e0 100644 --- a/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/semodule-utils/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libsepol }: stdenv.mkDerivation rec { - name = "semodule-utils-${version}"; + pname = "semodule-utils"; version = "2.7"; inherit (libsepol) se_release se_url; src = fetchurl { - url = "${se_url}/${se_release}/${name}.tar.gz"; + url = "${se_url}/${se_release}/${pname}-${version}.tar.gz"; sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/sepolgen/default.nix b/nixpkgs/pkgs/os-specific/linux/sepolgen/default.nix index 4067e5f70e27..53250b345e83 100644 --- a/nixpkgs/pkgs/os-specific/linux/sepolgen/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sepolgen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libsepol, python }: stdenv.mkDerivation rec { - name = "sepolgen-${version}"; + pname = "sepolgen"; version = "1.2.2"; inherit (libsepol) se_release se_url; diff --git a/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/nixpkgs/pkgs/os-specific/linux/shadow/default.nix index 6b808f0d6a63..ccc0df59d108 100644 --- a/nixpkgs/pkgs/os-specific/linux/shadow/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/shadow/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { - name = "shadow-${version}"; + pname = "shadow"; version = "4.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/smem/default.nix b/nixpkgs/pkgs/os-specific/linux/smem/default.nix index de12b3719af3..f40652922d85 100644 --- a/nixpkgs/pkgs/os-specific/linux/smem/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/smem/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "smem-${version}"; + pname = "smem"; version = "1.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix b/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix index 10b33b176d21..f2fa48b9efbe 100644 --- a/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "smemstat-${version}"; + pname = "smemstat"; version = "0.02.05"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix b/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix index 449edf481a95..6f2e6306003b 100644 --- a/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/speedometer/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "speedometer-${version}"; + pname = "speedometer"; version = "2.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/sssd/default.nix b/nixpkgs/pkgs/os-specific/linux/sssd/default.nix index 80c5c1f650ba..3dbdb99549a1 100644 --- a/nixpkgs/pkgs/os-specific/linux/sssd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sssd/default.nix @@ -11,11 +11,11 @@ let docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in stdenv.mkDerivation rec { - name = "sssd-${version}"; + pname = "sssd"; version = "1.16.4"; src = fetchurl { - url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; + url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz"; sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix b/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix index c7543aee9337..db362613d374 100644 --- a/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "syscall_limiter-${version}"; + pname = "syscall_limiter"; version = "2017-01-23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index cf1f2f242f47..ce2bd1fa99f3 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sysdig-${version}"; + pname = "sysdig"; version = "0.26.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index b7f1af618feb..45f4d60e4e31 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "242"; - name = "systemd-${version}"; + pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. diff --git a/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix index 5df7bb827aad..309d69ebad5c 100644 --- a/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -4,7 +4,7 @@ let vanillaVersion = "7.6.q"; patchLevel = "26"; in stdenv.mkDerivation rec { - name = "tcp-wrappers-${version}"; + pname = "tcp-wrappers"; version = "${vanillaVersion}-${patchLevel}"; src = fetchurl { diff --git a/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix b/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix index faf47c96a5e6..299ac8ad2203 100644 --- a/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/thunderbolt/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "thunderbolt-${version}"; + pname = "thunderbolt"; version = "0.9.3"; src = fetchFromGitHub { owner = "01org"; diff --git a/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix b/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix index 3c833de8b0c3..47b89f138c52 100644 --- a/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }: stdenv.mkDerivation rec { - name = "tiptop-${version}"; + pname = "tiptop"; version = "2.3.1"; src = fetchurl { - url = "${meta.homepage}/releases/${name}.tar.gz"; + url = "${meta.homepage}/releases/${pname}-${version}.tar.gz"; sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix b/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix index 53b6cbc3401a..dfcf4c9937b1 100644 --- a/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { pname = "tiscamera"; version = "0.9.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "TheImagingSource"; repo = pname; - rev = "v-${name}"; + rev = "v-${pname}-${version}"; sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/tomb/default.nix b/nixpkgs/pkgs/os-specific/linux/tomb/default.nix index 880fd61ec2c6..9fde84060247 100644 --- a/nixpkgs/pkgs/os-specific/linux/tomb/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tomb/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "tomb-${version}"; + pname = "tomb"; version = "2.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix b/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix index b4e584f2979b..bb6d51669e6e 100644 --- a/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -2,7 +2,7 @@ # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { - name = "tpacpi-bat-${version}"; + pname = "tpacpi-bat"; version = "3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix index 3133602b44eb..e6571b46ee05 100644 --- a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: stdenv.mkDerivation rec { - name = "trace-cmd-${version}"; + pname = "trace-cmd"; version = "2.8.3"; src = fetchgit (import ./src.nix); diff --git a/nixpkgs/pkgs/os-specific/linux/untie/default.nix b/nixpkgs/pkgs/os-specific/linux/untie/default.nix index 739bd4471927..d4f83eb8caf6 100644 --- a/nixpkgs/pkgs/os-specific/linux/untie/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/untie/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "untie-${version}"; + pname = "untie"; version = "0.3"; src = fetchurl { - url = "http://guichaz.free.fr/untie/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/untie/files/${pname}-${version}.tar.bz2"; sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix b/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix index 1c5678b81e03..efc7406cc194 100644 --- a/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix @@ -16,12 +16,12 @@ assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { version = "0.7.4"; - name = "usbguard-${version}"; + pname = "usbguard"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { - url = "${repo}/releases/download/${name}/${name}.tar.gz"; + url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix b/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix new file mode 100644 index 000000000000..0ff8fcf0ddf7 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub +, cmake +, libpcap, boost }: + +stdenv.mkDerivation rec { + pname = "usbtop"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "aguinet"; + repo = pname; + rev = "release-${version}"; + sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpcap boost ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/aguinet/usbtop"; + description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices"; + maintainers = with maintainers; [ etu ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index 0962bd911329..b79a2cd342a8 100644 --- a/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -8,10 +8,11 @@ let patchVersion = "2"; in stdenv.mkDerivation rec { - name = "util-linux-${version}"; + pname = "util-linux"; + inherit version; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${pname}-${version}.tar.xz"; sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix b/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix index 1a40ec50c999..19f59d006806 100644 --- a/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.3.0"; - name = "uvcdynctrl-${version}"; + pname = "uvcdynctrl"; src = fetchFromGitHub { owner = "cshorler"; diff --git a/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix index ede9fa682809..9bb6fcdd0a00 100644 --- a/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix @@ -7,11 +7,11 @@ # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) mkDerivation rec { - name = "v4l-utils-${version}"; + pname = "v4l-utils"; version = "1.16.6"; src = fetchurl { - url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/v4l-utils/${pname}-${version}.tar.bz2"; sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index 02e08bec7ad7..570eb4ca4ef3 100644 --- a/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast kernel.version "3.10"; stdenv.mkDerivation rec { - name = "wireguard-${version}"; + pname = "wireguard"; inherit (wireguard-tools) src version; preConfigure = '' diff --git a/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index fa7250f7cee8..69525c92ede9 100644 --- a/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -6,10 +6,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.9"; - name = "wpa_supplicant-${version}"; + pname = "wpa_supplicant"; src = fetchurl { - url = "https://w1.fi/releases/${name}.tar.gz"; + url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/x86info/default.nix b/nixpkgs/pkgs/os-specific/linux/x86info/default.nix index 7911a2172ba0..1c2aaa8ee01d 100644 --- a/nixpkgs/pkgs/os-specific/linux/x86info/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/x86info/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.30"; - name = "x86info-${version}"; + pname = "x86info"; src = fetchurl { - url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz"; + url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz"; sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix b/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix index 5f7bca097bf6..440a797a7232 100644 --- a/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }: stdenv.mkDerivation rec { - name = "xsensors-${version}"; + pname = "xsensors"; version = "0.70"; src = fetchurl { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix b/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix index 3738760bb290..a6c74d029c57 100644 --- a/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cygwin-setup-${version}"; + pname = "cygwin-setup"; version = "20131101"; src = fetchcvs { diff --git a/nixpkgs/pkgs/os-specific/windows/libgnurx/default.nix b/nixpkgs/pkgs/os-specific/windows/libgnurx/default.nix index 88af53dd046e..fedfea15ccb0 100644 --- a/nixpkgs/pkgs/os-specific/windows/libgnurx/default.nix +++ b/nixpkgs/pkgs/os-specific/windows/libgnurx/default.nix @@ -3,9 +3,10 @@ let version = "2.5.1"; in stdenv.mkDerivation rec { - name = "libgnurx-${version}"; + pname = "libgnurx"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz"; + url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz"; sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; }; diff --git a/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix b/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix index a7d4f09b90e9..022aaffe5961 100644 --- a/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix @@ -3,7 +3,8 @@ let version = "5.0.4"; in stdenv.mkDerivation { - name = "mingw-w64-${version}"; + pname = "mingw-w64"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix b/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix index de0f36dac5fa..286f4a0d41fb 100644 --- a/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "pthreads-w32-${version}"; + pname = "pthreads-w32"; version = "2.9.1"; src = fetchzip { diff --git a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index 9538747da6d1..14a0df257471 100644 --- a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/apache-kafka/default.nix b/nixpkgs/pkgs/servers/apache-kafka/default.nix index dca2c0721856..0c1c69982fa1 100644 --- a/nixpkgs/pkgs/servers/apache-kafka/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/asterisk/default.nix b/nixpkgs/pkgs/servers/asterisk/default.nix index 47ef9934a5e8..6e47fce3e486 100644 --- a/nixpkgs/pkgs/servers/asterisk/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix index 2f7a7c80cb68..c9dcba283825 100644 --- a/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - name = "atlassian-confluence-${version}"; - version = "6.15.6"; + pname = "atlassian-confluence"; + version = "6.15.8"; src = fetchurl { - url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; - sha256 = "0bb404d5i8jdry1jw8qdrcpgp9lvdkyxry58331pwpw16mlh0r2m"; + url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; + sha256 = "17pcgjv6rj2jxzmwx82941zhrrmprkchjhnnadnxq4709zsyb4q3"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/servers/atlassian/crowd.nix b/nixpkgs/pkgs/servers/atlassian/crowd.nix index 1d0e28ac9f28..81b90091e669 100644 --- a/nixpkgs/pkgs/servers/atlassian/crowd.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix index 3a05c2d8d610..2b7117f419f5 100644 --- a/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "atlassian-jira-${version}"; + pname = "atlassian-jira"; version = "8.3.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/beanstalkd/default.nix b/nixpkgs/pkgs/servers/beanstalkd/default.nix index 528dc8a48a0b..58ebbf88f78a 100644 --- a/nixpkgs/pkgs/servers/beanstalkd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/bird/default.nix b/nixpkgs/pkgs/servers/bird/default.nix index e54394a9a7d5..d4b4441408e7 100644 --- a/nixpkgs/pkgs/servers/bird/default.nix +++ b/nixpkgs/pkgs/servers/bird/default.nix @@ -6,11 +6,12 @@ let generic = { version, sha256, enableIPv6 ? false }: stdenv.mkDerivation rec { - name = "bird-${version}"; + pname = "bird"; + inherit version; src = fetchurl { inherit sha256; - url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; + url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ flex bison ]; diff --git a/nixpkgs/pkgs/servers/brickd/default.nix b/nixpkgs/pkgs/servers/brickd/default.nix index 4b71aaeca3ad..e21ad5723b01 100644 --- a/nixpkgs/pkgs/servers/brickd/default.nix +++ b/nixpkgs/pkgs/servers/brickd/default.nix @@ -12,7 +12,8 @@ daemonlib = fetchgit { in stdenv.mkDerivation rec { - name = "brickd-${version}"; + pname = "brickd"; + inherit version; src = fetchgit { url = "git://github.com/Tinkerforge/brickd.git"; diff --git a/nixpkgs/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix index 61316d0a60a1..675f1beb891d 100644 --- a/nixpkgs/pkgs/servers/caddy/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/cayley/default.nix b/nixpkgs/pkgs/servers/cayley/default.nix index befa36edd9e2..c9a39b691e7c 100644 --- a/nixpkgs/pkgs/servers/cayley/default.nix +++ b/nixpkgs/pkgs/servers/cayley/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cayley-${version}"; - version = "0.6.1"; + pname = "cayley"; + version = "0.7.5"; goPackagePath = "github.com/cayleygraph/cayley"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cayleygraph"; repo = "cayley"; rev = "v${version}"; - sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry"; + sha256 = "1zfxa9z6spi6xw028mvbc7c3g517gn82g77ywr6picl47fr2blnd"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/servers/cayley/deps.nix b/nixpkgs/pkgs/servers/cayley/deps.nix index 1e6fadf9f4d8..eb3dce827bd3 100644 --- a/nixpkgs/pkgs/servers/cayley/deps.nix +++ b/nixpkgs/pkgs/servers/cayley/deps.nix @@ -1,272 +1,471 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/badgerodon/peg"; + goPackagePath = "github.com/badgerodon/peg"; fetch = { type = "git"; url = "https://github.com/badgerodon/peg"; - rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; + rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11"; }; } { - goPackagePath = "github.com/boltdb/bolt"; + goPackagePath = "github.com/boltdb/bolt"; fetch = { type = "git"; url = "https://github.com/boltdb/bolt"; - rev = "a705895fdad108f053eae7ee011ed94a0541ee13"; - sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r"; + rev = "e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd"; + sha256 = "1sjxzz88bw0y37mk3xvwb9j5v7bz3r80rwg79jml6liqk1arnl99"; }; } { - goPackagePath = "github.com/cznic/mathutil"; + goPackagePath = "github.com/cznic/mathutil"; fetch = { type = "git"; url = "https://github.com/cznic/mathutil"; - rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd"; - sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75"; + rev = "1447ad269d64ca91aa8d7079baa40b6fc8b965e7"; + sha256 = "1r9c20k2h65g38yxf3vd46nbayx1cz5w4q4yr1xfggcs0mmrb87i"; }; } { - goPackagePath = "github.com/davecgh/go-spew"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "2df174808ee097f90d259e432cc04442cf60be21"; - sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; }; } { - goPackagePath = "github.com/dlclark/regexp2"; + goPackagePath = "github.com/dennwc/graphql"; + fetch = { + type = "git"; + url = "https://github.com/dennwc/graphql"; + rev = "12cfed44bc5de083875506a36d30f9798f9bca47"; + sha256 = "1rfsxjjsik5618y2741lcyw56a4d4l6r04sbj1igrvcck9bz0k6a"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; fetch = { type = "git"; url = "https://github.com/dlclark/regexp2"; - rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5"; - sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz"; + rev = "902a5ce7a7812e2ba9f73b9d96c09d5136df39cd"; + sha256 = "0ypmdayq50ilbmqa1wjq5nvs9igbxkzlc8phlknw244935wz3v15"; }; } { - goPackagePath = "github.com/dop251/goja"; + goPackagePath = "github.com/dop251/goja"; fetch = { type = "git"; url = "https://github.com/dop251/goja"; - rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca"; - sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h"; + rev = "ef8c030e3c96c5054c2f10ef925e7041e0583c07"; + sha256 = "15419apwdpbl0lgnl9xj9wyl05vpiz6jqgj8zbcyxhzy0wycj445"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; + sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; + }; + } + { + goPackagePath = "github.com/go-kivik/couchdb"; + fetch = { + type = "git"; + url = "https://github.com/go-kivik/couchdb"; + rev = "74d231fe43245e77840213724894264f0f61ffd3"; + sha256 = "0ga6d6y44wg8ync73wcyc7q7r3sr5vdj5qkn3yqn9yn4p0k2w89i"; + }; + } + { + goPackagePath = "github.com/go-kivik/kivik"; + fetch = { + type = "git"; + url = "https://github.com/go-kivik/kivik"; + rev = "2a1f6b9dd407886bc59c0c28faed28fbce3b0ece"; + sha256 = "0fpa62mriyiyl5dh5kg8858bqrwiwscpbkg9np69lk302znxalij"; }; } { - goPackagePath = "github.com/gogo/protobuf"; + goPackagePath = "github.com/go-kivik/pouchdb"; + fetch = { + type = "git"; + url = "https://github.com/go-kivik/pouchdb"; + rev = "bbd1ab79be17c809842e193b1f84e924b6b599ba"; + sha256 = "15kv6i94j73c8zzy5hnmf051d3i65wxc07hvass9lc4g5ad7f9vf"; + }; + } + { + goPackagePath = "github.com/go-sourcemap/sourcemap"; + fetch = { + type = "git"; + url = "https://github.com/go-sourcemap/sourcemap"; + rev = "b019cc30c1eaa584753491b0d8f8c1534bf1eb44"; + sha256 = "03k44fdrnknba05f7cd58lq4rzk7jdpiqksmc0wxrdzwschrbgw8"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "147bd02c2c516cf9a8878cb75898ee8a9eea0228"; + sha256 = "0s75nilz1jx0vgc69jgmys95lsq9j9nfdjcc8inc8mhzh3qpjb74"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61"; - sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1"; + rev = "30433562cfbf487fe1df7cd26c7bab168d2f14d0"; + sha256 = "155iv0jqgh0d8cykghw3ifwk8pjyyq1w4gr9khhf78n01k6180hj"; }; } { - goPackagePath = "github.com/golang/glog"; + goPackagePath = "github.com/golang/glog"; fetch = { type = "git"; url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "888eb0692c857ec880338addf316bd662d5e630e"; - sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0"; + rev = "18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8"; + sha256 = "0fbf8ymrcb23imkhlrlyq6i0x5w8gxzilljjsgd4hnvjgpgp3r4v"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "553a641470496b2327abcac10b36396bd98e45c9"; + sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "558a9132744c22476178edf3126fd35a9754f565"; + sha256 = "13mn0li83amgm4fgsm6l3shs2r4kjddr10xn0ydnr9ymg1y887vi"; + }; + } + { + goPackagePath = "github.com/gopherjs/jsbuiltin"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/jsbuiltin"; + rev = "67703bfb044e3192fbcab025c3aeaeedafad1f2f"; + sha256 = "1k0df0z9fiyzbr1g1736zdp238j9z82q3gwkk060h2n84rg4c7lh"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "7fa7fff964d035e8a162cce3a164b3ad02ad651b"; + sha256 = "0p3dyhpc0ajakcww3a45n750z2030xqhlswzf51d5rzid27681wp"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "0d4b488675fdec1dde48751b05ab530cf0b630e1"; + sha256 = "071rram7aib70f3gk4ansgwns82w9i6m1px8mgc8x4rs9ana4qhf"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; + goPackagePath = "github.com/jackc/pgx"; fetch = { type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "ad28ea4487f05916463e2423a55166280e8254b5"; - sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm"; + url = "https://github.com/jackc/pgx"; + rev = "606697ffdfe6603013560dbc171656de57b4f542"; + sha256 = "0818yb2vjjwwmscdab7wnxbyiabvy544icdczdlr5kswbqq5h25m"; }; } { - goPackagePath = "github.com/julienschmidt/httprouter"; + goPackagePath = "github.com/julienschmidt/httprouter"; fetch = { type = "git"; url = "https://github.com/julienschmidt/httprouter"; - rev = "b59a38004596b696aca7aa2adccfa68760864d86"; - sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac"; + rev = "6f3f3919c8781ce5c0509c83fffc887a7830c938"; + sha256 = "1hmqdpv2zywwglmnjnxfn27mkac81n3nqs1wandlpybsww4vn4kx"; }; } { - goPackagePath = "github.com/lib/pq"; + goPackagePath = "github.com/lib/pq"; fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "0dad96c0b94f8dee039aa40467f767467392a0af"; - sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4"; + rev = "2704adc878c21e1329f46f6e56a1c387d788ff94"; + sha256 = "160fmvi7bczxw3i3h5s821hv029ph5ld8x3c36b4cz2sr30wp110"; }; } { - goPackagePath = "github.com/linkeddata/gojsonld"; + goPackagePath = "github.com/linkeddata/gojsonld"; fetch = { type = "git"; url = "https://github.com/linkeddata/gojsonld"; - rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31"; - sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i"; + rev = "4f5db6791326b8962ede4edbba693edcf20fd1ad"; + sha256 = "11g1kygkn55whaf49q2bzxk0w8b3nhdhiaixsj2ik65j8bl9g2cq"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; + sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; + sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; }; } { - goPackagePath = "github.com/pborman/uuid"; + goPackagePath = "github.com/pborman/uuid"; fetch = { type = "git"; url = "https://github.com/pborman/uuid"; - rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; - sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + rev = "1b00554d822231195d1babd97ff4a781231955c9"; + sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan"; + }; + } + { + goPackagePath = "github.com/pelletier/go-buffruneio"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-buffruneio"; + rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; + sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; }; } { - goPackagePath = "github.com/peterh/liner"; + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3"; + sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; fetch = { type = "git"; url = "https://github.com/peterh/liner"; - rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced"; - sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48"; + rev = "88609521dc4b6c858fd4c98b628147da928ce4ac"; + sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k"; }; } { - goPackagePath = "github.com/pmezard/go-difflib"; + goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; - sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + url = "https://github.com/pkg/errors"; + rev = "e881fd58d78e04cf6d0de1217f8707c8cc2249bc"; + sha256 = "0vfhj598jp6dzy4pbyjdrqxzb5kppw8ggvfh78g80nz11r34xnzs"; }; } { - goPackagePath = "github.com/robertkrimen/otto"; + goPackagePath = "github.com/pmezard/go-difflib"; fetch = { type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d"; - sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/russross/blackfriday"; fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb"; - sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s"; + rev = "b253417e1cb644d645a0a3bb1fa5034c8030127c"; + sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20"; }; } { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d"; - sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v"; + rev = "79c90efaf01eddc01945af5bc1797859189b830b"; + sha256 = "1dj8v91gv1ssw2j88gjzr1hw0n63qqxykjzfbvspyi529xn3ji3y"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; + sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; }; } { - goPackagePath = "github.com/sirupsen/logrus"; + goPackagePath = "github.com/spf13/cast"; fetch = { type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab"; - sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl"; + url = "https://github.com/spf13/cast"; + rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; + sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7b1b6e8dc027253d45fc029bc269d1c019f83a34"; + sha256 = "1nhnlpmbqq1ggix7jaxmzr8awk1zrrzag4vzq1p5q5l25d6kih35"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66"; + sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "f1d95a35e132e8a1868023a08932b14f0b8b8fcb"; + sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2"; + sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18"; - sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g"; + rev = "87b1dfb5b2fa649f52695dd9eae19abe404a4308"; + sha256 = "1iyfxs3nxdn1fyfqv3gggxcxab66a3m6cmjkhqhcapxm3qvgbrlc"; }; } { - goPackagePath = "github.com/syndtr/goleveldb"; + goPackagePath = "github.com/syndtr/goleveldb"; fetch = { type = "git"; url = "https://github.com/syndtr/goleveldb"; - rev = "4875955338b0a434238a31165cb87255ab6e9e4a"; - sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i"; + rev = "b89cc31ef7977104127d34c1bd31ebd1a9db2199"; + sha256 = "0pbmssaw7fsgspv0jr3hsd1208qqxcvy4faks9hypqgl5gwday4p"; }; } { - goPackagePath = "github.com/syndtr/gosnappy"; + goPackagePath = "github.com/tylertreat/BoomFilters"; fetch = { type = "git"; - url = "https://github.com/syndtr/gosnappy"; - rev = "156a073208e131d7d2e212cb749feae7c339e846"; - sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z"; + url = "https://github.com/tylertreat/BoomFilters"; + rev = "37e169ae37ed529d93ecacb509c0dc80078478fc"; + sha256 = "15wwdsxxvkgxbxv3v0ywnwjwndpmps49n3a49z7bzjl7r2nsm7qv"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "6a513affb38dc9788b449d59ffed099b8de18fa0"; - sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"; + rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344"; + sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; - sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; + rev = "9ccfe848b9db8435a24c424abbc07a921adf1df5"; + sha256 = "0wn3p7nrf9lx5svnya5mxy5b8cxqs2rp8lxc477szna313m1jhs4"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "golang.org/x/text"; fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c"; - sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s"; + rev = "470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4"; + sha256 = "1yzh1qxwd0xkh0k04hwp7yii21i26b4ngxvm1g98qlji1g2wbjbc"; }; } { - goPackagePath = "google.golang.org/appengine"; + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05"; - sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj"; + rev = "170382fa85b10b94728989dfcf6cc818b335c952"; + sha256 = "0dqx24qc7h53p16xnkwn2jpk3wjjlvv48akqk74vx31pr2nn0g56"; }; } { - goPackagePath = "gopkg.in/mgo.v2"; + goPackagePath = "gopkg.in/mgo.v2"; fetch = { type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; - sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + url = "https://github.com/go-mgo/mgo"; + rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; + sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; }; } { - goPackagePath = "github.com/go-sql-driver/mysql"; + goPackagePath = "gopkg.in/olivere/elastic.v5"; fetch = { type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; - sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; + url = "https://github.com/olivere/elastic"; + rev = "79ff368708b3a2a9da641dc831d95fd0782bf4ef"; + sha256 = "1lq8nhjnkf246nl5h40ldh1qz2yx73yaqfmsh9ddvkwn4173c7jj"; }; } { - goPackagePath = "github.com/dennwc/graphql"; + goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; - url = "https://github.com/dennwc/graphql"; - rev = "fd5c4aa13f2119414084f229600de0d73f174436"; - sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs"; + url = "https://github.com/go-yaml/yaml"; + rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; + sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; }; } -] +] \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/clickhouse/default.nix b/nixpkgs/pkgs/servers/clickhouse/default.nix index 8530d8cb068e..e48dec7d20c8 100644 --- a/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/cloud-print-connector/default.nix b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix index 21a5bad72fc8..bf8623f0a893 100644 --- a/nixpkgs/pkgs/servers/cloud-print-connector/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 1b3e5466ec39..c448e4936f64 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "slurm-${version}"; + pname = "slurm"; version = "19.05.2.1"; # 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 = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; sha256 = "1k19z0qyjr6nwqxv93wbnnhy498788rc4fl9zyf0smc5yq1zbjir"; }; diff --git a/nixpkgs/pkgs/servers/confluent-platform/default.nix b/nixpkgs/pkgs/servers/confluent-platform/default.nix index 84985b8f0eb3..93794ce7052e 100644 --- a/nixpkgs/pkgs/servers/confluent-platform/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/consul/default.nix b/nixpkgs/pkgs/servers/consul/default.nix index d364c2a5bcdf..b7c2e01e97a2 100644 --- a/nixpkgs/pkgs/servers/consul/default.nix +++ b/nixpkgs/pkgs/servers/consul/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-${version}"; - version = "1.5.2"; + pname = "consul"; + version = "1.6.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -17,9 +17,9 @@ buildGoPackage rec { # to apply your changes as patches on top of a release commit. src = fetchFromGitHub { owner = "hashicorp"; - repo = "consul"; + repo = pname; inherit rev; - sha256 = "1fn9xxdszil4zdal08cyq6gbs2larpr4zmjmv2w2ykiacbfhpa6h"; + sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52"; }; preBuild = '' diff --git a/nixpkgs/pkgs/servers/coturn/default.nix b/nixpkgs/pkgs/servers/coturn/default.nix index ad15db070f41..e1d02d2f9d74 100644 --- a/nixpkgs/pkgs/servers/coturn/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/couchpotato/default.nix b/nixpkgs/pkgs/servers/couchpotato/default.nix index 8b2895392bec..a528cd2ca26e 100644 --- a/nixpkgs/pkgs/servers/couchpotato/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dante/default.nix b/nixpkgs/pkgs/servers/dante/default.nix index 1c093facde5c..24e607f4b00c 100644 --- a/nixpkgs/pkgs/servers/dante/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dgraph/default.nix b/nixpkgs/pkgs/servers/dgraph/default.nix index 5056df06e598..489f2e297bb4 100644 --- a/nixpkgs/pkgs/servers/dgraph/default.nix +++ b/nixpkgs/pkgs/servers/dgraph/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dgraph-${version}"; - version = "0.8.2"; + pname = "dgraph"; + version = "1.0.17"; goPackagePath = "github.com/dgraph-io/dgraph"; @@ -10,32 +10,26 @@ buildGoPackage rec { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "0zc5bda8m2srjbk0gy1nnm0bya8if0kmk1szqr1qv3xifdzmi4nf"; + sha256 = "05z1xwbd76q49zyqahh9krvq78dgkzr22qc6srr4djds0l7y6x5i"; }; - extraOutputsToInstall = [ "dashboard" ]; + # see licensing + buildFlags = [ "-tags oss" ]; goDeps = ./deps.nix; - subPackages = [ "cmd/dgraph" "cmd/dgraphloader" "cmd/bulkloader"]; - - # let's move the dashboard to a different output, to prevent $bin from - # depending on $out - # TODO: provide a proper npm application for the dashboard. - postPatch = '' - mv dashboard/* $dashboard - ''; + subPackages = [ "dgraph"]; preBuild = '' export buildFlagsArray="-ldflags=\ - -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version} \ - -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/" + -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version}" ''; meta = { homepage = "https://dgraph.io/"; description = "Fast, Distributed Graph DB"; maintainers = with stdenv.lib.maintainers; [ sigma ]; - license = stdenv.lib.licenses.agpl3; + # Apache 2.0 because we use only build tag "oss" + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/servers/dgraph/deps.nix b/nixpkgs/pkgs/servers/dgraph/deps.nix index 89e00e0d8cb3..602233d635e6 100644 --- a/nixpkgs/pkgs/servers/dgraph/deps.nix +++ b/nixpkgs/pkgs/servers/dgraph/deps.nix @@ -1,11 +1,47 @@ [ { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.34.0"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/exporter/jaeger"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-exporter-jaeger"; + rev = "v0.1.0"; + sha256 = "0dhf0fhjfk8m6zx7xys5mj51c8gxvlahi4y5fx8l7b7b56bh1rmy"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/exporter/prometheus"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-exporter-prometheus"; + rev = "6bf73eaafbe9"; + sha256 = "1509l1xcgp662j7rglmrs35innpbi2s0r14vj9ps6d55j42kifm0"; + }; + } + { goPackagePath = "github.com/AndreasBriese/bbloom"; fetch = { type = "git"; url = "https://github.com/AndreasBriese/bbloom"; - rev = "28f7e881ca57bc00e028f9ede9f0d9104cfeef5e"; - sha256 = "03cqhqvdz8c9by5w5ls4kwnnwlm6b2kkslc6m120fanw1lgamfzp"; + rev = "e2d15f34fcf9"; + sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { @@ -13,44 +49,53 @@ fetch = { type = "git"; url = "https://github.com/MakeNowJust/heredoc"; - rev = "1d91351acdc1cb2f2c995864674b754134b86ca7"; + rev = "1d91351acdc1"; sha256 = "0ia1r8ibqmx6zv3wmsvgkpqlhwk79z9l38nzp4gd4f1kcb46856x"; }; } { - goPackagePath = "github.com/beorn7/perks"; + goPackagePath = "github.com/apache/thrift"; fetch = { type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + url = "https://github.com/apache/thrift"; + rev = "v0.12.0"; + sha256 = "0g2g61rs189nimg3631wxfwdx12dsdz70qvncczlyvn34pcj7yby"; }; } { - goPackagePath = "github.com/bkaradzic/go-lz4"; + goPackagePath = "github.com/armon/consul-api"; fetch = { type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"; - sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; }; } { - goPackagePath = "github.com/blevesearch/bleve"; + goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; - url = "https://github.com/blevesearch/bleve"; - rev = "a7ebb8480579777c6cd1c4750d2e6b5ff2b49bdd"; - sha256 = "121jhd158slf4050kmghz25jrvv7gbsan31wr0nxyw9z32lyf6yx"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; }; } { - goPackagePath = "github.com/blevesearch/blevex"; + goPackagePath = "github.com/bgentry/speakeasy"; fetch = { type = "git"; - url = "https://github.com/blevesearch/blevex"; - rev = "507dcd576550f9f3260f11495ba2de4e96773a3e"; - sha256 = "0i9azysvia99fjpx525qnc5rcgv45hfvl3zcs58gvgqyxpzpc78z"; + url = "https://github.com/bgentry/speakeasy"; + rev = "v0.1.0"; + sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; + }; + } + { + goPackagePath = "github.com/blevesearch/bleve"; + fetch = { + type = "git"; + url = "https://github.com/blevesearch/bleve"; + rev = "e1f5e6cdcd76"; + sha256 = "1b2iip9vz71lqvjmj8v21sisk0z2gdsjd5v9750v3q4a3ik3x8m2"; }; } { @@ -58,7 +103,7 @@ fetch = { type = "git"; url = "https://github.com/blevesearch/go-porterstemmer"; - rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e"; + rev = "v1.0.2"; sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d"; }; } @@ -67,17 +112,26 @@ fetch = { type = "git"; url = "https://github.com/blevesearch/segment"; - rev = "762005e7a34fd909a84586299f1dd457371d36ee"; + rev = "762005e7a34f"; sha256 = "1nrm145sm0xlhqy3d12yipnb16ikjz9ykjcskmkgm7vjm47xkmfl"; }; } { - goPackagePath = "github.com/cockroachdb/cmux"; + goPackagePath = "github.com/blevesearch/snowballstem"; + fetch = { + type = "git"; + url = "https://github.com/blevesearch/snowballstem"; + rev = "26b06a2c243d"; + sha256 = "096wgbpb7qyx055451gam3zb26acaiazjmd58av7ykslmb7wa5gm"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; fetch = { type = "git"; - url = "https://github.com/cockroachdb/cmux"; - rev = "30d10be492927e2dcae0089c374c455d42414fcb"; - sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; }; } { @@ -85,7 +139,7 @@ fetch = { type = "git"; url = "https://github.com/codahale/hdrhistogram"; - rev = "3a0bb77429bd3a61596f5e8a3172445844342120"; + rev = "3a0bb77429bd"; sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; }; } @@ -94,8 +148,53 @@ fetch = { type = "git"; url = "https://github.com/coreos/etcd"; - rev = "9d43462d174c664f5edf313dec0de31e1ef4ed47"; - sha256 = "0qxqjxhhciaacag1jz2rlncmlgw861ig2yx993ylvfm30jvyj2cj"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "39ca1b05acc7"; + sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "3ac0863d7acf"; + sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.10"; + sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; }; } { @@ -103,8 +202,8 @@ fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"; - sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } { @@ -112,8 +211,26 @@ fetch = { type = "git"; url = "https://github.com/dgraph-io/badger"; - rev = "64df7f57d9ee20d7b28de4a3eea90bf8d7310a77"; - sha256 = "1ikgzn2l62kb238n0wm6s95py5ypv71p09w7zyvzkjf34x675mzz"; + rev = "v1.6.0"; + sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5"; + }; + } + { + goPackagePath = "github.com/dgraph-io/dgo"; + fetch = { + type = "git"; + url = "https://github.com/dgraph-io/dgo"; + rev = "f8969c1ddf8f"; + sha256 = "08ycdpxry15r9vgaqrqxcdbw8z216asqarhxq76smi5a82mr56qa"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; }; } { @@ -121,8 +238,71 @@ fetch = { type = "git"; url = "https://github.com/dgryski/go-farm"; - rev = "d1e51a4af19092715f4ce7d8257fe5bc8f8be727"; - sha256 = "00iijjzdg8g6jbzhdbfw8s2rf0k25gxw4x7h7r6mkxcq18n69182"; + rev = "6a90982ecee2"; + sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "25d852aebe32"; + sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.39.0"; + sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; }; } { @@ -130,8 +310,8 @@ fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "e57a569e1882958f6b188cb42231d6db87701f2a"; - sha256 = "0r3jpmp6wp4xyrh1ikr8iqld3rg4r1yhv99zxw5zd7d2zprw9yfc"; + rev = "v1.2.0"; + sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; }; } { @@ -139,17 +319,53 @@ fetch = { type = "git"; url = "https://github.com/golang/geo"; - rev = "31fb0106dc4a947e5aaee1fe186e56447f839510"; + rev = "31fb0106dc4a"; sha256 = "00w4kwm98hrgr3ggfdk1h7qa5gp00z4s0j0iwgwd9rgadb59kb2c"; }; } { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "02826c3e7903"; + sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + { goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef"; - sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "e89373fe6b4a"; + sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj"; }; } { @@ -157,26 +373,305 @@ fetch = { type = "git"; url = "https://github.com/google/codesearch"; - rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; + rev = "v1.0.0"; sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; }; } { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.0.0"; + sha256 = "1922bjrnx66692dm0rrc1ckmznsaqx920ww4jzsds3xzrwf15mqv"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "4201258b820c"; + sha256 = "1kpdg3m46kp15ixl9ahhchhadyiblz0qpcxzylp8jhffc1rnxjb7"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; + rev = "f849b5445de4"; + sha256 = "0hscypgj0nd1407jp6y4qrnrr0mrhc4wgxz9b3mj1cs3pkvi61vc"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "v1.2.0"; + sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "v1.4.1"; + sha256 = "0lqpwwyhgw12iw2pfynb8wb06dqfj26rr55sh1v02nvrxbpzfp0a"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.0"; + sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "v0.1.0"; + sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.0.0"; + sha256 = "1c8xbp4d4fbmvml70nc7w3jii2fxv4q0141d2zmzi480d5h8xvrv"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.2"; + sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; + }; + } + { goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { type = "git"; url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + rev = "v1.0.1"; sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } { + goPackagePath = "github.com/minio/minio-go"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio-go"; + rev = "774475480ffe"; + sha256 = "1rnzvij1cnqb3brwpyv79bdbaa1sgygyw1x84376fli2pj0n3572"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "a0225b3f23b5"; + sha256 = "0bp9r6xzy6d3p7l2hjmvr25y3rp3p8c9xv1agkllkksm45ng6681"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.7.0"; + sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + }; + } + { + goPackagePath = "github.com/paulmach/go.geojson"; + fetch = { + type = "git"; + url = "https://github.com/paulmach/go.geojson"; + rev = "40612a87147b"; + sha256 = "037j7apv0jljhvn6vk85nhy0ql862nxr5zbmi6a30qdfclrf2q4k"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "17b591df37844cde689f4d5813e5cea0927d8dd2"; - sha256 = "1f400f1682h1wdjknlh1ad95rbss09g0ia36a8w102bf2f1qfq8l"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -184,7 +679,7 @@ fetch = { type = "git"; url = "https://github.com/pkg/profile"; - rev = "5b67d428864e92711fcbd2f8629456121a56d91f"; + rev = "v1.2.1"; sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; }; } @@ -193,7 +688,7 @@ fetch = { type = "git"; url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + rev = "v1.0.0"; sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } @@ -202,8 +697,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "310ce84375bb84c5cbbf0d05069c92daa5673740"; - sha256 = "11awb5bjkwqj7va3v7fgniwqkjqhmhjkp01rdvnv4xfp1laxwn7v"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; }; } { @@ -211,8 +706,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; - sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; }; } { @@ -220,8 +715,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "0866df4b85a18d652b6965be022d007cdf076822"; - sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp"; + rev = "v0.6.0"; + sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; }; } { @@ -229,8 +724,98 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; - sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/soheilhy/cmux"; + fetch = { + type = "git"; + url = "https://github.com/soheilhy/cmux"; + rev = "v0.1.4"; + sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.5"; + sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.2"; + sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; }; } { @@ -238,17 +823,17 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "976c720a22c8eb4eb6a0b4348ad85ad12491a506"; - sha256 = "0a2gxvqzacrj9k8h022zhr8fchhn9afc6a511m07j71dzw9g4y3m"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { - goPackagePath = "github.com/tebeka/snowball"; + goPackagePath = "github.com/tmc/grpc-websocket-proxy"; fetch = { type = "git"; - url = "https://github.com/tebeka/snowball"; - rev = "6b06bd306c4e4442a63e546752278920ae487934"; - sha256 = "110akijkb55k5h7m6mra8fircvi4sxd5xq7lcjgyiqj96srq8v2k"; + url = "https://github.com/tmc/grpc-websocket-proxy"; + rev = "89b8d40f7ca8"; + sha256 = "1bg6m0cycy5sww175zkbnhi9lvzb08iicc8xka8klrgaa9mc5nsk"; }; } { @@ -256,17 +841,134 @@ fetch = { type = "git"; url = "https://github.com/twpayne/go-geom"; - rev = "6753ad11e46b04e21b3f286b342e73a8c4be8216"; + rev = "6753ad11e46b"; sha256 = "0qyrdnp7j7lmj0qb0p7k45m757zvbwn78s1apiy46zfnb5415df1"; }; } { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "e444a5086c43"; + sha256 = "1ri318sf41fdzhj186dg96pixvlhmk1255ymccc9zfayy3z6li3h"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/willf/bitset"; + fetch = { + type = "git"; + url = "https://github.com/willf/bitset"; + rev = "71fa2377963f"; + sha256 = "092lpf2qm3zyvm35inam4b7y3kjpvpx7ylkgn31x6wbxfbamp37a"; + }; + } + { + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "43a291ad63a2"; + sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "go.etcd.io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "v1.3.2"; + sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; + }; + } + { + goPackagePath = "go.etcd.io/etcd"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/etcd"; + rev = "a943ad0ee4c9"; + sha256 = "1p0s383qw7rdcg2zs5ysk70dkjhpyyqn2qgqgbxdvrv5cjgna1hm"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.21.0"; + sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "v1.1.0"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "v1.9.1"; + sha256 = "19a1i6fipqj8w7h6qjmg1sfbg18yzzqsgfn0vmr55hkgc0y6nmny"; + }; + } + { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "22ddb68eccda408bbf17759ac18d3120ce0d4f3f"; - sha256 = "07ks6qal02iz24vv54qyb90wmsg9vwqc14abf68rakprpy26qwsg"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "509febef88a4"; + sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "5614ed5bae6f"; + sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx"; }; } { @@ -274,8 +976,26 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d1e1b351919c6738fdeb9893d5c998b161464f0c"; - sha256 = "0qzbfah03z992zyygfp7imjjas5np2gcar5aanx5y3av5g68ggjp"; + rev = "da137c7871d7"; + sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "e64efc72b421"; + sha256 = "0djvwz2avx7knsjbl434vw1wqbrg53xp1kh599gfixn5icrggz4m"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "e225da77a7e6"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; }; } { @@ -283,8 +1003,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "abf9c25f54453410d0c6668e519582a9e1115027"; - sha256 = "0dmpqjfif2zg6776d366js60k21g81jvsr3jm9dc7fv7w3282al4"; + rev = "04f50cda93cb"; + sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw"; }; } { @@ -292,8 +1012,44 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a"; - sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "fbb02b2291d2"; + sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "e65039ee4138"; + sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "v0.3.2"; + sha256 = "1x1nbsd3gjgmv833gpgq79m5d15p31k1dfn8gglkvjanjiin747j"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; }; } { @@ -301,8 +1057,8 @@ fetch = { type = "git"; url = "https://github.com/google/go-genproto"; - rev = "1e559d0a00eef8a9a43151db4665280bd8dd5886"; - sha256 = "1dfm8zd9mif1aswks79wgyi7n818s5brbdnnrrlg79whfhaf20hd"; + rev = "5fe7a883aa19"; + sha256 = "0qjkwig0r42q0j2qv57s4ahsgmmp41dz3ih3rnaqg0619n5w7lbs"; }; } { @@ -310,8 +1066,71 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3"; - sha256 = "1li8rn2s4f8qc77npamlm2ijin44scb8vvd8c4cr0l7za2m89jfn"; + rev = "v1.19.0"; + sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v"; + }; + } + { + goPackagePath = "gopkg.in/airbrake/gobrake.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/airbrake/gobrake.v2"; + rev = "v2.0.9"; + sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/cheggaaa/pb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/cheggaaa/pb.v1"; + rev = "v1.0.25"; + sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + rev = "v2.1.2"; + sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; }; } { @@ -319,8 +1138,17 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; - sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "c2f93a96b099"; + sha256 = "07lg29aiap80ca9f201jzng9vjr168cv3qmvjmbd7v5pmww9kmr8"; }; } ] diff --git a/nixpkgs/pkgs/servers/dict/default.nix b/nixpkgs/pkgs/servers/dict/default.nix index d41057510802..af8dc2f35234 100644 --- a/nixpkgs/pkgs/servers/dict/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix b/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix index 13e4757fe89e..b7dbf04026d2 100644 --- a/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix b/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix index 8a1bb6313ad2..2c97101d9cbb 100644 --- a/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dict/libmaa.nix b/nixpkgs/pkgs/servers/dict/libmaa.nix index f5c0cf230af3..d9f831c862fb 100644 --- a/nixpkgs/pkgs/servers/dict/libmaa.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/diod/default.nix b/nixpkgs/pkgs/servers/diod/default.nix index aefa3af83363..cf81d9b4b9af 100644 --- a/nixpkgs/pkgs/servers/diod/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix index 0b40b99cfc16..af914ae6cd72 100644 --- a/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -11,10 +11,11 @@ assert enablePython -> python3 != null; let version = "9.14.4"; in stdenv.mkDerivation rec { - name = "bind-${version}"; + pname = "bind"; + inherit version; src = fetchurl { - url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii"; }; diff --git a/nixpkgs/pkgs/servers/dns/coredns/default.nix b/nixpkgs/pkgs/servers/dns/coredns/default.nix index 214c3e91f0ef..def78223f127 100644 --- a/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dns/dnsdist/default.nix b/nixpkgs/pkgs/servers/dns/dnsdist/default.nix index 6757542050af..cb004a596d22 100644 --- a/nixpkgs/pkgs/servers/dns/dnsdist/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 718028b2bc0c..8191bf5acbf1 100644 --- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 1d8896bfc10f..22b1f2a67e2c 100644 --- a/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index fcddd569b361..0a584ce1acaa 100644 --- a/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/dns/powerdns/default.nix b/nixpkgs/pkgs/servers/dns/powerdns/default.nix index 3c63b6d8eb75..76c346180cdb 100644 --- a/nixpkgs/pkgs/servers/dns/powerdns/default.nix +++ b/nixpkgs/pkgs/servers/dns/powerdns/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "powerdns-${version}"; + pname = "powerdns"; version = "4.1.13"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/documize-community/default.nix b/nixpkgs/pkgs/servers/documize-community/default.nix index f6ac19245182..317783e4f8ff 100644 --- a/nixpkgs/pkgs/servers/documize-community/default.nix +++ b/nixpkgs/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1w57akmc3kb8rzgrjv5d4rjfr6vvam1wjs8792265ggnx6xhpgg9"; + sha256 = "13r0x1mbprhk19a1cikq8cl553xdrxin9arw90am69iv6rcps3w3"; }; goPackagePath = "github.com/documize/community"; diff --git a/nixpkgs/pkgs/servers/echoip/default.nix b/nixpkgs/pkgs/servers/echoip/default.nix index e71abb8bc00f..0a0b6c0e1d1a 100644 --- a/nixpkgs/pkgs/servers/echoip/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix b/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix index d52fdd14301d..5293b18368e7 100644 --- a/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/etcd/default.nix b/nixpkgs/pkgs/servers/etcd/default.nix index d3c5555fa6ad..5a693fd75291 100644 --- a/nixpkgs/pkgs/servers/etcd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/exhibitor/default.nix b/nixpkgs/pkgs/servers/exhibitor/default.nix index 5e2381ada1d1..1e05c856ab5e 100644 --- a/nixpkgs/pkgs/servers/exhibitor/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/nixpkgs/pkgs/servers/fcgiwrap/default.nix index 8bab12116b02..c8ddcf438f7b 100644 --- a/nixpkgs/pkgs/servers/fcgiwrap/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/felix/default.nix b/nixpkgs/pkgs/servers/felix/default.nix index 5ce680e36460..7be7416d04d5 100644 --- a/nixpkgs/pkgs/servers/felix/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/felix/remoteshell.nix b/nixpkgs/pkgs/servers/felix/remoteshell.nix index 3ac3c98718f7..2fe628db0466 100644 --- a/nixpkgs/pkgs/servers/felix/remoteshell.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/firebird/default.nix b/nixpkgs/pkgs/servers/firebird/default.nix index caf7d8360f07..31de59259161 100644 --- a/nixpkgs/pkgs/servers/firebird/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix index 87e4a22b0514..e8a1a633e4db 100644 --- a/nixpkgs/pkgs/servers/foundationdb/cmake.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/foundationdb/vsmake.nix b/nixpkgs/pkgs/servers/foundationdb/vsmake.nix index 0eb71492be3e..34b9f6ecaf0d 100644 --- a/nixpkgs/pkgs/servers/foundationdb/vsmake.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/freeradius/default.nix b/nixpkgs/pkgs/servers/freeradius/default.nix index ed36b33bdebc..6c6eb2b0c091 100644 --- a/nixpkgs/pkgs/servers/freeradius/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/gnatsd/default.nix b/nixpkgs/pkgs/servers/gnatsd/default.nix index e8e08271b3bc..1bb2ebc4f868 100644 --- a/nixpkgs/pkgs/servers/gnatsd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/gopher/gofish/default.nix b/nixpkgs/pkgs/servers/gopher/gofish/default.nix index 754cba588258..1bec32e5125b 100644 --- a/nixpkgs/pkgs/servers/gopher/gofish/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/gotty/default.nix b/nixpkgs/pkgs/servers/gotty/default.nix index ebade244bdf7..da24b0a0e26e 100644 --- a/nixpkgs/pkgs/servers/gotty/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/h2/default.nix b/nixpkgs/pkgs/servers/h2/default.nix index c4be1f3c3b34..ff127e705e50 100644 --- a/nixpkgs/pkgs/servers/h2/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/hbase/default.nix b/nixpkgs/pkgs/servers/hbase/default.nix index 6a33ac638d21..3d05933f5130 100644 --- a/nixpkgs/pkgs/servers/hbase/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/hitch/default.nix b/nixpkgs/pkgs/servers/hitch/default.nix index 58033edb07d7..7bc2da8b0239 100644 --- a/nixpkgs/pkgs/servers/hitch/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix index 5f8884cbd3b7..5d4d88e1cda8 100644 --- a/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix +++ b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix @@ -58,6 +58,10 @@ in python.pkgs.buildPythonApplication rec { # no tests implemented doCheck = false; + postPatch = '' + substituteInPlace setup.py --replace "pyyaml==5.1" "pyyaml" + ''; + meta = with lib; { description = "Sandboxed python execution environment for writing automation apps for Home Assistant"; homepage = https://github.com/home-assistant/appdaemon; diff --git a/nixpkgs/pkgs/servers/http/4store/default.nix b/nixpkgs/pkgs/servers/http/4store/default.nix index 664953ca34dc..6e4be4a36fea 100644 --- a/nixpkgs/pkgs/servers/http/4store/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 3c3d4c20df1b..4ffbb0100167 100644 --- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 8a773631ee6c..6bad43a62f0a 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index ff767d9ad437..a6f4f9926710 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "mod_fastcgi-${version}"; + pname = "mod_fastcgi"; + inherit version; src = fetchurl { url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index a0fa4b4bca96..0e17cc40efe3 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, apacheHttpd, python, ncurses }: stdenv.mkDerivation rec { - name = "mod_wsgi-${version}"; + pname = "mod_wsgi"; version = "4.6.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index aa826a9c528b..65ec2510d342 100644 --- a/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix b/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix index b3c4abfed906..a9d806f9de84 100644 --- a/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix +++ b/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix @@ -2,14 +2,14 @@ , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { - name = "couchdb-${version}"; + pname = "couchdb"; version = "2.3.1"; # 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 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3"; }; diff --git a/nixpkgs/pkgs/servers/http/couchdb/default.nix b/nixpkgs/pkgs/servers/http/couchdb/default.nix index 2299f732a76e..f2e5e67dd7ac 100644 --- a/nixpkgs/pkgs/servers/http/couchdb/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/darkhttpd/default.nix b/nixpkgs/pkgs/servers/http/darkhttpd/default.nix index 3efc97f6296b..42de9904f90a 100644 --- a/nixpkgs/pkgs/servers/http/darkhttpd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/gatling/default.nix b/nixpkgs/pkgs/servers/http/gatling/default.nix index 19b2d01f5be8..395504e49703 100644 --- a/nixpkgs/pkgs/servers/http/gatling/default.nix +++ b/nixpkgs/pkgs/servers/http/gatling/default.nix @@ -4,10 +4,11 @@ let version = "0.15"; in stdenv.mkDerivation rec { - name = "gatling-${version}"; + pname = "gatling"; + inherit version; src = fetchurl { - url = "https://www.fefe.de/gatling/${name}.tar.xz"; + url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz"; sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg"; }; diff --git a/nixpkgs/pkgs/servers/http/h2o/default.nix b/nixpkgs/pkgs/servers/http/h2o/default.nix index afa48eeafc2e..26c320499e55 100644 --- a/nixpkgs/pkgs/servers/http/h2o/default.nix +++ b/nixpkgs/pkgs/servers/http/h2o/default.nix @@ -6,7 +6,7 @@ with builtins; stdenv.mkDerivation rec { - name = "h2o-${version}"; + pname = "h2o"; version = "2.2.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/http/hiawatha/default.nix b/nixpkgs/pkgs/servers/http/hiawatha/default.nix index 742db5567075..a3bcb64e6c05 100644 --- a/nixpkgs/pkgs/servers/http/hiawatha/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/jetty/default.nix b/nixpkgs/pkgs/servers/http/jetty/default.nix index 80a3d6b105cb..5ce44322e92f 100644 --- a/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/lwan/default.nix b/nixpkgs/pkgs/servers/http/lwan/default.nix index 878211ebf024..f692832e882b 100644 --- a/nixpkgs/pkgs/servers/http/lwan/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/myserver/default.nix b/nixpkgs/pkgs/servers/http/myserver/default.nix index b18e1ea162f0..3c29ddb8e0a6 100644 --- a/nixpkgs/pkgs/servers/http/myserver/default.nix +++ b/nixpkgs/pkgs/servers/http/myserver/default.nix @@ -4,10 +4,11 @@ let version = "0.11"; in stdenv.mkDerivation rec { - name = "myserver-${version}"; + pname = "myserver"; + inherit version; src = fetchurl { - url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; + url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz"; sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; }; diff --git a/nixpkgs/pkgs/servers/http/nginx/generic.nix b/nixpkgs/pkgs/servers/http/nginx/generic.nix index d670e1592c27..e74d2f84d627 100644 --- a/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "nginx-${version}"; + pname = "nginx"; + inherit version; src = fetchurl { url = "https://nginx.org/download/nginx-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix b/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix index 479c9e41aa91..bef7f43ea71f 100644 --- a/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/openresty/default.nix b/nixpkgs/pkgs/servers/http/openresty/default.nix index 6bb4ce46a43b..3990c5de8185 100644 --- a/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/pshs/default.nix b/nixpkgs/pkgs/servers/http/pshs/default.nix index c38ca046a35b..19d0b9a2641c 100644 --- a/nixpkgs/pkgs/servers/http/pshs/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix b/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix index b5d5d5f7992d..d118e8af66d4 100644 --- a/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/tengine/default.nix b/nixpkgs/pkgs/servers/http/tengine/default.nix index cac31ed9d595..a7ea61de0420 100644 --- a/nixpkgs/pkgs/servers/http/tengine/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/thttpd/default.nix b/nixpkgs/pkgs/servers/http/thttpd/default.nix index 6e012c98737e..b72439bc37a2 100644 --- a/nixpkgs/pkgs/servers/http/thttpd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix b/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix index 5da89200816f..59a4ab6e5b49 100644 --- a/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/tomcat/default.nix b/nixpkgs/pkgs/servers/http/tomcat/default.nix index fded6bdfafba..38b4974e1554 100644 --- a/nixpkgs/pkgs/servers/http/tomcat/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index f802024ea876..0c0f118d0b91 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.10.0"; - name = "unit-${version}"; + pname = "unit"; src = fetchFromGitHub { owner = "nginx"; diff --git a/nixpkgs/pkgs/servers/http/webfs/default.nix b/nixpkgs/pkgs/servers/http/webfs/default.nix index 3fb3890f9c4e..79c7d9e9eca1 100644 --- a/nixpkgs/pkgs/servers/http/webfs/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/webhook/default.nix b/nixpkgs/pkgs/servers/http/webhook/default.nix index 5d6b47d28b5d..707b48786483 100644 --- a/nixpkgs/pkgs/servers/http/webhook/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/http/yaws/default.nix b/nixpkgs/pkgs/servers/http/yaws/default.nix index 827f6122b573..109f7bc06dcd 100644 --- a/nixpkgs/pkgs/servers/http/yaws/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/hydron/default.nix b/nixpkgs/pkgs/servers/hydron/default.nix index 912e520180e6..075226f36078 100644 --- a/nixpkgs/pkgs/servers/hydron/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/icingaweb2/default.nix b/nixpkgs/pkgs/servers/icingaweb2/default.nix index 280df5f00d2a..9cdfd8d2b338 100644 --- a/nixpkgs/pkgs/servers/icingaweb2/default.nix +++ b/nixpkgs/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.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix b/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix index fdad63d67af4..8171f61c112d 100644 --- a/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/identd/oidentd/default.nix b/nixpkgs/pkgs/servers/identd/oidentd/default.nix index e60a1f54f424..85d1186f525a 100644 --- a/nixpkgs/pkgs/servers/identd/oidentd/default.nix +++ b/nixpkgs/pkgs/servers/identd/oidentd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "oidentd-${version}"; + pname = "oidentd"; version = "2.4.0"; 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 = "132bzlbjp437lrlxv5k9aqa1q9w5pghk02rnazg33cw6av00q2li"; }; diff --git a/nixpkgs/pkgs/servers/interlock/default.nix b/nixpkgs/pkgs/servers/interlock/default.nix index f57c94cd1084..9823a36d7545 100644 --- a/nixpkgs/pkgs/servers/interlock/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/irker/default.nix b/nixpkgs/pkgs/servers/irker/default.nix index 002760ff0fd3..e7d6d9ac52a5 100644 --- a/nixpkgs/pkgs/servers/irker/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix index 8369cdce4d53..0299c0281480 100644 --- a/nixpkgs/pkgs/servers/jackett/default.nix +++ b/nixpkgs/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.589"; 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/nixpkgs/pkgs/servers/jetbrains/youtrack.nix b/nixpkgs/pkgs/servers/jetbrains/youtrack.nix index bbf39e5be466..2f8241e7b09d 100644 --- a/nixpkgs/pkgs/servers/jetbrains/youtrack.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/kippo/default.nix b/nixpkgs/pkgs/servers/kippo/default.nix index 3ebcaf7286b4..bec8ccbbf18d 100644 --- a/nixpkgs/pkgs/servers/kippo/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/kwakd/default.nix b/nixpkgs/pkgs/servers/kwakd/default.nix index 7c7755dee482..4eb0b26c3066 100644 --- a/nixpkgs/pkgs/servers/kwakd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/lidarr/default.nix b/nixpkgs/pkgs/servers/lidarr/default.nix index fc88d645f27a..43ddc5f7b0f4 100644 --- a/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/livepeer/default.nix b/nixpkgs/pkgs/servers/livepeer/default.nix index 2e17001abc50..798bda8e306e 100644 --- a/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix index 080cbc897756..5a318c311af8 100644 --- a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index dce0b9174092..b7d791f34166 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/nixpkgs/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.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/nixpkgs/pkgs/servers/mail/mailhog/default.nix index 019c84d2898b..429d735ffcd0 100644 --- a/nixpkgs/pkgs/servers/mail/mailhog/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch b/nixpkgs/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch deleted file mode 100644 index b8a5476c0559..000000000000 --- a/nixpkgs/pkgs/servers/mail/mailman/0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 47469af384a6d4a0877c76d3c52013b40ab61f04 Mon Sep 17 00:00:00 2001 -From: Peter Simons <simons@cryp.to> -Date: Mon, 26 Aug 2019 16:10:04 +0200 -Subject: [PATCH] Find external tools via $PATH rather than hard-coding - /usr/bin. - ---- - src/mailman/config/mhonarc.cfg | 2 +- - src/mailman/config/postfix.cfg | 2 +- - src/mailman/config/schema.cfg | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mailman/config/mhonarc.cfg b/src/mailman/config/mhonarc.cfg -index b00f93aea..096e9521b 100644 ---- a/src/mailman/config/mhonarc.cfg -+++ b/src/mailman/config/mhonarc.cfg -@@ -24,4 +24,4 @@ base_url: http://$hostname/archives/$fqdn_listname - - # If the archiver works by calling a command on the local machine, this is the - # command to call. --command: /usr/bin/mhonarc -outdir /path/to/archive/$listname -add -+command: mhonarc -outdir /path/to/archive/$listname -add -diff --git a/src/mailman/config/postfix.cfg b/src/mailman/config/postfix.cfg -index cddda220a..934c9a977 100644 ---- a/src/mailman/config/postfix.cfg -+++ b/src/mailman/config/postfix.cfg -@@ -5,7 +5,7 @@ - # db file, from the associated plain text files. The file being updated will - # be appended to this string (with a separating space), so it must be - # appropriate for os.system(). --postmap_command: /usr/sbin/postmap -+postmap_command: postmap - - # This variable describes the type of transport maps that will be generated by - # mailman to be used with postfix for LMTP transport. By default, it is set to -diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg -index fa06ccced..406999e13 100644 ---- a/src/mailman/config/schema.cfg -+++ b/src/mailman/config/schema.cfg -@@ -65,7 +65,7 @@ filtered_messages_are_preservable: no - # where the substitution variable $filename is filled in by Mailman, and - # contains the path to the temporary file that the command should read from. - # The command should print the converted text to stdout. --html_to_plain_text_command: /usr/bin/lynx -dump $filename -+html_to_plain_text_command: lynx -dump $filename - - # Specify what characters are allowed in list names. Characters outside of - # the class [-_.+=!$*{}~0-9a-z] matched case insensitively are never allowed, --- -2.22.0 - diff --git a/nixpkgs/pkgs/servers/mail/mailman/core.nix b/nixpkgs/pkgs/servers/mail/mailman/core.nix index fcd594270db4..1ba220039ea9 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/core.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/core.nix @@ -1,15 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources -, zope_component +, zope_component, lynx, postfix }: buildPythonPackage rec { pname = "mailman"; version = "3.2.2"; - patches = [ ./0001-Find-external-tools-via-PATH-rather-than-hard-coding.patch ]; - src = fetchPypi { inherit pname version; sha256 = "09s9p5pb8gff6zblwidyq830yfgcvv50p5drdaxj1qpy8w46lvc6"; @@ -21,6 +19,13 @@ buildPythonPackage rec { zope_component ]; + patchPhase = '' + substituteInPlace src/mailman/config/postfix.cfg \ + --replace /usr/sbin/postmap ${postfix}/bin/postmap + substituteInPlace src/mailman/config/schema.cfg \ + --replace /usr/bin/lynx ${lynx}/bin/lynx + ''; + # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping # them in shell code breaks this assumption. The proper way to use mailman is # to create a specialized python interpreter: diff --git a/nixpkgs/pkgs/servers/mail/mailman/default.nix b/nixpkgs/pkgs/servers/mail/mailman/default.nix new file mode 100644 index 000000000000..e9f66b92be29 --- /dev/null +++ b/nixpkgs/pkgs/servers/mail/mailman/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, python2 }: + +stdenv.mkDerivation rec { + pname = "mailman"; + version = "2.1.29"; + + src = fetchurl { + url = "mirror://gnu/mailman/${pname}-${version}.tgz"; + sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243"; + }; + + buildInputs = [ python2 python2.pkgs.dnspython ]; + + patches = [ ./fix-var-prefix.patch ]; + + configureFlags = [ + "--without-permcheck" + "--with-cgi-ext=.cgi" + "--with-var-prefix=/var/lib/mailman" + ]; + + installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. + + makeFlags = [ "DIRSETGID=:" ]; + + meta = { + homepage = https://www.gnu.org/software/mailman/; + description = "Free software for managing electronic mail discussion and e-newsletter lists"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.peti ]; + }; +} diff --git a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix new file mode 100644 index 000000000000..8f060da34461 --- /dev/null +++ b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, mock +, robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 +, django-haystack, lockfile, networkx, dateutil, defusedxml +, django-paintstore, djangorestframework, django, django-q +, django_compressor, beautifulsoup4, six, psycopg2, whoosh +}: + +buildPythonPackage rec { + pname = "HyperKitty"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z2zswlml6nppxhzw9a4nrj7i5wsxd29s3q78ka1rwr5m5n7s1rz"; + }; + + buildInputs = [ coverage mock ]; + propagatedBuildInputs = [ + robot-detection django_extensions rjsmin cssmin django-mailman3 + django-haystack lockfile networkx dateutil defusedxml + django-paintstore djangorestframework django django-q + django_compressor beautifulsoup4 six psycopg2 whoosh + ]; + + checkPhase = '' + cd $NIX_BUILD_TOP/$sourceRoot + PYTHONPATH=.:$PYTHONPATH python example_project/manage.py test \ + --settings=hyperkitty.tests.settings_test hyperkitty + ''; + + meta = { + homepage = "http://www.gnu.org/software/mailman/"; + description = "Archiver for GNU Mailman v3"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ peti globin ]; + }; +} diff --git a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix index 98b270ad7d41..2c1c07e502a7 100644 --- a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/nullmailer/default.nix b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix index 4b753bdf0cdb..7738c4eb3d4a 100644 --- a/nixpkgs/pkgs/servers/mail/nullmailer/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index 2e1b3a4f7980..fdc2b3fd2c42 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "opensmtpd-${version}"; + pname = "opensmtpd"; version = "6.4.2p1"; 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 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd"; }; diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix index 1d4ad63c37d2..71b27facbab6 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix index a4b0b921adb2..39845f12f03c 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix index 8c00bcdbee25..890cd1880535 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix @@ -22,7 +22,8 @@ let in stdenv.mkDerivation { - name = "pfixtools-${version}"; + pname = "pfixtools"; + inherit version; src = pfixtoolsSrc; diff --git a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix index f13c57e3b35d..49854927e57f 100644 --- a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix index d5e410a86c1f..5da94ca80269 100644 --- a/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mail/rmilter/default.nix b/nixpkgs/pkgs/servers/mail/rmilter/default.nix new file mode 100644 index 000000000000..9d7730e399f3 --- /dev/null +++ b/nixpkgs/pkgs/servers/mail/rmilter/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre +, libmilter, opendkim, libmemcached, glib }: + +let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { + patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ]; +}); +in + +stdenv.mkDerivation rec { + pname = "rmilter"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "vstakhov"; + repo = "rmilter"; + rev = version; + sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh"; + }; + + nativeBuildInputs = [ bison cmake flex pkgconfig ]; + buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/vstakhov/rmilter; + license = licenses.asl20; + description = '' + Daemon to integrate rspamd and milter compatible MTA, for example + postfix or sendmail + ''; + maintainers = with maintainers; [ avnik fpletz ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix index 67a647b236b4..2b3986c412d0 100644 --- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/matterbridge/default.nix b/nixpkgs/pkgs/servers/matterbridge/default.nix index 9e5a9ffe780d..673d3f1f21bb 100644 --- a/nixpkgs/pkgs/servers/matterbridge/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mattermost/default.nix b/nixpkgs/pkgs/servers/mattermost/default.nix index 2fc8232f0a28..2919647e5734 100644 --- a/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/nixpkgs/pkgs/servers/mattermost/default.nix @@ -4,7 +4,8 @@ let version = "5.9.0"; mattermost-server = buildGoPackage rec { - name = "mattermost-server-${version}"; + pname = "mattermost-server"; + inherit version; src = fetchFromGitHub { owner = "mattermost"; @@ -23,7 +24,8 @@ let }; mattermost-webapp = stdenv.mkDerivation { - name = "mattermost-webapp-${version}"; + pname = "mattermost-webapp"; + inherit version; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; diff --git a/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/nixpkgs/pkgs/servers/mattermost/matterircd.nix index 6707055eaa6b..bb6d1584a670 100644 --- a/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index 824f8ea20259..3d79d8421dd2 100644 --- a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mediatomb/default.nix b/nixpkgs/pkgs/servers/mediatomb/default.nix index 33b7674cf9e5..33151c4063b3 100644 --- a/nixpkgs/pkgs/servers/mediatomb/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/meguca/default.nix b/nixpkgs/pkgs/servers/meguca/default.nix index 06e9f3fc961f..326fae6bcf7a 100644 --- a/nixpkgs/pkgs/servers/meguca/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/memcached/default.nix b/nixpkgs/pkgs/servers/memcached/default.nix index f30b5af6cad5..a9873261d78e 100644 --- a/nixpkgs/pkgs/servers/memcached/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mesos-dns/default.nix b/nixpkgs/pkgs/servers/mesos-dns/default.nix index fe1f1c6760d8..8430f2d61e8e 100644 --- a/nixpkgs/pkgs/servers/mesos-dns/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix index a20793a849cf..b6a70864cc5c 100644 --- a/nixpkgs/pkgs/servers/minio/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mirrorbits/default.nix b/nixpkgs/pkgs/servers/mirrorbits/default.nix index 10c8811c548f..48817f76bdae 100644 --- a/nixpkgs/pkgs/servers/mirrorbits/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/misc/airsonic/default.nix b/nixpkgs/pkgs/servers/misc/airsonic/default.nix index a7fb0b3b3a77..1afe1e8b9462 100644 --- a/nixpkgs/pkgs/servers/misc/airsonic/default.nix +++ b/nixpkgs/pkgs/servers/misc/airsonic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "airsonic-${version}"; + pname = "airsonic"; version = "10.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/misc/subsonic/default.nix b/nixpkgs/pkgs/servers/misc/subsonic/default.nix index 50e754791e6d..be5188f177ac 100644 --- a/nixpkgs/pkgs/servers/misc/subsonic/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/misc/taskserver/default.nix b/nixpkgs/pkgs/servers/misc/taskserver/default.nix index f15b7ca2e821..0ab921a6f6f8 100644 --- a/nixpkgs/pkgs/servers/misc/taskserver/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/bosun/default.nix b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix index c8eb07319245..957bb59b1214 100644 --- a/nixpkgs/pkgs/servers/monitoring/bosun/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index d6f3e18e49bc..029d87009560 100644 --- a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,7 +1,7 @@ { stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cadvisor-${version}"; + pname = "cadvisor"; version = "0.34.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix b/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix index a888549bb6aa..707d0129f70b 100644 --- a/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/facette/default.nix b/nixpkgs/pkgs/servers/monitoring/facette/default.nix index efa62e261b74..e5f30f4e6146 100644 --- a/nixpkgs/pkgs/servers/monitoring/facette/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix index 1004947d5b12..502ff10b0929 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 19807c3c2bd8..557a4b4842db 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,9 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.3.3"; - name = "grafana-${version}"; + pname = "grafana"; + version = "6.3.4"; + goPackagePath = "github.com/grafana/grafana"; excludedPackages = [ "release_publisher" ]; @@ -11,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "006j39n42l91krd1p87dpan1s7dvjjhpidccpxkic189lwg7fbxs"; + sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2"; }; srcStatic = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0n4fkzj3bnq3x08vw18a8lqxjggqsy5l2rgk494i87yaf1pa4gpf"; + url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; + sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix b/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix index 969a58aff85d..f33a418fe5ce 100644 --- a/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix b/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix index af5f2880a0f8..cc67bdfa56db 100644 --- a/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 97ddba0ff738..35de5f231b47 100644 --- a/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "0.3.0"; - name = "grafana-loki-${version}"; + pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; doCheck = true; diff --git a/nixpkgs/pkgs/servers/monitoring/longview/default.nix b/nixpkgs/pkgs/servers/monitoring/longview/default.nix index 45e380379d2f..5459d58ceb9f 100644 --- a/nixpkgs/pkgs/servers/monitoring/longview/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/nixpkgs/pkgs/servers/monitoring/mtail/default.nix index 5044aef2bb53..31a6501ea3a5 100644 --- a/nixpkgs/pkgs/servers/monitoring/mtail/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 34beada87e82..183cc3a2b955 100644 --- a/nixpkgs/pkgs/servers/monitoring/munin/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/nixpkgs/pkgs/servers/monitoring/nagios/default.nix index 92713a43ea22..475d79a090af 100644 --- a/nixpkgs/pkgs/servers/monitoring/nagios/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index cdfd8ab9beeb..35d02a5f9e2c 100644 --- a/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 401f9ffc4066..2dc1bdf9681c 100644 --- a/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix index 9f03c9ea96f6..79303849156a 100644 --- a/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix index acdb3423107d..f1dbf0e51445 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "alertmanager-${version}"; + pname = "alertmanager"; version = "0.18.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix index db58c7e14e5f..07c8a14ce0b3 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 9803ba09e16a..970f49713a3b 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 0d6fbac60e5d..ce4bacfc9b7c 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 47abcb33ee79..aaee2e8d770d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index 4e32630ae227..d1cb5dcec9cb 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 6b9b2f6b799f..479ff174d114 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 071035b2a4ac..95b0db7dbc60 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index b2a0e3875891..4a84db38f78d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix index aeb7b7445a5d..f126b8a7da1c 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 85720108def8..947dfc2b70c3 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ade9bb87d993..04fbc7fbed93 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 8b6c54d41f91..7d4607738027 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 6108e0d9de39..f5c438a87dc1 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/nixpkgs/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.11.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 9de720306d8d..cc527c29ac21 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix index fd90e4c39bb1..857a7667c13f 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/nixpkgs/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.18.1"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 36009c421ef5..5d62ff8c50f9 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 9a34f0c948d1..8202a8c8c29f 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 0887d971ddf7..abc7db8086bb 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix index 5e4ebb581400..efe146c843fb 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1c00f734c19e..48afc610c615 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 34120ad3fdae..331503dfe7d4 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index be8fbd3d85cb..cbafabb18b52 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 792e0b33aee1..f4aa8344f777 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 0c5cc6267659..07b5055831e7 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 1cf4c022e8fa..5682c3ccd2a0 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/riemann/default.nix b/nixpkgs/pkgs/servers/monitoring/riemann/default.nix index b7221a9d8361..d5272e9b08a2 100644 --- a/nixpkgs/pkgs/servers/monitoring/riemann/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/seyren/default.nix b/nixpkgs/pkgs/servers/monitoring/seyren/default.nix index ab8365c23f81..eb98e45c36c3 100644 --- a/nixpkgs/pkgs/servers/monitoring/seyren/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index ee3b9d818ce1..dfe2bdb71b28 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix index 1de1edfa8e11..c1f4746fadfe 100644 --- a/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix @@ -11,7 +11,8 @@ let }; backend = buildGoPackage { - name = "uchiwa-backend-${version}"; + pname = "uchiwa-backend"; + inherit version; goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' @@ -27,7 +28,8 @@ let }; in stdenv.mkDerivation rec { - name = "uchiwa-${version}"; + pname = "uchiwa"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix b/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix index 4c3479d8662e..fe90d4d6408b 100644 --- a/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mpd/clientlib.nix b/nixpkgs/pkgs/servers/mpd/clientlib.nix index d8aed78e28ae..76b00b4cb29c 100644 --- a/nixpkgs/pkgs/servers/mpd/clientlib.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mpd/default.nix b/nixpkgs/pkgs/servers/mpd/default.nix index 740fd4739ab7..7fcb5f945791 100644 --- a/nixpkgs/pkgs/servers/mpd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index 06cef9cefab7..3357f7a16c12 100644 --- a/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/nixpkgs/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.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix index cc73b2e1f6f2..079c877ab7a3 100644 --- a/nixpkgs/pkgs/servers/nats-streaming-server/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix index ac5e5cff94b3..69b1f28d2d68 100644 --- a/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nextcloud-${version}"; + pname = "nextcloud"; version = "16.0.4"; src = fetchurl { - url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; + url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; sha256 = "1l7ckzyqz7g4ny8s2q4xal72p57ldfjs947sk2ya2df93qjh0qz0"; }; diff --git a/nixpkgs/pkgs/servers/nginx-sso/default.nix b/nixpkgs/pkgs/servers/nginx-sso/default.nix index d7c36b0cb416..a89604c4e7cd 100644 --- a/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/nosql/aerospike/default.nix b/nixpkgs/pkgs/servers/nosql/aerospike/default.nix index c5290709b625..ccd8a9b02377 100644 --- a/nixpkgs/pkgs/servers/nosql/aerospike/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix index 05f572c8caaa..fd0a97d029d5 100644 --- a/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index c06b84324191..bc1aee8a6876 100644 --- a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { - name = "EventStore-${version}"; + pname = "EventStore"; version = "5.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix index 842c988d9b33..2864449267a6 100644 --- a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix @@ -21,7 +21,8 @@ let version = "3.4.10"; ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; in stdenv.mkDerivation rec { - name = "mongodb-${version}"; + pname = "mongodb"; + inherit version; src = fetchurl { url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix index 9b173e538d34..f471017a3367 100644 --- a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/nosql/redis/default.nix b/nixpkgs/pkgs/servers/nosql/redis/default.nix index 20a6321e0a80..9b785917bfbe 100644 --- a/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchurl, lua }: +{ stdenv, fetchurl, lua, jemalloc }: 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"; }; + # Cross-compiling fixes + configurePhase = '' + ${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + # This fixes hiredis, which has the AR awkwardly coded. + # Probably a good candidate for a patch upstream. + makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)') + ''} + ''; + buildInputs = [ lua ]; - makeFlags = "PREFIX=$(out)"; + # More cross-compiling fixes. + # Note: this enables libc malloc as a temporary fix for cross-compiling. + # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. + # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! + makeFlags = "PREFIX=$(out)" + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " AR=${stdenv.cc.targetPrefix}ar RANLIB=${stdenv.cc.targetPrefix}ranlib MALLOC=libc"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix b/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix index a1a9072f5cab..63c1b3b5fd77 100644 --- a/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/nsq/default.nix b/nixpkgs/pkgs/servers/nsq/default.nix index d48587c924e7..19352984712a 100644 --- a/nixpkgs/pkgs/servers/nsq/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/openafs/1.6/default.nix b/nixpkgs/pkgs/servers/openafs/1.6/default.nix index 22f09994ebf0..6fbabc3d0030 100644 --- a/nixpkgs/pkgs/servers/openafs/1.6/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/openafs/1.8/default.nix b/nixpkgs/pkgs/servers/openafs/1.8/default.nix index c77bef6ad24e..23e1cfae47ce 100644 --- a/nixpkgs/pkgs/servers/openafs/1.8/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/osrm-backend/default.nix b/nixpkgs/pkgs/servers/osrm-backend/default.nix index 8eca1fb7790b..c0018529ea8b 100644 --- a/nixpkgs/pkgs/servers/osrm-backend/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/p910nd/default.nix b/nixpkgs/pkgs/servers/p910nd/default.nix index 1f58c309aa5e..67e125d7a8cc 100644 --- a/nixpkgs/pkgs/servers/p910nd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix index 16007c3e8fca..cbe0dae3e14a 100644 --- a/nixpkgs/pkgs/servers/plex/raw.nix +++ b/nixpkgs/pkgs/servers/plex/raw.nix @@ -8,14 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.5.1488-deeb86e7f"; + version = "1.16.5.1554-1e5ff713d"; pname = "plexmediaserver"; - name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0kgcbq3jfvmigza8a9ak215q2cpi18vh96gx01hppk51m9ibkrwi"; + sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n"; }; outputs = [ "out" "basedb" ]; diff --git a/nixpkgs/pkgs/servers/polipo/default.nix b/nixpkgs/pkgs/servers/polipo/default.nix index a7a0791b8520..a6b65cde89f9 100644 --- a/nixpkgs/pkgs/servers/polipo/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/ps3netsrv/default.nix b/nixpkgs/pkgs/servers/ps3netsrv/default.nix index 6aaaf95fae16..86a96dde5406 100644 --- a/nixpkgs/pkgs/servers/ps3netsrv/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/quagga/default.nix b/nixpkgs/pkgs/servers/quagga/default.nix index 1d8f0c36caec..fc130965cf10 100644 --- a/nixpkgs/pkgs/servers/quagga/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/radarr/default.nix b/nixpkgs/pkgs/servers/radarr/default.nix index a293643a6f6d..854f73be1871 100644 --- a/nixpkgs/pkgs/servers/radarr/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/radicale/1.x.nix b/nixpkgs/pkgs/servers/radicale/1.x.nix index 13db868845a0..bfc681c921b9 100644 --- a/nixpkgs/pkgs/servers/radicale/1.x.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/rippled/default.nix b/nixpkgs/pkgs/servers/rippled/default.nix index 3dcb6605a61e..4000c25aceae 100644 --- a/nixpkgs/pkgs/servers/rippled/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/rpcbind/default.nix b/nixpkgs/pkgs/servers/rpcbind/default.nix index fc28f621959b..c8fd5c059a88 100644 --- a/nixpkgs/pkgs/servers/rpcbind/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/rt/default.nix b/nixpkgs/pkgs/servers/rt/default.nix index b2e40a8ede0e..4d8ead30add6 100644 --- a/nixpkgs/pkgs/servers/rt/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sabnzbd/default.nix b/nixpkgs/pkgs/servers/sabnzbd/default.nix index 364fcb118ce4..57c774ebcb05 100644 --- a/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index 2a4093d412ff..4ec00506b338 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix index 6142d751dab1..c64687054ab5 100644 --- a/nixpkgs/pkgs/servers/search/elasticsearch/5.x.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/search/groonga/default.nix b/nixpkgs/pkgs/servers/search/groonga/default.nix index b296fb3b425c..9fd49e96fa29 100644 --- a/nixpkgs/pkgs/servers/search/groonga/default.nix +++ b/nixpkgs/pkgs/servers/search/groonga/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { - name = "groonga-${version}"; + pname = "groonga"; version = "9.0.6"; src = fetchurl { - url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; + url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; sha256 = "0d1p8v7qd97h3znp84a1w40hbg834n3wxp6gaa8mbnff16s18kl7"; }; diff --git a/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix index 7ba23f61fedb..1238778658a4 100644 --- a/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix +++ b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "sphinxsearch-${version}"; + pname = "sphinxsearch"; + inherit version; src = mainSrc; configureFlags = [ diff --git a/nixpkgs/pkgs/servers/serf/default.nix b/nixpkgs/pkgs/servers/serf/default.nix index 4c5f71cb37d6..585fc2b73ef9 100644 --- a/nixpkgs/pkgs/servers/serf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/serviio/default.nix b/nixpkgs/pkgs/servers/serviio/default.nix index 2ab3bf666857..03d86c209f07 100644 --- a/nixpkgs/pkgs/servers/serviio/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/shairplay/default.nix b/nixpkgs/pkgs/servers/shairplay/default.nix index e5312b92902e..1c726c477648 100644 --- a/nixpkgs/pkgs/servers/shairplay/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/shairport-sync/default.nix b/nixpkgs/pkgs/servers/shairport-sync/default.nix index 639fa322525b..40b88c34e8d6 100644 --- a/nixpkgs/pkgs/servers/shairport-sync/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/shellinabox/default.nix b/nixpkgs/pkgs/servers/shellinabox/default.nix index 70bf5c32b3d4..af1992fc8699 100644 --- a/nixpkgs/pkgs/servers/shellinabox/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/simplehttp2server/default.nix b/nixpkgs/pkgs/servers/simplehttp2server/default.nix index 083a224d1558..3ac32509ba3b 100644 --- a/nixpkgs/pkgs/servers/simplehttp2server/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sks/default.nix b/nixpkgs/pkgs/servers/sks/default.nix index a8a00f37f3fb..12a52c2641d5 100644 --- a/nixpkgs/pkgs/servers/sks/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/skydns/default.nix b/nixpkgs/pkgs/servers/skydns/default.nix index 82d79785b11c..340ef36ac593 100644 --- a/nixpkgs/pkgs/servers/skydns/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/smcroute/default.nix b/nixpkgs/pkgs/servers/smcroute/default.nix index 3409fc00066f..730d1bbdddce 100644 --- a/nixpkgs/pkgs/servers/smcroute/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/softether/4.25.nix b/nixpkgs/pkgs/servers/softether/4.25.nix index 7eaa5b3e8a05..2b21bef7d6f6 100644 --- a/nixpkgs/pkgs/servers/softether/4.25.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/softether/4.29.nix b/nixpkgs/pkgs/servers/softether/4.29.nix index e26e8f057b6d..1d80752a41a5 100644 --- a/nixpkgs/pkgs/servers/softether/4.29.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sonarr/default.nix b/nixpkgs/pkgs/servers/sonarr/default.nix index 116d687ad269..7b80b021bde7 100644 --- a/nixpkgs/pkgs/servers/sonarr/default.nix +++ b/nixpkgs/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.5338"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix index 22ec301bceda..a34b7f03be88 100644 --- a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index 7d34dd8d63be..ac14015c4cf3 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 287054a750b4..0770191c1b9f 100644 --- a/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -6,7 +6,8 @@ let version = "11.33.3"; in stdenv.mkDerivation rec { - name = "monetdb-${version}"; + pname = "monetdb"; + inherit version; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix b/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix index a50d623acbce..062de0c2368c 100644 --- a/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix b/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix index c77330bd2ace..7f8f0786e038 100644 --- a/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index dcaa8d5e1fad..30be61a805a7 100644 --- a/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }: 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/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/nixpkgs/pkgs/servers/sql/pgpool/default.nix index ba75bd28bccc..32c30836f6dc 100644 --- a/nixpkgs/pkgs/servers/sql/pgpool/default.nix +++ b/nixpkgs/pkgs/servers/sql/pgpool/default.nix @@ -3,11 +3,10 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; version = "4.0.6"; - 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 = "0blmbqczyrgzykby2z3xzmhzd8kgij9izxv50n5cjn5azf7dn8g5"; }; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 7e536e22d947..5dcbe5106d65 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 2866c94d3d7f..8e30683737db 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 040ff8b80fe7..9a61e3c835da 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 381a174838e5..7b64de381f3e 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix index b9015be781e9..c368929db5dc 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix index c68ba9b17288..ac79c1b3b381 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix index 7dd6a5882b25..804356e9f6be 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix index 89138baa91c2..75a2853e2c04 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "plv8"; - version = "2.3.12"; + version = "2.3.13"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "1yi1ibiibvd0x4z5dm698w32ljrj3yr4j25jm1zkgkwd4ii8y644"; + sha256 = "12xpcc1ylzyy75wi1m4vijknzv2gxab05w9z90jb03faq18cnlql"; }; makefile = "Makefile.shared"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; - maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; + maintainers = with maintainers; [ volth marsam ]; + platforms = [ "x86_64-linux" ]; license = licenses.postgresql; }; } diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index 63b8a39b0e27..33d050497da5 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 77da47b00e0d..5f9959958206 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 7be23003b584..9e3fe74aa6ce 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix b/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix index 4e40d8761526..f5444bb06836 100644 --- a/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/sslh/default.nix b/nixpkgs/pkgs/servers/sslh/default.nix index 455409557592..f7b4dd84d329 100644 --- a/nixpkgs/pkgs/servers/sslh/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tacacs+/default.nix b/nixpkgs/pkgs/servers/tacacs+/default.nix new file mode 100644 index 000000000000..01d8affd1e85 --- /dev/null +++ b/nixpkgs/pkgs/servers/tacacs+/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, tcp_wrappers, flex, bison, perl }: + +stdenv.mkDerivation rec { + pname = "tacacs+"; + version = "4.0.4.28"; + + src = fetchurl { + url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${version}.tar.gz"; + sha256 = "17i18z3s58c8yy8jxp01q3hzz5nirs4cjxms18zzkli6ip4jszql"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ tcp_wrappers perl ]; + + meta = with stdenv.lib; { + description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices"; + homepage = "http://www.shrubbery.net/tac_plus/"; + license = licenses.free; + maintainers = [ maintainers."0x4A6F" ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix index d074ddf4d72e..67d441e76c74 100644 --- a/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tegola/default.nix b/nixpkgs/pkgs/servers/tegola/default.nix index 967eea25d3fb..ac3dccdab738 100644 --- a/nixpkgs/pkgs/servers/tegola/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix index e645ef2dc354..121983e70315 100644 --- a/nixpkgs/pkgs/servers/teleport/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index f793f05fef42..1707eb403b70 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/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.14"; goPackagePath = "github.com/containous/traefik"; diff --git a/nixpkgs/pkgs/servers/trezord/default.nix b/nixpkgs/pkgs/servers/trezord/default.nix index 48cf589e55d1..84b7b325b46f 100644 --- a/nixpkgs/pkgs/servers/trezord/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tt-rss/default.nix b/nixpkgs/pkgs/servers/tt-rss/default.nix index ce8947bcdda6..c1694316f3ed 100644 --- a/nixpkgs/pkgs/servers/tt-rss/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 6fad061ce996..0600640155be 100644 --- a/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 27416537e331..7ddc3abb0b4e 100644 --- a/nixpkgs/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 702b95b3f0e3..7c3d6a5b57e2 100644 --- a/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix b/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix index d0b279eb859b..c35667546c66 100644 --- a/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/tvheadend/default.nix b/nixpkgs/pkgs/servers/tvheadend/default.nix index e05d9e919d17..c996d7c0c8b4 100644 --- a/nixpkgs/pkgs/servers/tvheadend/default.nix +++ b/nixpkgs/pkgs/servers/tvheadend/default.nix @@ -6,7 +6,8 @@ let version = "4.2.8"; in stdenv.mkDerivation rec { - name = "tvheadend-${version}"; + pname = "tvheadend"; + inherit version; src = fetchFromGitHub { owner = "tvheadend"; diff --git a/nixpkgs/pkgs/servers/udpt/default.nix b/nixpkgs/pkgs/servers/udpt/default.nix index 9e9816c941d9..12f2a08c7f48 100644 --- a/nixpkgs/pkgs/servers/udpt/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/uftp/default.nix b/nixpkgs/pkgs/servers/uftp/default.nix index ba628360aaa7..0dfec772a188 100644 --- a/nixpkgs/pkgs/servers/uftp/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/uhub/default.nix b/nixpkgs/pkgs/servers/uhub/default.nix index 52866784faa9..6483973546c6 100644 --- a/nixpkgs/pkgs/servers/uhub/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/ums/default.nix b/nixpkgs/pkgs/servers/ums/default.nix index 9bccd5b99fb0..3fb2817277aa 100644 --- a/nixpkgs/pkgs/servers/ums/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/unifi/default.nix b/nixpkgs/pkgs/servers/unifi/default.nix index 5a04d2317f41..eb7a072799dc 100644 --- a/nixpkgs/pkgs/servers/unifi/default.nix +++ b/nixpkgs/pkgs/servers/unifi/default.nix @@ -3,7 +3,8 @@ let generic = { version, sha256, suffix ? "" }: stdenv.mkDerivation rec { - name = "unifi-controller-${version}"; + pname = "unifi-controller"; + inherit version; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb"; diff --git a/nixpkgs/pkgs/servers/uwsgi/default.nix b/nixpkgs/pkgs/servers/uwsgi/default.nix index 6f5f7170dbd9..85fa6cd80063 100644 --- a/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/varnish/default.nix b/nixpkgs/pkgs/servers/varnish/default.nix index c9f0f2b84bbe..8a63ed3ea7f1 100644 --- a/nixpkgs/pkgs/servers/varnish/default.nix +++ b/nixpkgs/pkgs/servers/varnish/default.nix @@ -4,10 +4,11 @@ let common = { version, sha256, python, extraNativeBuildInputs ? [] }: stdenv.mkDerivation rec { - name = "varnish-${version}"; + pname = "varnish"; + inherit version; src = fetchurl { - url = "https://varnish-cache.org/_downloads/${name}.tgz"; + url = "https://varnish-cache.org/_downloads/${pname}-${version}.tgz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix index 8d3d3def695f..9b87924e0b96 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -13,7 +13,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") (fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5") - (fetchbower "chainpad-listmap" "0.5.2" "^0.5.0" "0zmg6y5pzf75i84mlnvif6v1g7f4s1vyyzd6ng9ql4b9sdlf4zpc") + (fetchbower "chainpad-listmap" "0.7.0" "^0.7.0" "141hk4x7kwzgiazsghyg4h4df519m72qh3xfb3lzwy245c2nh1ak") (fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc") (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") @@ -22,7 +22,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9") (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") - (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8") + (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5") (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") @@ -33,7 +33,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp") (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") - (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc") - (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s") + (fetchbower "chainpad-netflux" "0.9.0" "^0.9.0" "0qx9ihnpmcrmg2lwkpm330bhj8zsp1gdxxrbsd05bwd8pm2x11av") + (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz") (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") ]; } diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix index f406aa83e350..77e529f26abf 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix @@ -15,7 +15,6 @@ let bowerPackages = buildBowerComponents { name = "${cryptpad.name}-bower-packages"; # this list had to be tweaked by hand: - # * remove the # in the sortablejs dependency # * add the second bootstrap ~3.1.1 entry generated = ./bower-packages.nix; src = cryptpad.src; diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index b2a943dc2dfc..6189bfdf4cb8 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -364,13 +364,13 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "nthen-0.1.10" = { + "nthen-0.1.8" = { name = "nthen"; packageName = "nthen"; - version = "0.1.10"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz"; - sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA=="; + url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; + sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; }; }; "on-finished-2.3.0" = { @@ -619,14 +619,14 @@ let }; in { - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage { + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" = nodeEnv.buildNodePackage { name = "cryptpad"; packageName = "cryptpad"; - version = "2.25.0"; + version = "3.0.0"; src = fetchgit { url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8"; - sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7"; + rev = "166ab65cd47a64e020528089244ed5be34f6e3c8"; + sha256 = "35a3b733b5c128b7c7e1c0e7473f4a6a446d663f4c787745b36b1071205c1fd7"; }; dependencies = [ sources."accepts-1.3.7" @@ -669,7 +669,7 @@ in sources."mime-types-2.1.24" sources."ms-2.0.0" sources."negotiator-0.6.2" - sources."nthen-0.1.10" + sources."nthen-0.1.8" sources."on-finished-2.3.0" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json index c37d984ae121..b370e09931b6 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -1,3 +1,3 @@ [ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" } + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" } ] diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix index 36c5996286ff..cae300a53f40 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -14,4 +14,4 @@ in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/web-apps/morty/default.nix b/nixpkgs/pkgs/servers/web-apps/morty/default.nix index e4dd9b0f2dc7..3d43862cbe0e 100644 --- a/nixpkgs/pkgs/servers/web-apps/morty/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index a53c726587f2..e3adeb0fe660 100644 --- a/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pgpkeyserver-lite-${version}"; + pname = "pgpkeyserver-lite"; version = "2017-07-18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix b/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix index 946606e37013..5c105e85a872 100644 --- a/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix b/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix index 615efa3b3672..f6000fc42117 100644 --- a/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix index 0ec31e7dc4fa..f5bce90c2341 100644 --- a/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "shaarli-${version}"; + pname = "shaarli"; version = "0.11.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix index 5fd941e9467c..ef0a4331d41d 100644 --- a/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix b/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix index 0c51b6b13cdd..4be14b37bd2b 100644 --- a/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index eafe916d02ca..a105531ff4e6 100644 --- a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/x11/quartz-wm/default.nix b/nixpkgs/pkgs/servers/x11/quartz-wm/default.nix index 92350595dd85..84904d48b1ee 100644 --- a/nixpkgs/pkgs/servers/x11/quartz-wm/default.nix +++ b/nixpkgs/pkgs/servers/x11/quartz-wm/default.nix @@ -2,7 +2,8 @@ let version = "1.3.1"; in stdenv.mkDerivation { - name = "quartz-wm-${version}"; + pname = "quartz-wm"; + inherit version; src = fetchurl { url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz"; sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9"; diff --git a/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 0a008227b9fb..af526730ca97 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix b/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix index b0d3dccf30f2..c25c4baf13b8 100644 --- a/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix index 7e092c523493..335de9ea153a 100644 --- a/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix @@ -45,7 +45,8 @@ in stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; deps = stdenv.mkDerivation { - name = "ejabberd-deps-${version}"; + pname = "ejabberd-deps"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/servers/xmpp/openfire/default.nix b/nixpkgs/pkgs/servers/xmpp/openfire/default.nix index 0e6fcd5e9896..ab377e3d53b1 100644 --- a/nixpkgs/pkgs/servers/xmpp/openfire/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 928c48329656..7bf21cbf22f2 100644 --- a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix index 8df8499d11eb..f5bdfd9fe853 100644 --- a/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix b/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix index 76861ab842b5..719acfd3a66e 100644 --- a/nixpkgs/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/zoneminder/default.nix b/nixpkgs/pkgs/servers/zoneminder/default.nix index 996bd6a8fb6e..6e6875c3550c 100644 --- a/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/servers/zookeeper/default.nix b/nixpkgs/pkgs/servers/zookeeper/default.nix index 5bacaf2982e9..44b96d4209a6 100644 --- a/nixpkgs/pkgs/servers/zookeeper/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/shells/any-nix-shell/default.nix b/nixpkgs/pkgs/shells/any-nix-shell/default.nix index 21f40858ea28..d2b7a4929e1c 100644 --- a/nixpkgs/pkgs/shells/any-nix-shell/default.nix +++ b/nixpkgs/pkgs/shells/any-nix-shell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "any-nix-shell-${version}"; + pname = "any-nix-shell"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index b5f600da8f7e..0476cbd1f3f7 100644 --- a/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bash-completion-${version}"; + pname = "bash-completion"; version = "2.8"; src = fetchurl { - url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/scop/bash-completion/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0"; }; diff --git a/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix b/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix index 5ac117cf1e5e..affbd2199586 100644 --- a/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.6.7"; - name = "nix-bash-completions-${version}"; + pname = "nix-bash-completions"; src = fetchFromGitHub { owner = "hedning"; diff --git a/nixpkgs/pkgs/shells/dgsh/default.nix b/nixpkgs/pkgs/shells/dgsh/default.nix index c3c2da329a9b..4fd88d3261b3 100644 --- a/nixpkgs/pkgs/shells/dgsh/default.nix +++ b/nixpkgs/pkgs/shells/dgsh/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "dgsh-unstable-${version}"; + pname = "dgsh-unstable"; version = "2017-02-05"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/es/default.nix b/nixpkgs/pkgs/shells/es/default.nix index 789ddaf4d9bb..446f28ba6527 100644 --- a/nixpkgs/pkgs/shells/es/default.nix +++ b/nixpkgs/pkgs/shells/es/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "es-${version}"; + pname = "es"; + inherit version; src = fetchurl { url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/shells/fish/default.nix b/nixpkgs/pkgs/shells/fish/default.nix index df8b5d824f1e..1ef3c4b6fd9a 100644 --- a/nixpkgs/pkgs/shells/fish/default.nix +++ b/nixpkgs/pkgs/shells/fish/default.nix @@ -88,7 +88,7 @@ let ''; fish = stdenv.mkDerivation rec { - name = "fish-${version}"; + pname = "fish"; version = "3.0.2"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; @@ -96,7 +96,7 @@ let src = fetchurl { # There are differences between the release tarball and the tarball github packages from the tag # Hence we cannot use fetchFromGithub - url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl"; }; diff --git a/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix b/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix index 445e961c6499..b2aecdf6c14e 100644 --- a/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix +++ b/nixpkgs/pkgs/shells/fish/fish-foreign-env/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnused, bash, coreutils }: stdenv.mkDerivation rec { - name = "fish-foreign-env-${version}"; + pname = "fish-foreign-env"; version = "git-20170324"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/ksh/default.nix b/nixpkgs/pkgs/shells/ksh/default.nix index d16704b71d5e..74e70feaa8d7 100644 --- a/nixpkgs/pkgs/shells/ksh/default.nix +++ b/nixpkgs/pkgs/shells/ksh/default.nix @@ -1,7 +1,7 @@ { stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: stdenv.mkDerivation rec { - name = "ksh-${version}"; + pname = "ksh"; version = "93v"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/mksh/default.nix b/nixpkgs/pkgs/shells/mksh/default.nix index 2115e17c332b..9b48c5c68a1c 100644 --- a/nixpkgs/pkgs/shells/mksh/default.nix +++ b/nixpkgs/pkgs/shells/mksh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mksh-${version}"; + pname = "mksh"; version = "57"; src = fetchurl { diff --git a/nixpkgs/pkgs/shells/oh/default.nix b/nixpkgs/pkgs/shells/oh/default.nix index 2e200a74f7b4..09a54c8a3b88 100644 --- a/nixpkgs/pkgs/shells/oh/default.nix +++ b/nixpkgs/pkgs/shells/oh/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "oh-${version}"; + pname = "oh"; version = "20160522-${stdenv.lib.strings.substring 0 7 rev}"; rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4"; diff --git a/nixpkgs/pkgs/shells/powershell/default.nix b/nixpkgs/pkgs/shells/powershell/default.nix index 3a6eb6378f0a..a7fe9634fee4 100644 --- a/nixpkgs/pkgs/shells/powershell/default.nix +++ b/nixpkgs/pkgs/shells/powershell/default.nix @@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx" (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); in stdenv.mkDerivation rec { - name = "powershell-${version}"; + pname = "powershell"; version = "6.2.2"; src = fetchzip { diff --git a/nixpkgs/pkgs/shells/rc/default.nix b/nixpkgs/pkgs/shells/rc/default.nix index 298c4a1c32f4..a8a7d4f6e777 100644 --- a/nixpkgs/pkgs/shells/rc/default.nix +++ b/nixpkgs/pkgs/shells/rc/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "rc-${version}"; + pname = "rc"; version = "1.7.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/shells/rssh/default.nix b/nixpkgs/pkgs/shells/rssh/default.nix index d061c888f60a..ecefbff7d22e 100644 --- a/nixpkgs/pkgs/shells/rssh/default.nix +++ b/nixpkgs/pkgs/shells/rssh/default.nix @@ -5,11 +5,11 @@ { stdenv, fetchurl, openssh, rsync, cvs }: stdenv.mkDerivation rec { - name = "rssh-${version}"; + pname = "rssh"; version = "2.3.4"; src = fetchurl { - url = "mirror://sourceforge/rssh/rssh/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/rssh/rssh/${version}/${pname}-${version}.tar.gz"; sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9"; }; diff --git a/nixpkgs/pkgs/shells/tcsh/default.nix b/nixpkgs/pkgs/shells/tcsh/default.nix index 43dd8a40480c..f13919e52e7c 100644 --- a/nixpkgs/pkgs/shells/tcsh/default.nix +++ b/nixpkgs/pkgs/shells/tcsh/default.nix @@ -2,14 +2,14 @@ , ncurses }: stdenv.mkDerivation rec { - name = "tcsh-${version}"; + pname = "tcsh"; version = "6.21.00"; src = fetchurl { urls = [ - "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz" - "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz" - "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" ]; sha256 = "0wp9cqkzdj5ahfyg9bn5z1wnyblqyv9vz4sc5aqmj7rp91a34f64"; }; diff --git a/nixpkgs/pkgs/shells/zsh/antigen/default.nix b/nixpkgs/pkgs/shells/zsh/antigen/default.nix index cf22207ef09c..c754d7bbe580 100644 --- a/nixpkgs/pkgs/shells/zsh/antigen/default.nix +++ b/nixpkgs/pkgs/shells/zsh/antigen/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.2.3"; - name = "antigen-${version}"; + pname = "antigen"; src = fetchurl { url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh"; diff --git a/nixpkgs/pkgs/shells/zsh/default.nix b/nixpkgs/pkgs/shells/zsh/default.nix index e9458520bb49..0a26b8a78210 100644 --- a/nixpkgs/pkgs/shells/zsh/default.nix +++ b/nixpkgs/pkgs/shells/zsh/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "zsh-${version}"; + pname = "zsh"; + inherit version; src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix b/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix index b9047a93a41f..ed46a21325c5 100644 --- a/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix +++ b/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gradle-completion-${version}"; + pname = "gradle-completion"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index 38e45693ad5e..428c05605a7e 100644 --- a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, lib, txt2tags }: stdenv.mkDerivation rec { - name = "grml-zsh-config-${version}"; + pname = "grml-zsh-config"; version = "0.16.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix index 0a5c3ef666e2..3ce32a5e4362 100644 --- a/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "nix-zsh-completions-${version}"; + pname = "nix-zsh-completions"; + inherit version; src = fetchFromGitHub { owner = "spwhitt"; diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 6afe6d286eed..61e60e97edd8 100644 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2019-08-07"; - name = "oh-my-zsh-${version}"; + pname = "oh-my-zsh"; rev = "40fafe0f59371d1a9d83b83c614acfd1d740aabb"; src = fetchgit { inherit rev; diff --git a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index 28b116523ac0..4e089dd4d73c 100644 --- a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec{ - name = "spaceship-prompt-${version}"; + pname = "spaceship-prompt"; version = "3.7.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 78908f138618..79ab8128bd33 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -3,7 +3,7 @@ # To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option stdenv.mkDerivation rec { - name = "zsh-autosuggestions-${version}"; + pname = "zsh-autosuggestions"; version = "0.6.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix index c81c1ea46c5f..3e403b623222 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2018-04-30"; - name = "zsh-command-time-${version}"; + pname = "zsh-command-time"; src = fetchFromGitHub { owner = "popstas"; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix index 726f2b7ad73d..2ed4301e55ab 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "zsh-completions-${version}"; + pname = "zsh-completions"; version = "0.30.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix index 42de7d48d831..b75216546670 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zsh-history-substring-search-${version}"; + pname = "zsh-history-substring-search"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 30c45ea3c9bf..00e7612b17be 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -4,7 +4,7 @@ # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` stdenv.mkDerivation rec { - name = "powerlevel9k-${version}"; + pname = "powerlevel9k"; version = "2017-11-10"; src = fetchFromGitHub { owner = "bhilburn"; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index 78cab65138a6..9696038548af 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; - name = "zsh-syntax-highlighting-${version}"; + pname = "zsh-syntax-highlighting"; src = fetchFromGitHub { owner = "zsh-users"; diff --git a/nixpkgs/pkgs/stdenv/cross/default.nix b/nixpkgs/pkgs/stdenv/cross/default.nix index 3bc4cd9a8faa..4e5c4cc2e833 100644 --- a/nixpkgs/pkgs/stdenv/cross/default.nix +++ b/nixpkgs/pkgs/stdenv/cross/default.nix @@ -55,6 +55,8 @@ in lib.init bootStages ++ [ then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang + else if targetPlatform.isGhcjs + then null else if crossSystem.useLLVM or false then buildPackages.llvmPackages_8.lldClang else buildPackages.gcc; diff --git a/nixpkgs/pkgs/tools/X11/autocutsel/default.nix b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix index c9bf7141804c..db17788cea00 100644 --- a/nixpkgs/pkgs/tools/X11/autocutsel/default.nix +++ b/nixpkgs/pkgs/tools/X11/autocutsel/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.10.0"; - name = "autocutsel-${version}"; + pname = "autocutsel"; src = fetchurl { - url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2"; }; diff --git a/nixpkgs/pkgs/tools/X11/bgs/default.nix b/nixpkgs/pkgs/tools/X11/bgs/default.nix index 488c97ad36b5..66d845b0587f 100644 --- a/nixpkgs/pkgs/tools/X11/bgs/default.nix +++ b/nixpkgs/pkgs/tools/X11/bgs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "bgs-${version}"; + pname = "bgs"; version = "0.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/bumblebee/default.nix b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix index 0d764a4cbd10..f5a8fd24f5e6 100644 --- a/nixpkgs/pkgs/tools/X11/bumblebee/default.nix +++ b/nixpkgs/pkgs/tools/X11/bumblebee/default.nix @@ -56,10 +56,11 @@ let }; in stdenv.mkDerivation rec { - name = "bumblebee-${version}"; + pname = "bumblebee"; + inherit version; src = fetchurl { - url = "https://bumblebee-project.org/${name}.tar.gz"; + url = "https://bumblebee-project.org/${pname}-${version}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; diff --git a/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index 173963135f87..5327e0f8c8f9 100644 --- a/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, perl, xkeyboard_config }: stdenv.mkDerivation rec { - name = "ckbcomp-${version}"; + pname = "ckbcomp"; version = "1.193"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/X11/dispad/default.nix b/nixpkgs/pkgs/tools/X11/dispad/default.nix index 1d119220e585..7c1457d3e2ae 100644 --- a/nixpkgs/pkgs/tools/X11/dispad/default.nix +++ b/nixpkgs/pkgs/tools/X11/dispad/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libX11, libXi, libconfuse }: stdenv.mkDerivation rec { - name = "dispad-${version}"; + pname = "dispad"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix b/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix index 28f7edcfd043..f15d099016a5 100644 --- a/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix +++ b/nixpkgs/pkgs/tools/X11/dragon-drop/default.nix @@ -1,7 +1,7 @@ { stdenv, gtk, pkgconfig, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "dragon-drop-${version}"; + pname = "dragon-drop"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/ffcast/default.nix b/nixpkgs/pkgs/tools/X11/ffcast/default.nix index 3283cea1db52..d6c86d60bc1e 100644 --- a/nixpkgs/pkgs/tools/X11/ffcast/default.nix +++ b/nixpkgs/pkgs/tools/X11/ffcast/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }: stdenv.mkDerivation rec { - name = "ffcast-${version}"; + pname = "ffcast"; version = "2.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/go-sct/default.nix b/nixpkgs/pkgs/tools/X11/go-sct/default.nix index c750a5ce1c66..01d82b4a112c 100644 --- a/nixpkgs/pkgs/tools/X11/go-sct/default.nix +++ b/nixpkgs/pkgs/tools/X11/go-sct/default.nix @@ -1,7 +1,7 @@ { stdenv, xorg, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-sct-${version}"; + pname = "go-sct"; version = "20180605-${stdenv.lib.strings.substring 0 7 rev}"; rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4"; diff --git a/nixpkgs/pkgs/tools/X11/grobi/default.nix b/nixpkgs/pkgs/tools/X11/grobi/default.nix index 1a7fc91311e5..f917bda6f71b 100644 --- a/nixpkgs/pkgs/tools/X11/grobi/default.nix +++ b/nixpkgs/pkgs/tools/X11/grobi/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "0.5.1"; - name = "grobi-${version}"; + pname = "grobi"; goPackagePath = "github.com/fd0/grobi"; diff --git a/nixpkgs/pkgs/tools/X11/hsetroot/default.nix b/nixpkgs/pkgs/tools/X11/hsetroot/default.nix index cf2227403b01..239dfa0963b2 100644 --- a/nixpkgs/pkgs/tools/X11/hsetroot/default.nix +++ b/nixpkgs/pkgs/tools/X11/hsetroot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }: stdenv.mkDerivation rec { - name = "hsetroot-${version}"; + pname = "hsetroot"; version = "1.0.2"; # The primary download site seems to no longer exist; use Gentoo's mirror for now. diff --git a/nixpkgs/pkgs/tools/X11/jumpapp/default.nix b/nixpkgs/pkgs/tools/X11/jumpapp/default.nix index 5d3810c7d64d..38de9e9f80b6 100644 --- a/nixpkgs/pkgs/tools/X11/jumpapp/default.nix +++ b/nixpkgs/pkgs/tools/X11/jumpapp/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, perl, pandoc, fetchFromGitHub, xdotool, wmctrl, xprop, nettools }: stdenv.mkDerivation rec { - name = "jumpapp-${version}"; + pname = "jumpapp"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/nitrogen/default.nix b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix index eda5703d6a86..95aa15840da6 100644 --- a/nixpkgs/pkgs/tools/X11/nitrogen/default.nix +++ b/nixpkgs/pkgs/tools/X11/nitrogen/default.nix @@ -3,10 +3,11 @@ let version = "1.6.1"; in stdenv.mkDerivation rec { - name = "nitrogen-${version}"; + pname = "nitrogen"; + inherit version; src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz"; + url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz"; sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl"; }; diff --git a/nixpkgs/pkgs/tools/X11/numlockx/default.nix b/nixpkgs/pkgs/tools/X11/numlockx/default.nix index 2c4807e4661f..b59e9dc30ac8 100644 --- a/nixpkgs/pkgs/tools/X11/numlockx/default.nix +++ b/nixpkgs/pkgs/tools/X11/numlockx/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, libX11, libXext, autoconf }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.2"; pname = "numlockx"; diff --git a/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix index b0ef813b455a..c2bcfe788e64 100644 --- a/nixpkgs/pkgs/tools/X11/nx-libs/default.nix +++ b/nixpkgs/pkgs/tools/X11/nx-libs/default.nix @@ -1,7 +1,7 @@ { stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo, libpng, libtool, libxml2, pkgconfig, which, xorg }: stdenv.mkDerivation rec { - name = "nx-libs-${version}"; + pname = "nx-libs"; version = "3.5.99.21"; src = fetchFromGitHub { owner = "ArcticaProject"; diff --git a/nixpkgs/pkgs/tools/X11/obconf/default.nix b/nixpkgs/pkgs/tools/X11/obconf/default.nix index 2e02338631b4..6b1b353b09be 100644 --- a/nixpkgs/pkgs/tools/X11/obconf/default.nix +++ b/nixpkgs/pkgs/tools/X11/obconf/default.nix @@ -2,7 +2,7 @@ imlib2, libstartup_notification, makeWrapper, libSM }: stdenv.mkDerivation rec { - name = "obconf-${version}"; + pname = "obconf"; version = "2.0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/oblogout/default.nix b/nixpkgs/pkgs/tools/X11/oblogout/default.nix index 33470beca2de..ad2ee549a6d7 100644 --- a/nixpkgs/pkgs/tools/X11/oblogout/default.nix +++ b/nixpkgs/pkgs/tools/X11/oblogout/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }: pythonPackages.buildPythonApplication rec { - name = "oblogout-unstable-${version}"; + pname = "oblogout-unstable"; version = "2009-11-18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/run-scaled/default.nix b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix index ea661b0f8c7b..ae4dc08770dd 100644 --- a/nixpkgs/pkgs/tools/X11/run-scaled/default.nix +++ b/nixpkgs/pkgs/tools/X11/run-scaled/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "git-2018-06-03"; - name = "run-scaled-${version}"; + pname = "run-scaled"; src = fetchFromGitHub { owner = "kaueraal"; diff --git a/nixpkgs/pkgs/tools/X11/runningx/default.nix b/nixpkgs/pkgs/tools/X11/runningx/default.nix index 1323da585c89..479617b6b93a 100644 --- a/nixpkgs/pkgs/tools/X11/runningx/default.nix +++ b/nixpkgs/pkgs/tools/X11/runningx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libX11 }: stdenv.mkDerivation rec { - name = "runningx-${version}"; + pname = "runningx"; version = "1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/screen-message/default.nix b/nixpkgs/pkgs/tools/X11/screen-message/default.nix index 92f24f2b4aa4..8b4a1e19572a 100644 --- a/nixpkgs/pkgs/tools/X11/screen-message/default.nix +++ b/nixpkgs/pkgs/tools/X11/screen-message/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "screen-message-${version}"; + pname = "screen-message"; version = "0.25"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/setroot/default.nix b/nixpkgs/pkgs/tools/X11/setroot/default.nix index b8714fc9ecaf..bb113c90849c 100644 --- a/nixpkgs/pkgs/tools/X11/setroot/default.nix +++ b/nixpkgs/pkgs/tools/X11/setroot/default.nix @@ -6,7 +6,7 @@ assert enableXinerama -> libXinerama != null; stdenv.mkDerivation rec { version = "2.0.2"; - name = "setroot-${version}"; + pname = "setroot"; src = fetchFromGitHub { owner = "ttzhou"; diff --git a/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix b/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix index 16462f5243b7..4fd9678733dd 100644 --- a/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix +++ b/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { version = "git-2015-03-01"; - name = "skippy-xd-${version}"; + pname = "skippy-xd"; inherit buildInputs; src = fetchgit { url = "https://github.com/richardgv/skippy-xd/"; diff --git a/nixpkgs/pkgs/tools/X11/sselp/default.nix b/nixpkgs/pkgs/tools/X11/sselp/default.nix index 2b58dd6c9115..30f99cd40f29 100644 --- a/nixpkgs/pkgs/tools/X11/sselp/default.nix +++ b/nixpkgs/pkgs/tools/X11/sselp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.2"; - name = "sselp-${version}"; + pname = "sselp"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; }; diff --git a/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix index 47b54bec312c..92afa30e6168 100644 --- a/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix +++ b/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: stdenv.mkDerivation rec { - name = "virtualgl-lib-${version}"; + pname = "virtualgl-lib"; version = "2.6.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/wayv/default.nix b/nixpkgs/pkgs/tools/X11/wayv/default.nix index a5a75c9df4f5..f906a6d403e6 100644 --- a/nixpkgs/pkgs/tools/X11/wayv/default.nix +++ b/nixpkgs/pkgs/tools/X11/wayv/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub, libX11}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "wayv"; version = "0.3"; diff --git a/nixpkgs/pkgs/tools/X11/winswitch/default.nix b/nixpkgs/pkgs/tools/X11/winswitch/default.nix index cd9d6aecdefb..e8b2be4b7837 100644 --- a/nixpkgs/pkgs/tools/X11/winswitch/default.nix +++ b/nixpkgs/pkgs/tools/X11/winswitch/default.nix @@ -3,12 +3,12 @@ let base = pythonPackages.buildPythonApplication rec { - name = "winswitch-${version}"; + pname = "winswitch"; namePrefix = ""; version = "0.12.23"; src = fetchurl { - url = "http://winswitch.org/src/${name}.src.tar.bz2"; + url = "http://winswitch.org/src/${pname}-${version}.src.tar.bz2"; sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9"; }; diff --git a/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix index 4200293ed080..fe5c70f6ce23 100644 --- a/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmutils-core/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libxcb }: stdenv.mkDerivation rec { - name = "wmutils-core-${version}"; + pname = "wmutils-core"; version = "1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix b/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix index c01aa8dc75fa..c12303038623 100644 --- a/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmutils-opt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libxcb }: stdenv.mkDerivation rec { - name = "wmutils-opt-${version}"; + pname = "wmutils-opt"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/x11vnc/default.nix b/nixpkgs/pkgs/tools/X11/x11vnc/default.nix index 169f420357e6..acf0fc9aabfd 100644 --- a/nixpkgs/pkgs/tools/X11/x11vnc/default.nix +++ b/nixpkgs/pkgs/tools/X11/x11vnc/default.nix @@ -3,7 +3,7 @@ autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name = "x11vnc-${version}"; + pname = "x11vnc"; version = "0.9.16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/xannotate/default.nix b/nixpkgs/pkgs/tools/X11/xannotate/default.nix index 5a08cf5c817e..d52698b0ed7e 100644 --- a/nixpkgs/pkgs/tools/X11/xannotate/default.nix +++ b/nixpkgs/pkgs/tools/X11/xannotate/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromBitbucket, libX11}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xannotate"; version = "20150301"; diff --git a/nixpkgs/pkgs/tools/X11/xautomation/default.nix b/nixpkgs/pkgs/tools/X11/xautomation/default.nix index 79ef4cb56dcb..a648eefcdde1 100644 --- a/nixpkgs/pkgs/tools/X11/xautomation/default.nix +++ b/nixpkgs/pkgs/tools/X11/xautomation/default.nix @@ -2,7 +2,8 @@ let version = "1.09"; in stdenv.mkDerivation { - name = "xautomation-${version}"; + pname = "xautomation"; + inherit version; src = fetchurl { url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; diff --git a/nixpkgs/pkgs/tools/X11/xbanish/default.nix b/nixpkgs/pkgs/tools/X11/xbanish/default.nix index 142d7d17fe77..8e838bfe9065 100644 --- a/nixpkgs/pkgs/tools/X11/xbanish/default.nix +++ b/nixpkgs/pkgs/tools/X11/xbanish/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "1.6"; pname = "xbanish"; - name = "${pname}-${version}"; buildInputs = [ libX11 libXi libXt libXfixes libXext diff --git a/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix b/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix index 987293878d82..bb83effe6011 100644 --- a/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: stdenv.mkDerivation rec { - name = "xbindkeys-config-${version}"; + pname = "xbindkeys-config"; version = "0.1.3"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix index 4e4e49bd9468..23e0ce63e5b4 100644 --- a/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix +++ b/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix @@ -2,7 +2,8 @@ let version = "1.8.6"; in stdenv.mkDerivation { - name = "xbindkeys-${version}"; + pname = "xbindkeys"; + inherit version; src = fetchurl { url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; diff --git a/nixpkgs/pkgs/tools/X11/xcwd/default.nix b/nixpkgs/pkgs/tools/X11/xcwd/default.nix index 1d42f791fb5c..c36334d478df 100644 --- a/nixpkgs/pkgs/tools/X11/xcwd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xcwd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2016-09-30"; - name = "xcwd-${version}"; + pname = "xcwd"; src = fetchFromGitHub { owner = "schischi"; diff --git a/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix index 44016b801e5d..f1e6e28627c7 100644 --- a/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix +++ b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { - name = "xdg-utils-${version}"; + pname = "xdg-utils"; version = "1.1.3"; src = fetchurl { - url = "https://portland.freedesktop.org/download/${name}.tar.gz"; + url = "https://portland.freedesktop.org/download/${pname}-${version}.tar.gz"; sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"; }; diff --git a/nixpkgs/pkgs/tools/X11/xdotool/default.nix b/nixpkgs/pkgs/tools/X11/xdotool/default.nix index bb6abfa9b586..d20714befba1 100644 --- a/nixpkgs/pkgs/tools/X11/xdotool/default.nix +++ b/nixpkgs/pkgs/tools/X11/xdotool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: stdenv.mkDerivation rec { - name = "xdotool-${version}"; + pname = "xdotool"; version = "3.20160805.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix b/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix index 43b46fcb8d7b..9aee0d778c46 100644 --- a/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/nixpkgs/pkgs/tools/X11/xinput_calibrator/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "xinput_calibrator"; version = "0.7.5"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz"; sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9"; diff --git a/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix b/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix index c49a3dedb126..a837e73983f9 100644 --- a/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix +++ b/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }: stdenv.mkDerivation rec { - name = "xkb-switch-${version}"; + pname = "xkb-switch"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/xloadimage/default.nix b/nixpkgs/pkgs/tools/X11/xloadimage/default.nix index a58d16ab82e8..3bd9f5256835 100644 --- a/nixpkgs/pkgs/tools/X11/xloadimage/default.nix +++ b/nixpkgs/pkgs/tools/X11/xloadimage/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "4.1"; - name = "xloadimage-${version}"; + pname = "xloadimage"; src = fetchurl { url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}.orig.tar.gz"; diff --git a/nixpkgs/pkgs/tools/X11/xmacro/default.nix b/nixpkgs/pkgs/tools/X11/xmacro/default.nix index fd944f400446..13a18efccba6 100644 --- a/nixpkgs/pkgs/tools/X11/xmacro/default.nix +++ b/nixpkgs/pkgs/tools/X11/xmacro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { - name = "xmacro-${version}"; + pname = "xmacro"; version = "0.4.6"; src = fetchurl { - url = "http://download.sarine.nl/xmacro/${name}.tar.gz"; + url = "http://download.sarine.nl/xmacro/${pname}-${version}.tar.gz"; sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61"; }; diff --git a/nixpkgs/pkgs/tools/X11/xnee/default.nix b/nixpkgs/pkgs/tools/X11/xnee/default.nix index a84f101cdf7b..58569dcd59cf 100644 --- a/nixpkgs/pkgs/tools/X11/xnee/default.nix +++ b/nixpkgs/pkgs/tools/X11/xnee/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "3.19"; - name = "xnee-${version}"; + pname = "xnee"; src = fetchurl { - url = "mirror://gnu/xnee/${name}.tar.gz"; + url = "mirror://gnu/xnee/${pname}-${version}.tar.gz"; sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; }; diff --git a/nixpkgs/pkgs/tools/X11/xosview2/default.nix b/nixpkgs/pkgs/tools/X11/xosview2/default.nix index 8acabeef2188..5dfe74fd3734 100644 --- a/nixpkgs/pkgs/tools/X11/xosview2/default.nix +++ b/nixpkgs/pkgs/tools/X11/xosview2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { - name = "xosview2-${version}"; + pname = "xosview2"; version = "2.3.1"; src = fetchurl { - url = "mirror://sourceforge/xosview/${name}.tar.gz"; + url = "mirror://sourceforge/xosview/${pname}-${version}.tar.gz"; sha256 = "1drp0n6qjbxyc0104a3aw2g94rh5p218wmrqwxh3kwwm7pmr9xip"; }; diff --git a/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix b/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix index 435f2b2e9801..dfac2cf88a55 100644 --- a/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix @@ -1,6 +1,6 @@ { stdenv, xorg, fetchgit }: stdenv.mkDerivation rec { - name = "xpointerbarrier-${version}"; + pname = "xpointerbarrier"; version = "18.06"; src = fetchgit { url = "https://www.uninformativ.de/git/xpointerbarrier.git"; diff --git a/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix b/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix index d6fab2b19103..770024aa4ba5 100644 --- a/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, libXinerama }: stdenv.mkDerivation rec { - name = "libfakeXinerama-${version}"; + pname = "libfakeXinerama"; version = "0.1.0"; src = fetchurl { - url = "https://www.xpra.org/src/${name}.tar.bz2"; + url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2"; sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx"; }; diff --git a/nixpkgs/pkgs/tools/X11/xrectsel/default.nix b/nixpkgs/pkgs/tools/X11/xrectsel/default.nix index e54ced714e76..b528078870a5 100644 --- a/nixpkgs/pkgs/tools/X11/xrectsel/default.nix +++ b/nixpkgs/pkgs/tools/X11/xrectsel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libX11 }: stdenv.mkDerivation rec { - name = "xrectsel-${version}"; + pname = "xrectsel"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/xrestop/default.nix b/nixpkgs/pkgs/tools/X11/xrestop/default.nix index 4f9b7bcb42e9..70b471c795ef 100644 --- a/nixpkgs/pkgs/tools/X11/xrestop/default.nix +++ b/nixpkgs/pkgs/tools/X11/xrestop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, xorg, pkgconfig, ncurses }: stdenv.mkDerivation rec { - name = "xrestop-${version}"; + pname = "xrestop"; version = "0.4"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix index a7a7c2b6c0d5..8766e3c0d54d 100644 --- a/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix +++ b/nixpkgs/pkgs/tools/X11/xsecurelock/default.nix @@ -3,7 +3,7 @@ , pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }: stdenv.mkDerivation rec { - name = "xsecurelock-${version}"; + pname = "xsecurelock"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix index 2f84711e61c4..bee6cdb748f1 100644 --- a/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xsettingsd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: stdenv.mkDerivation rec { - name = "xsettingsd-${version}"; + pname = "xsettingsd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix index 368012b468f3..5f789a0151f4 100644 --- a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix @@ -2,7 +2,7 @@ , libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: stdenv.mkDerivation rec { - name = "xvkbd-${version}"; + pname = "xvkbd"; version = "3.9"; src = fetchurl { url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz"; diff --git a/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix b/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix index b6b87fffb47b..7b30e5c58155 100644 --- a/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix +++ b/nixpkgs/pkgs/tools/X11/xwinmosaic/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.2"; - name = "xwinmosaic-${version}"; + pname = "xwinmosaic"; src = fetchgit { url = "https://github.com/soulthreads/xwinmosaic/"; diff --git a/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix index dbbdb0c04e91..b9d48f545749 100644 --- a/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix +++ b/nixpkgs/pkgs/tools/X11/xwinwrap/default.nix @@ -4,7 +4,8 @@ let version = "4"; in stdenv.mkDerivation { - name = "xwinwrap-${version}"; + pname = "xwinwrap"; + inherit version; src = fetchbzr { url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel; diff --git a/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix index 827a19d4bed7..6e89421d390b 100644 --- a/nixpkgs/pkgs/tools/admin/acme.sh/default.nix +++ b/nixpkgs/pkgs/tools/admin/acme.sh/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }: stdenv.mkDerivation rec { - name = "acme.sh-${version}"; + pname = "acme.sh"; version = "2.8.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/admin/adtool/default.nix b/nixpkgs/pkgs/tools/admin/adtool/default.nix index 7ece3acbd679..5522fd7a68be 100644 --- a/nixpkgs/pkgs/tools/admin/adtool/default.nix +++ b/nixpkgs/pkgs/tools/admin/adtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openldap }: stdenv.mkDerivation rec { - name = "adtool-${version}"; + pname = "adtool"; version = "1.3.3"; src = fetchurl { - url = "https://gp2x.org/adtool/${name}.tar.gz"; + url = "https://gp2x.org/adtool/${pname}-${version}.tar.gz"; sha256 = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n"; }; diff --git a/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 02386a135f11..b3e688c681d9 100644 --- a/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, lib, ... }: buildGoPackage rec { - name = "amazon-ecr-credential-helper-${version}"; + pname = "amazon-ecr-credential-helper"; version = "0.3.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; diff --git a/nixpkgs/pkgs/tools/admin/aws-env/default.nix b/nixpkgs/pkgs/tools/admin/aws-env/default.nix index 37bf0e6c45d3..dff375207976 100644 --- a/nixpkgs/pkgs/tools/admin/aws-env/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-env/default.nix @@ -3,7 +3,6 @@ buildGoPackage rec { pname = "aws-env"; version = "0.4"; - name = "${pname}-${version}"; rev = "v${version}"; goPackagePath = "github.com/Droplr/aws-env"; diff --git a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix index e03e7f345351..70f1c64c7f27 100644 --- a/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "aws-rotate-key-${version}"; + pname = "aws-rotate-key"; version = "1.0.4"; goPackagePath = "github.com/Fullscreen/aws-rotate-key"; diff --git a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 03b0ff5c0016..ddecd15b6ade 100644 --- a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,6 +1,5 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "aws-vault"; version = "4.5.1"; diff --git a/nixpkgs/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix index b07db4472627..33526ba11dfc 100644 --- a/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.170"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.215"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "12kh62imdfy8whvqzdrmdq4zw70gj1g3smqldf4lqpjfzss7cy92"; + sha256 = "13r32z8iyza4gvpf81l6l2ywv37yxi4bb08ry7cli5m6ny9xqlq8"; }; # No tests included diff --git a/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix b/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix index 8b6395d85d04..f97a6e5df891 100644 --- a/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/bluemix-cli/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bluemix-cli-${version}"; + pname = "bluemix-cli"; version = "0.8.0"; src = diff --git a/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix index 3ac9e3c0e946..e4b27d98dff9 100644 --- a/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix +++ b/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxslt, docbook_xsl, libcap }: stdenv.mkDerivation rec { - name = "bubblewrap-${version}"; + pname = "bubblewrap"; version = "0.3.3"; src = fetchurl { - url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"; }; diff --git a/nixpkgs/pkgs/tools/admin/cli53/default.nix b/nixpkgs/pkgs/tools/admin/cli53/default.nix index e6ce5d077984..61f284cf85f1 100644 --- a/nixpkgs/pkgs/tools/admin/cli53/default.nix +++ b/nixpkgs/pkgs/tools/admin/cli53/default.nix @@ -2,7 +2,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "cli53-${version}"; + pname = "cli53"; version = "0.8.12"; goPackagePath = "github.com/barnybug/cli53"; diff --git a/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix index 71bef3805441..a71958f8a099 100644 --- a/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "docker-credential-gcr-${version}"; + pname = "docker-credential-gcr"; version = "1.4.3"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index aaf59d72f980..4a4d738f04d1 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0vyz02yli2lnzzzzy8dv9y5g69ljr671p1lgx84z8ys2ihwj3yc3"; + sha256 = "1h7fyxlwa9f9r08rpl05r62ap7h7viaqchldbnv7j3vs2j23k127"; }; modSha256 = "17bb1k18x1xfq9bi9qbm8pln6h6pkhaqzy07qdvnhinmspll1695"; diff --git a/nixpkgs/pkgs/tools/admin/fastlane/default.nix b/nixpkgs/pkgs/tools/admin/fastlane/default.nix index 3dbc8eea87b1..afb044ad583a 100644 --- a/nixpkgs/pkgs/tools/admin/fastlane/default.nix +++ b/nixpkgs/pkgs/tools/admin/fastlane/default.nix @@ -1,14 +1,13 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fastlane"; version = (import ./gemset.nix).fastlane.version; nativeBuildInputs = [ makeWrapper ]; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; inherit pname ruby; gemdir = ./.; }; diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 91f233df81d2..b35fe709f95a 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -29,10 +29,10 @@ let }.${system}; in stdenv.mkDerivation rec { - name = "google-cloud-sdk-${version}"; + pname = "google-cloud-sdk"; version = "255.0.0"; - src = fetchurl (sources name stdenv.hostPlatform.system); + src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); buildInputs = [ python makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/admin/iamy/default.nix b/nixpkgs/pkgs/tools/admin/iamy/default.nix index d4ee4d612932..e09cd2f52853 100644 --- a/nixpkgs/pkgs/tools/admin/iamy/default.nix +++ b/nixpkgs/pkgs/tools/admin/iamy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "iamy-${version}"; + pname = "iamy"; version = "2.3.2"; goPackagePath = "github.com/99designs/iamy"; diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index ebdf6b17ed66..2df63ea1e15a 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -20,7 +20,7 @@ let in stdenv.mkDerivation rec { inherit version; - name = "pulumi-${version}"; + pname = "pulumi"; src = fetchurl pulumiArchPackage.${stdenv.hostPlatform.system}; diff --git a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index b246c7712ec9..3365d87bba4a 100644 --- a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec{ - name = "scaleway-cli-${version}"; + pname = "scaleway-cli"; version = "1.17"; goPackagePath = "github.com/scaleway/scaleway-cli"; diff --git a/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix b/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix index f8e893078157..e6a83c397c57 100644 --- a/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/nixpkgs/pkgs/tools/admin/ssl-cert-check/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { pname = "ssl-cert-check"; - name = "${pname}-${version}"; version = "3.31"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/nixpkgs/pkgs/tools/admin/tigervnc/default.nix index 37a0f47c7afe..5a964a7fe70d 100644 --- a/nixpkgs/pkgs/tools/admin/tigervnc/default.nix +++ b/nixpkgs/pkgs/tools/admin/tigervnc/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.9.0"; - name = "tigervnc-${version}"; + pname = "tigervnc"; src = fetchFromGitHub { owner = "TigerVNC"; diff --git a/nixpkgs/pkgs/tools/admin/vncdo/default.nix b/nixpkgs/pkgs/tools/admin/vncdo/default.nix index 0d983ad98ea1..538464499fa6 100644 --- a/nixpkgs/pkgs/tools/admin/vncdo/default.nix +++ b/nixpkgs/pkgs/tools/admin/vncdo/default.nix @@ -4,7 +4,6 @@ pythonPackages.buildPythonPackage rec { pname = "vncdo"; version = "0.11.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sibson"; diff --git a/nixpkgs/pkgs/tools/archivers/afio/default.nix b/nixpkgs/pkgs/tools/archivers/afio/default.nix index 0014febf40e4..13da95a28b5d 100644 --- a/nixpkgs/pkgs/tools/archivers/afio/default.nix +++ b/nixpkgs/pkgs/tools/archivers/afio/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.5.2"; - name = "afio-${version}"; + pname = "afio"; src = fetchurl { - url = "http://members.chello.nl/~k.holtman/${name}.tgz"; + url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz"; sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; }; diff --git a/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix index cb73233dcb46..3f958f7f958d 100644 --- a/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix +++ b/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix @@ -6,7 +6,8 @@ let version = "0.8.5"; in stdenv.mkDerivation { - name = "fsarchiver-${version}"; + pname = "fsarchiver"; + inherit version; src = fetchFromGitHub { owner = "fdupoux"; diff --git a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix index c2e7f75fc7fc..caf507670f4f 100644 --- a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, acl }: stdenv.mkDerivation rec { - name = "gnutar-${version}"; + pname = "gnutar"; version = "1.32"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/archivers/p7zip/default.nix b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix index 3b212b186aac..465bc474a9e5 100644 --- a/nixpkgs/pkgs/tools/archivers/p7zip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/p7zip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "p7zip-${version}"; + pname = "p7zip"; version = "16.02"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/archivers/runzip/default.nix b/nixpkgs/pkgs/tools/archivers/runzip/default.nix index f99ee963dbe6..b9eaf3dba65e 100644 --- a/nixpkgs/pkgs/tools/archivers/runzip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/runzip/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4"; - name = "runzip-${version}"; + pname = "runzip"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libzip ]; diff --git a/nixpkgs/pkgs/tools/archivers/s-tar/default.nix b/nixpkgs/pkgs/tools/archivers/s-tar/default.nix index d53499007569..48e5cc6c4361 100644 --- a/nixpkgs/pkgs/tools/archivers/s-tar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/s-tar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "s-tar-${version}"; + pname = "s-tar"; version = "1.6"; src = fetchurl { url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/archivers/unarj/default.nix b/nixpkgs/pkgs/tools/archivers/unarj/default.nix index 217a8ab35a9e..61e60996e759 100644 --- a/nixpkgs/pkgs/tools/archivers/unarj/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unarj/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "unarj-${version}"; + pname = "unarj"; version = "2.65"; src = fetchurl { sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz"; }; preInstall = '' diff --git a/nixpkgs/pkgs/tools/archivers/undmg/default.nix b/nixpkgs/pkgs/tools/archivers/undmg/default.nix index 89bb816aa579..9d072c9bb192 100644 --- a/nixpkgs/pkgs/tools/archivers/undmg/default.nix +++ b/nixpkgs/pkgs/tools/archivers/undmg/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; - name = "undmg-${version}"; + pname = "undmg"; src = fetchFromGitHub { owner = "matthewbauer"; diff --git a/nixpkgs/pkgs/tools/archivers/unp/default.nix b/nixpkgs/pkgs/tools/archivers/unp/default.nix index b9c549d670bf..e1cac4fc61f7 100644 --- a/nixpkgs/pkgs/tools/archivers/unp/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unp/default.nix @@ -8,7 +8,7 @@ let runtime_bins = [ file unzip gzip ] ++ extraBackends; in stdenv.mkDerivation rec { - name = "unp-${version}"; + pname = "unp"; version = "2.0-pre7"; buildInputs = [ perl makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/nixpkgs/pkgs/tools/archivers/unrar/default.nix index 2a51e4d7bc90..07f62fa02ad4 100644 --- a/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "unrar-${version}"; + pname = "unrar"; version = "5.7.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/archivers/unshield/default.nix b/nixpkgs/pkgs/tools/archivers/unshield/default.nix index 3febb557bf8b..cfab2443032b 100644 --- a/nixpkgs/pkgs/tools/archivers/unshield/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unshield/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, zlib, openssl }: stdenv.mkDerivation rec { - name = "unshield-${version}"; + pname = "unshield"; version = "1.4.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/archivers/wimlib/default.nix b/nixpkgs/pkgs/tools/archivers/wimlib/default.nix index 3c52e1944d8f..9d58bf5c2f89 100644 --- a/nixpkgs/pkgs/tools/archivers/wimlib/default.nix +++ b/nixpkgs/pkgs/tools/archivers/wimlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { version = "1.13.1"; - name = "wimlib-${version}"; + pname = "wimlib"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl fuse libxml2 ntfs3g ]; src = fetchurl { - url = "https://wimlib.net/downloads/${name}.tar.gz"; + url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27"; }; diff --git a/nixpkgs/pkgs/tools/archivers/xarchive/default.nix b/nixpkgs/pkgs/tools/archivers/xarchive/default.nix index 07e76ea7f62a..ff98e96655fa 100644 --- a/nixpkgs/pkgs/tools/archivers/xarchive/default.nix +++ b/nixpkgs/pkgs/tools/archivers/xarchive/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.2.8-6"; - name = "xarchive-${version}"; + pname = "xarchive"; src = fetchurl { - url = "mirror://sourceforge/xarchive/${name}.tar.gz"; + url = "mirror://sourceforge/xarchive/${pname}-${version}.tar.gz"; sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4"; }; diff --git a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix index 9860c2b34bd4..07684155a7e8 100644 --- a/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix +++ b/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.5.4.14"; - name = "xarchiver-${version}"; + pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; diff --git a/nixpkgs/pkgs/tools/archivers/zpaq/default.nix b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix index c99221b36ba1..09c4e914bd88 100644 --- a/nixpkgs/pkgs/tools/archivers/zpaq/default.nix +++ b/nixpkgs/pkgs/tools/archivers/zpaq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl, unzip }: stdenv.mkDerivation rec { - name = "zpaq-${version}"; + pname = "zpaq"; version = "7.15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix index 6c587f5cc5c6..39ad4626f3eb 100644 --- a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }: stdenv.mkDerivation rec { - name = "abcm2ps-${version}"; + pname = "abcm2ps"; version = "8.14.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 4bb9dd885743..773b09958ea7 100644 --- a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "abcMIDI-${version}"; + pname = "abcMIDI"; version = "2019.08.11"; src = fetchzip { - url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; + url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1"; }; diff --git a/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix b/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix index 502859cd52d3..4590a0dfbc30 100644 --- a/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix +++ b/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libsndfile }: stdenv.mkDerivation rec { - name = "accuraterip-checksum-${version}"; + pname = "accuraterip-checksum"; version = "1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 4c28c4f3458f..acd205a30de1 100644 --- a/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: stdenv.mkDerivation rec { - name = "acoustid-fingerprinter-${version}"; + pname = "acoustid-fingerprinter"; version = "0.6"; src = fetchurl { url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" - + "${name}.tar.gz"; + + "${pname}-${version}.tar.gz"; sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; diff --git a/nixpkgs/pkgs/tools/audio/aucdtect/default.nix b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix index 825e1a0cc072..21adf3b972a5 100644 --- a/nixpkgs/pkgs/tools/audio/aucdtect/default.nix +++ b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix @@ -3,7 +3,7 @@ with lib; stdenv.mkDerivation rec { - name = "aucdtext-${version}"; + pname = "aucdtext"; version = "0.8-2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix index 38902f234a2b..75d8975ab32c 100644 --- a/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/nixpkgs/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "beets-alternatives-${version}"; + pname = "beets-alternatives"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/darkice/default.nix b/nixpkgs/pkgs/tools/audio/darkice/default.nix index 3cfb9a05b2dc..c5f7bcd5a71d 100644 --- a/nixpkgs/pkgs/tools/audio/darkice/default.nix +++ b/nixpkgs/pkgs/tools/audio/darkice/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "darkice-${version}"; + pname = "darkice"; version = "1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix index 169f419cd672..d6c988ef0bed 100644 --- a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix +++ b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix @@ -2,7 +2,8 @@ let version = "0.12.2"; in stdenv.mkDerivation rec { - name = "dir2opus-${version}"; + pname = "dir2opus"; + inherit version; pythonPath = [ mutagen ]; buildInputs = [ wrapPython ]; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d"; }; diff --git a/nixpkgs/pkgs/tools/audio/ezstream/default.nix b/nixpkgs/pkgs/tools/audio/ezstream/default.nix index 6524bedf9392..fbf90d2211c4 100644 --- a/nixpkgs/pkgs/tools/audio/ezstream/default.nix +++ b/nixpkgs/pkgs/tools/audio/ezstream/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }: stdenv.mkDerivation rec { - name = "ezstream-${version}"; + pname = "ezstream"; version = "0.6.0"; src = fetchurl { - url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz"; + url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${pname}-${version}.tar.gz"; sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9"; }; diff --git a/nixpkgs/pkgs/tools/audio/glyr/default.nix b/nixpkgs/pkgs/tools/audio/glyr/default.nix index 23a33122c9fb..665e2da3329c 100644 --- a/nixpkgs/pkgs/tools/audio/glyr/default.nix +++ b/nixpkgs/pkgs/tools/audio/glyr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.0.10"; - name = "glyr-${version}"; + pname = "glyr"; src = fetchFromGitHub { owner = "sahib"; diff --git a/nixpkgs/pkgs/tools/audio/mpdas/default.nix b/nixpkgs/pkgs/tools/audio/mpdas/default.nix index 08bd864792bb..bfb4f81c8166 100644 --- a/nixpkgs/pkgs/tools/audio/mpdas/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdas/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }: stdenv.mkDerivation rec { - name = "mpdas-${version}"; + pname = "mpdas"; version = "0.4.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix index 5b5a0d9c0e0a..3b59d5aceb05 100644 --- a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix @@ -8,7 +8,7 @@ let }; in stdenv.mkDerivation rec { version = "20161228"; - name = "mpdcron-${version}"; + pname = "mpdcron"; src = fetchFromGitHub { owner = "alip"; diff --git a/nixpkgs/pkgs/tools/audio/mpdris2/default.nix b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix index 4b72ed3bfd30..d13dfbe8f43d 100644 --- a/nixpkgs/pkgs/tools/audio/mpdris2/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpdris2/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "mpDris2"; - name = "${pname}-${version}"; version = "0.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/nixpkgs/pkgs/tools/audio/pasystray/default.nix index c0f0aa1bf938..782ea314359d 100644 --- a/nixpkgs/pkgs/tools/audio/pasystray/default.nix +++ b/nixpkgs/pkgs/tools/audio/pasystray/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pasystray-${version}"; + pname = "pasystray"; version = "0.7.1"; src = fetchFromGitHub { owner = "christophgysin"; repo = "pasystray"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"; }; diff --git a/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/nixpkgs/pkgs/tools/audio/playerctl/default.nix index cda89302abdd..8a8cd2581455 100644 --- a/nixpkgs/pkgs/tools/audio/playerctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/playerctl/default.nix @@ -1,7 +1,7 @@ { stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }: stdenv.mkDerivation rec { - name = "playerctl-${version}"; + pname = "playerctl"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/pnmixer/default.nix b/nixpkgs/pkgs/tools/audio/pnmixer/default.nix index 9906fa449dda..5b27a00a9556 100644 --- a/nixpkgs/pkgs/tools/audio/pnmixer/default.nix +++ b/nixpkgs/pkgs/tools/audio/pnmixer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { - name = "pnmixer-${version}"; + pname = "pnmixer"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/audio/qastools/default.nix b/nixpkgs/pkgs/tools/audio/qastools/default.nix index d86a0b09c269..bdc431bcb928 100644 --- a/nixpkgs/pkgs/tools/audio/qastools/default.nix +++ b/nixpkgs/pkgs/tools/audio/qastools/default.nix @@ -5,7 +5,8 @@ let in mkDerivation { - name = "qastools-${version}"; + pname = "qastools"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/audio/trx/default.nix b/nixpkgs/pkgs/tools/audio/trx/default.nix index a4dd7197be0f..d72cb8564373 100644 --- a/nixpkgs/pkgs/tools/audio/trx/default.nix +++ b/nixpkgs/pkgs/tools/audio/trx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }: stdenv.mkDerivation rec { - name = "trx-unstable-${version}"; + pname = "trx-unstable"; version = "2018-01-23"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix index ed9558762502..36afd11aa2c3 100644 --- a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix +++ b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix @@ -1,7 +1,7 @@ { pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }: stdenv.mkDerivation rec { - name = "volumeicon-${version}"; + pname = "volumeicon"; version = "0.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/backup/bareos/default.nix b/nixpkgs/pkgs/tools/backup/bareos/default.nix index ad0001f22e17..ce77ebe8c1ae 100644 --- a/nixpkgs/pkgs/tools/backup/bareos/default.nix +++ b/nixpkgs/pkgs/tools/backup/bareos/default.nix @@ -11,14 +11,14 @@ let withGlusterfs = "\${with_glusterfs_directory}"; in stdenv.mkDerivation rec { - name = "bareos-${version}"; + pname = "bareos"; version = "17.2.7"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; - name = "${name}-src"; + name = "${pname}-${version}-src"; sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz"; }; diff --git a/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/nixpkgs/pkgs/tools/backup/btrbk/default.nix index 91809af415a3..963d7945b89d 100644 --- a/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -2,11 +2,11 @@ , utillinux, asciidoc, asciidoctor, makeWrapper }: stdenv.mkDerivation rec { - name = "btrbk-${version}"; + pname = "btrbk"; version = "0.28.3"; src = fetchurl { - url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; + url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz"; }; diff --git a/nixpkgs/pkgs/tools/backup/bup/default.nix b/nixpkgs/pkgs/tools/backup/bup/default.nix index bf10f556b6bb..8f4cd60e1ee0 100644 --- a/nixpkgs/pkgs/tools/backup/bup/default.nix +++ b/nixpkgs/pkgs/tools/backup/bup/default.nix @@ -10,7 +10,8 @@ let version = "0.29.2"; in with stdenv.lib; stdenv.mkDerivation rec { - name = "bup-${version}"; + pname = "bup"; + inherit version; src = fetchFromGitHub { repo = "bup"; diff --git a/nixpkgs/pkgs/tools/backup/burp/default.nix b/nixpkgs/pkgs/tools/backup/burp/default.nix index 8aa2d015205e..5c0be4a2de7d 100644 --- a/nixpkgs/pkgs/tools/backup/burp/default.nix +++ b/nixpkgs/pkgs/tools/backup/burp/default.nix @@ -2,7 +2,7 @@ , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { - name = "burp-${version}"; + pname = "burp"; version = "2.2.18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/chunksync/default.nix b/nixpkgs/pkgs/tools/backup/chunksync/default.nix index 3ab1eba5b6f0..736a3122a6f0 100644 --- a/nixpkgs/pkgs/tools/backup/chunksync/default.nix +++ b/nixpkgs/pkgs/tools/backup/chunksync/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "chunksync-${version}"; + pname = "chunksync"; src = fetchurl { url = "https://chunksync.florz.de/chunksync_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/backup/dar/default.nix b/nixpkgs/pkgs/tools/backup/dar/default.nix index ac01dc6022b8..352f320dadf1 100644 --- a/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -4,10 +4,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.6.5"; - name = "dar-${version}"; + pname = "dar"; src = fetchurl { - url = "mirror://sourceforge/dar/${name}.tar.gz"; + url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd"; }; diff --git a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix index 3a5ffc30f8f2..97d876da1279 100644 --- a/nixpkgs/pkgs/tools/backup/diskrsync/default.nix +++ b/nixpkgs/pkgs/tools/backup/diskrsync/default.nix @@ -1,8 +1,6 @@ { buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }: buildGoPackage rec { - - name = "${pname}-${version}"; pname = "diskrsync"; version = "unstable-2018-02-03"; diff --git a/nixpkgs/pkgs/tools/backup/duplicati/default.nix b/nixpkgs/pkgs/tools/backup/duplicati/default.nix index c774711b874c..be039fa47c09 100644 --- a/nixpkgs/pkgs/tools/backup/duplicati/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicati/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, mono, sqlite, makeWrapper }: stdenv.mkDerivation rec { - name = "duplicati-${version}"; + pname = "duplicati"; version = "2.0.4.5"; channel = "beta"; build_date = "2018-11-28"; @@ -15,14 +15,14 @@ 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/duplicati-cli \ - --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \ + --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ sqlite ]} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ - --add-flags "$out/share/${name}/Duplicati.Server.exe" \ + --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ sqlite ]} ''; diff --git a/nixpkgs/pkgs/tools/backup/duply/default.nix b/nixpkgs/pkgs/tools/backup/duply/default.nix index d476b797f38e..3e4375cb76c6 100644 --- a/nixpkgs/pkgs/tools/backup/duply/default.nix +++ b/nixpkgs/pkgs/tools/backup/duply/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "duply-${version}"; + pname = "duply"; version = "2.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/backup/easysnap/default.nix b/nixpkgs/pkgs/tools/backup/easysnap/default.nix index ceb6feae3962..412c9696d02a 100644 --- a/nixpkgs/pkgs/tools/backup/easysnap/default.nix +++ b/nixpkgs/pkgs/tools/backup/easysnap/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, zfs }: stdenv.mkDerivation rec { - name = "easysnap-${version}"; + pname = "easysnap"; version = "unstable-2019-02-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/flockit/default.nix b/nixpkgs/pkgs/tools/backup/flockit/default.nix index 224b8b12906e..739f14ca1a61 100644 --- a/nixpkgs/pkgs/tools/backup/flockit/default.nix +++ b/nixpkgs/pkgs/tools/backup/flockit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { - name = "flockit-${version}"; + pname = "flockit"; version = "2012-08-11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/httrack/default.nix b/nixpkgs/pkgs/tools/backup/httrack/default.nix index 6d761354b6af..6fe614195a4b 100644 --- a/nixpkgs/pkgs/tools/backup/httrack/default.nix +++ b/nixpkgs/pkgs/tools/backup/httrack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.49.2"; - name = "httrack-${version}"; + pname = "httrack"; src = fetchurl { url = "https://mirror.httrack.com/httrack-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/backup/httrack/qt.nix b/nixpkgs/pkgs/tools/backup/httrack/qt.nix index e29acc6f3c85..8cf3eb29462c 100644 --- a/nixpkgs/pkgs/tools/backup/httrack/qt.nix +++ b/nixpkgs/pkgs/tools/backup/httrack/qt.nix @@ -2,11 +2,11 @@ , httrack, qtbase, qtmultimedia }: stdenv.mkDerivation rec { - name = "httraqt-${version}"; + pname = "httraqt"; version = "1.4.9"; src = fetchurl { - url = "mirror://sourceforge/httraqt/${name}.tar.gz"; + url = "mirror://sourceforge/httraqt/${pname}-${version}.tar.gz"; sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b"; }; diff --git a/nixpkgs/pkgs/tools/backup/mydumper/default.nix b/nixpkgs/pkgs/tools/backup/mydumper/default.nix index e87878551254..5538b45c5f1b 100644 --- a/nixpkgs/pkgs/tools/backup/mydumper/default.nix +++ b/nixpkgs/pkgs/tools/backup/mydumper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.5"; - name = "mydumper-${version}"; + pname = "mydumper"; src = fetchFromGitHub { owner = "maxbube"; diff --git a/nixpkgs/pkgs/tools/backup/ori/default.nix b/nixpkgs/pkgs/tools/backup/ori/default.nix index 279652b0cd0b..e07eb33abb58 100644 --- a/nixpkgs/pkgs/tools/backup/ori/default.nix +++ b/nixpkgs/pkgs/tools/backup/ori/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.1"; - name = "ori-${version}"; + pname = "ori"; src = fetchurl { url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz"; diff --git a/nixpkgs/pkgs/tools/backup/partclone/default.nix b/nixpkgs/pkgs/tools/backup/partclone/default.nix index 021f783e0fdd..fa4346c8cccc 100644 --- a/nixpkgs/pkgs/tools/backup/partclone/default.nix +++ b/nixpkgs/pkgs/tools/backup/partclone/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "partclone-${version}"; + pname = "partclone"; version = "0.3.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix b/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix index 712d0af29a95..98eae9cc6702 100644 --- a/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "percona-xtrabackup-${version}"; + pname = "percona-xtrabackup"; version = "2.4.12"; src = fetchFromGitHub { owner = "percona"; repo = "percona-xtrabackup"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan"; }; diff --git a/nixpkgs/pkgs/tools/backup/rdup/default.nix b/nixpkgs/pkgs/tools/backup/rdup/default.nix index 33e3c77db887..56f9c4f9dafe 100644 --- a/nixpkgs/pkgs/tools/backup/rdup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }: stdenv.mkDerivation rec { - name = "rdup-${version}"; + pname = "rdup"; version = "1.1.15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/restic/default.nix b/nixpkgs/pkgs/tools/backup/restic/default.nix index da44e389bdd5..b78fc9b61f74 100644 --- a/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "restic-${version}"; + pname = "restic"; version = "0.9.5"; goPackagePath = "github.com/restic/restic"; diff --git a/nixpkgs/pkgs/tools/backup/restic/rest-server.nix b/nixpkgs/pkgs/tools/backup/restic/rest-server.nix index d9f889897aa2..c7f12cb751b2 100644 --- a/nixpkgs/pkgs/tools/backup/restic/rest-server.nix +++ b/nixpkgs/pkgs/tools/backup/restic/rest-server.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "restic-rest-server-${version}"; + pname = "restic-rest-server"; version = "0.9.7"; goPackagePath = "github.com/restic/rest-server"; diff --git a/nixpkgs/pkgs/tools/backup/rsbep/default.nix b/nixpkgs/pkgs/tools/backup/rsbep/default.nix index 96bbea4791e8..4c13c831ba94 100644 --- a/nixpkgs/pkgs/tools/backup/rsbep/default.nix +++ b/nixpkgs/pkgs/tools/backup/rsbep/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, coreutils, gnused, gawk, fetchurl }: stdenv.mkDerivation rec { - name = "rsbep-${version}"; + pname = "rsbep"; version = "0.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/backup/store-backup/default.nix b/nixpkgs/pkgs/tools/backup/store-backup/default.nix index 7324f75d95fa..a0f568b16b3e 100644 --- a/nixpkgs/pkgs/tools/backup/store-backup/default.nix +++ b/nixpkgs/pkgs/tools/backup/store-backup/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "3.5"; - name = "store-backup-${version}"; + pname = "store-backup"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/backup/tarsnap/default.nix b/nixpkgs/pkgs/tools/backup/tarsnap/default.nix index 3767a377cfcf..d24da778dcdb 100644 --- a/nixpkgs/pkgs/tools/backup/tarsnap/default.nix +++ b/nixpkgs/pkgs/tools/backup/tarsnap/default.nix @@ -7,7 +7,7 @@ let }; in stdenv.mkDerivation rec { - name = "tarsnap-${version}"; + pname = "tarsnap"; version = "1.0.39"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/backup/wal-e/default.nix b/nixpkgs/pkgs/tools/backup/wal-e/default.nix index 42a3f51ee609..9c7cb0a83fd6 100644 --- a/nixpkgs/pkgs/tools/backup/wal-e/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-e/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }: pythonPackages.buildPythonApplication rec { - name = "wal-e-${version}"; + pname = "wal-e"; version = "0.6.10"; namePrefix = ""; diff --git a/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/nixpkgs/pkgs/tools/backup/wal-g/default.nix index ce9237a7c6bc..70cc8a425c16 100644 --- a/nixpkgs/pkgs/tools/backup/wal-g/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-g/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, brotli }: buildGoPackage rec { - name = "wal-g-${version}"; + pname = "wal-g"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/backup/zbackup/default.nix b/nixpkgs/pkgs/tools/backup/zbackup/default.nix index c9fb1c547260..928ba9842b25 100644 --- a/nixpkgs/pkgs/tools/backup/zbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/zbackup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : stdenv.mkDerivation rec { - name = "zbackup-${version}"; + pname = "zbackup"; version = "1.4.4"; src = fetchurl { url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz"; diff --git a/nixpkgs/pkgs/tools/backup/znapzend/default.nix b/nixpkgs/pkgs/tools/backup/znapzend/default.nix index 05792ecbb128..973e92176443 100644 --- a/nixpkgs/pkgs/tools/backup/znapzend/default.nix +++ b/nixpkgs/pkgs/tools/backup/znapzend/default.nix @@ -24,7 +24,8 @@ let checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in stdenv.mkDerivation rec { - name = "znapzend-${version}"; + pname = "znapzend"; + inherit version; src = fetchFromGitHub { owner = "oetiker"; diff --git a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 84a2375302f7..b28e50d54b07 100644 --- a/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -8,11 +8,11 @@ let binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; in stdenv.mkDerivation rec { - name = "blueman-${version}"; + pname = "blueman"; version = "2.0.8"; src = fetchurl { - url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4"; }; diff --git a/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix index f13db4572e08..097b7ae00d78 100644 --- a/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bluez-alsa-${version}"; + pname = "bluez-alsa"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 0cdcd4c58df4..4ddc75542945 100644 --- a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation rec { - name = "refind-${version}"; + pname = "refind"; version = "0.11.4"; srcName = "refind-src-${version}"; diff --git a/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix b/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix index 63a429e50de8..ccf632dfe5a5 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/bashburn/default.nix @@ -3,13 +3,13 @@ , vorbis-tools, xorriso }: stdenv.mkDerivation rec { - name = "bashburn-${version}"; + pname = "bashburn"; version = "3.1.0"; src = fetchurl { sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp"; url = "http://bashburn.dose.se/index.php?s=file_download&id=25"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ utillinux ]; diff --git a/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix b/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix index aa47edcb96c4..b4f0d1039edc 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bchunk-${version}"; + pname = "bchunk"; version = "1.2.2"; src = fetchurl { - url = "http://he.fi/bchunk/${name}.tar.gz"; + url = "http://he.fi/bchunk/${pname}-${version}.tar.gz"; sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7"; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix b/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix index 402073ff5241..a9f5b321d3d7 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/brasero/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { version = "${major}.${minor}"; - name = "brasero-${version}"; + pname = "brasero"; src = fetchurl { - url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; + url = "http://download.gnome.org/sources/brasero/${major}/${pname}-${version}.tar.xz"; sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix index a65f2d47d8f8..00a1864b0357 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cdi2iso-${version}"; + pname = "cdi2iso"; version = "0.1"; src = fetchurl { - url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz"; + url = "mirror://sourceforge/cdi2iso.berlios/${pname}-${version}-src.tar.gz"; sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh"; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix index 888711a85014..d617a9a6c542 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "cdimgtools-${version}"; + pname = "cdimgtools"; version = "0.3"; src = fetchFromRepoOrCz { diff --git a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix index 6523c8a0cf3f..970b32eb08fb 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cue2pops-${version}"; + pname = "cue2pops"; version = "git-2018-01-04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix index 99908f06b101..2cb90129ed9a 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dvd-vr-${version}"; + pname = "dvd-vr"; version = "0.9.7"; src = fetchurl { url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix index 82f1842e963e..6a4161ba1faa 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dvdisaster-${version}"; + pname = "dvdisaster"; version = "0.79.5"; src = fetchurl { - url = "http://dvdisaster.net/downloads/${name}.tar.bz2"; + url = "http://dvdisaster.net/downloads/${pname}-${version}.tar.bz2"; sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix index ec814d97bde0..922ab39063a0 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ecm-tools-${version}"; + pname = "ecm-tools"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix index 56ec8e19f54e..09fbc8b38c87 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -4,7 +4,8 @@ let version = "0.17"; in stdenv.mkDerivation { - name = "lsdvd-${version}"; + pname = "lsdvd"; + inherit version; src = fetchurl { url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; diff --git a/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix index f33ba31beee8..dbad9d362478 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit}: stdenv.mkDerivation rec { - name = "mdf2iso-${version}"; + pname = "mdf2iso"; version = "0.3.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix b/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix index 0a9d61e9da8e..357992d72916 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mkcue-${version}"; + pname = "mkcue"; version = "1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix index 98853d1ba61a..43ed7ea7d389 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "nrg2iso-${version}"; + pname = "nrg2iso"; version = "0.4"; src = fetchurl { - url = "http://gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz"; + url = "http://gregory.kokanosky.free.fr/v4/linux/${pname}-${version}.tar.gz"; sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115"; }; diff --git a/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix b/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix index 502937dd565b..9495f8dac996 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -2,7 +2,7 @@ , p7zip, mtools, syslinux }: stdenv.mkDerivation rec { - name = "unetbootin-${version}"; + pname = "unetbootin"; version = "661"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/compression/advancecomp/default.nix b/nixpkgs/pkgs/tools/compression/advancecomp/default.nix index 4f288b9e56f8..8bee8059fe27 100644 --- a/nixpkgs/pkgs/tools/compression/advancecomp/default.nix +++ b/nixpkgs/pkgs/tools/compression/advancecomp/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, zlib }: stdenv.mkDerivation rec { - name = "advancecomp-${version}"; + pname = "advancecomp"; version = "2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/compression/brotli/default.nix b/nixpkgs/pkgs/tools/compression/brotli/default.nix index a3987085c8e3..33b6f12cd46c 100644 --- a/nixpkgs/pkgs/tools/compression/brotli/default.nix +++ b/nixpkgs/pkgs/tools/compression/brotli/default.nix @@ -3,7 +3,7 @@ # ?TODO: there's also python lib in there stdenv.mkDerivation rec { - name = "brotli-${version}"; + pname = "brotli"; version = "1.0.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/compression/bsc/default.nix b/nixpkgs/pkgs/tools/compression/bsc/default.nix index 4c88e58e6c10..c1ddb242dad0 100644 --- a/nixpkgs/pkgs/tools/compression/bsc/default.nix +++ b/nixpkgs/pkgs/tools/compression/bsc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openmp ? null }: stdenv.mkDerivation rec { - name = "bsc-${version}"; + pname = "bsc"; version = "3.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/compression/bsdiff/default.nix b/nixpkgs/pkgs/tools/compression/bsdiff/default.nix index 617d86e7f1e3..a5b527d70b7f 100644 --- a/nixpkgs/pkgs/tools/compression/bsdiff/default.nix +++ b/nixpkgs/pkgs/tools/compression/bsdiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bzip2 }: stdenv.mkDerivation rec { - name = "bsdiff-${version}"; + pname = "bsdiff"; version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${name}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; diff --git a/nixpkgs/pkgs/tools/compression/bzip2/default.nix b/nixpkgs/pkgs/tools/compression/bzip2/default.nix index a0ec6c07055b..a440c08bd1bb 100644 --- a/nixpkgs/pkgs/tools/compression/bzip2/default.nix +++ b/nixpkgs/pkgs/tools/compression/bzip2/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "bzip2-${version}"; + pname = "bzip2"; version = "1.0.6.0.1"; /* We use versions patched to use autotools style properly, saving lots of trouble. */ src = fetchurl { urls = map - (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz") + (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.tar.gz") [ "http://ftp.uni-kl.de/pub/linux/suse" "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse" diff --git a/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/nixpkgs/pkgs/tools/compression/dtrx/default.nix index c9ec557ab1f4..19bc2fdc1769 100644 --- a/nixpkgs/pkgs/tools/compression/dtrx/default.nix +++ b/nixpkgs/pkgs/tools/compression/dtrx/default.nix @@ -12,7 +12,7 @@ let ++ [ bzip2 xz lzip ]); in pythonPackages.buildPythonApplication rec { - name = "dtrx-${version}"; + pname = "dtrx"; version = "7.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/compression/gzip/default.nix b/nixpkgs/pkgs/tools/compression/gzip/default.nix index bd4d85e90e36..e6409f051227 100644 --- a/nixpkgs/pkgs/tools/compression/gzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/gzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "gzip-${version}"; + pname = "gzip"; version = "1.10"; src = fetchurl { - url = "mirror://gnu/gzip/${name}.tar.xz"; + url = "mirror://gnu/gzip/${pname}-${version}.tar.xz"; sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4"; }; diff --git a/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/nixpkgs/pkgs/tools/compression/lrzip/default.nix index 083a71f6a756..2c6765b2e837 100644 --- a/nixpkgs/pkgs/tools/compression/lrzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/lrzip/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.631"; - name = "lrzip-${version}"; + pname = "lrzip"; src = fetchurl { - url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2"; + url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2"; sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d"; }; diff --git a/nixpkgs/pkgs/tools/compression/lzfse/default.nix b/nixpkgs/pkgs/tools/compression/lzfse/default.nix index 0bf155807980..ef185f706dce 100644 --- a/nixpkgs/pkgs/tools/compression/lzfse/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzfse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "lzfse-${version}"; + pname = "lzfse"; version = "2017-03-08"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/compression/lzip/default.nix b/nixpkgs/pkgs/tools/compression/lzip/default.nix index dfd91bf37d34..4ec40deab6c3 100644 --- a/nixpkgs/pkgs/tools/compression/lzip/default.nix +++ b/nixpkgs/pkgs/tools/compression/lzip/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "lzip-${version}"; + pname = "lzip"; version = "1.21"; nativeBuildInputs = [ texinfo ]; src = fetchurl { - url = "mirror://savannah/lzip/${name}.tar.gz"; + url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4"; }; diff --git a/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix b/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix index 9b9de8d8302f..28c7c1d69f70 100644 --- a/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix +++ b/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "mozlz4a"; version = "2018-08-23"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) diff --git a/nixpkgs/pkgs/tools/compression/pbzip2/default.nix b/nixpkgs/pkgs/tools/compression/pbzip2/default.nix index 1d5cd85a62e6..94ca5eb58b1f 100644 --- a/nixpkgs/pkgs/tools/compression/pbzip2/default.nix +++ b/nixpkgs/pkgs/tools/compression/pbzip2/default.nix @@ -4,10 +4,11 @@ let major = "1.1"; version = "${major}.13"; in stdenv.mkDerivation rec { - name = "pbzip2-${version}"; + pname = "pbzip2"; + inherit version; src = fetchurl { - url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg"; }; diff --git a/nixpkgs/pkgs/tools/compression/pbzx/default.nix b/nixpkgs/pkgs/tools/compression/pbzx/default.nix index bbba21f2b34d..13e5882788d1 100644 --- a/nixpkgs/pkgs/tools/compression/pbzx/default.nix +++ b/nixpkgs/pkgs/tools/compression/pbzx/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "pbzx"; version = "1.0.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "NiklasRosenstein"; repo = "pbzx"; diff --git a/nixpkgs/pkgs/tools/compression/upx/default.nix b/nixpkgs/pkgs/tools/compression/upx/default.nix index 60023d028a9f..7f9c7cb77736 100644 --- a/nixpkgs/pkgs/tools/compression/upx/default.nix +++ b/nixpkgs/pkgs/tools/compression/upx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ucl, zlib, perl }: stdenv.mkDerivation rec { - name = "upx-${version}"; + pname = "upx"; version = "3.95"; src = fetchurl { - url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz"; + url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz"; sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv"; }; diff --git a/nixpkgs/pkgs/tools/compression/xar/default.nix b/nixpkgs/pkgs/tools/compression/xar/default.nix index a794296bfd95..691f3a8ee5d8 100644 --- a/nixpkgs/pkgs/tools/compression/xar/default.nix +++ b/nixpkgs/pkgs/tools/compression/xar/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.6.1"; - name = "xar-${version}"; + pname = "xar"; src = fetchurl { - url = "https://github.com/downloads/mackyle/xar/${name}.tar.gz"; + url = "https://github.com/downloads/mackyle/xar/${pname}-${version}.tar.gz"; sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; diff --git a/nixpkgs/pkgs/tools/compression/xdelta/default.nix b/nixpkgs/pkgs/tools/compression/xdelta/default.nix index 32de493ec77d..034cdb7d94ec 100644 --- a/nixpkgs/pkgs/tools/compression/xdelta/default.nix +++ b/nixpkgs/pkgs/tools/compression/xdelta/default.nix @@ -9,7 +9,7 @@ let then "--with-${name}" else "--without-${name}"; in stdenv.mkDerivation rec { - name = "xdelta-${version}"; + pname = "xdelta"; version = "3.0.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix b/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix index c870e501209b..bf2601dd3738 100644 --- a/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix +++ b/nixpkgs/pkgs/tools/compression/xdelta/unstable.nix @@ -9,7 +9,7 @@ let then "--with-${name}" else "--without-${name}"; in stdenv.mkDerivation rec { - name = "xdelta-${version}"; + pname = "xdelta"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/compression/zopfli/default.nix b/nixpkgs/pkgs/tools/compression/zopfli/default.nix index 06c7e6439a9f..accead9db0bc 100644 --- a/nixpkgs/pkgs/tools/compression/zopfli/default.nix +++ b/nixpkgs/pkgs/tools/compression/zopfli/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { - name = "zopfli-${version}"; + pname = "zopfli"; version = "1.0.2"; src = fetchFromGitHub { owner = "google"; repo = "zopfli"; - rev = name; - name = "${name}-src"; + rev = "${pname}-${version}"; + name = "${pname}-${version}-src"; sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix index 74ba47ceee1a..137b00802dfd 100644 --- a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }: stdenv.mkDerivation rec { - name = "afpfs-ng-${version}"; + pname = "afpfs-ng"; version = "0.8.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index 35e26828176d..b95a9ad68a82 100644 --- a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, fuse, xz }: stdenv.mkDerivation rec { - name = "avfs-${version}"; + pname = "avfs"; version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix index cd0f3ea23229..d449bf1266a0 100644 --- a/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "bashmount-${version}"; + pname = "bashmount"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix index efd48fb87fe7..d3e790a3cf13 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, utillinux, bash }: stdenv.mkDerivation rec { - name = "bcache-tools-${version}"; + pname = "bcache-tools"; version = "1.0.7"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/nixpkgs/pkgs/tools/filesystems/bees/default.nix index f12e8af84b88..842ef6712ac9 100644 --- a/nixpkgs/pkgs/tools/filesystems/bees/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bees/default.nix @@ -6,7 +6,7 @@ let sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh"; bees = stdenv.mkDerivation rec { - name = "bees-${version}"; + pname = "bees"; inherit version; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index 6a9d17772c88..a8849e6af22b 100644 --- a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.14.1"; - name = "bindfs-${version}"; + pname = "bindfs"; src = fetchurl { - url = "https://bindfs.org/downloads/${name}.tar.gz"; + url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix index b5694535e946..067f200e201e 100644 --- a/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: stdenv.mkDerivation rec { - name = "blobfuse-${version}"; + pname = "blobfuse"; version = "1.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix index 9c9dbede83f4..a0983004fccd 100644 --- a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix @@ -22,7 +22,7 @@ let }; }; in stdenv.mkDerivation rec { - name = "boxfs-${version}"; + pname = "boxfs"; version = "2-20150109"; src = srcs.boxfs2; diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 2ef70ca78479..f5588cc51abc 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; + pname = "btrfs-progs"; version = "5.2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix b/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix index 6ecc65149c49..e8a4917be99f 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/generic.nix @@ -96,7 +96,8 @@ let in stdenv.mkDerivation { - name="ceph-${version}"; + pname = "ceph"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix index 47428e7f52e4..6c0a6c287031 100644 --- a/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7"; - name = "chunkfs-${version}"; + pname = "chunkfs"; src = fetchurl { url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix index 8af745ed436e..00ef368ad3da 100644 --- a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { - name = "convoy-${version}"; + pname = "convoy"; version = "0.5.0"; goPackagePath = "github.com/rancher/convoy"; diff --git a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index 71e27c94dbdb..67016af8c0d3 100644 --- a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "cryfs-${version}"; + pname = "cryfs"; version = "0.9.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix index 4952036a860b..4d40d61b5701 100644 --- a/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : stdenv.mkDerivation rec { - name = "darling-dmg-${version}"; + pname = "darling-dmg"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix index 2e4ea88df7f4..e6c4474765c3 100644 --- a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix @@ -7,7 +7,8 @@ let version = "0.7.1"; in stdenv.mkDerivation rec { - name = "dislocker-${version}"; + pname = "dislocker"; + inherit version; src = fetchFromGitHub { owner = "aorimn"; diff --git a/nixpkgs/pkgs/tools/filesystems/disorderfs/default.nix b/nixpkgs/pkgs/tools/filesystems/disorderfs/default.nix index b8028741d57f..5137719790af 100644 --- a/nixpkgs/pkgs/tools/filesystems/disorderfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/disorderfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }: stdenv.mkDerivation rec { - name = "disorderfs-${version}"; + pname = "disorderfs"; version = "0.5.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/djmount/default.nix b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix index e8deeaf4b470..e3c8c2944fba 100644 --- a/nixpkgs/pkgs/tools/filesystems/djmount/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, fuse }: stdenv.mkDerivation rec { - name = "djmount-${version}"; + pname = "djmount"; version = "0.71"; src = fetchurl { - url = "mirror://sourceforge/djmount/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/djmount/${version}/${pname}-${version}.tar.gz"; sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix index 82f64362fadf..369d2e74f301 100644 --- a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }: stdenv.mkDerivation rec { - name = "dosfstools-${version}"; + pname = "dosfstools"; version = "4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/duff/default.nix b/nixpkgs/pkgs/tools/filesystems/duff/default.nix index e1b11a370553..a61c3c80e6d2 100644 --- a/nixpkgs/pkgs/tools/filesystems/duff/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/duff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: stdenv.mkDerivation rec { - name = "duff-${version}"; + pname = "duff"; # The last release (0.5.2) is more than 2 years old and lacks features like -D, # limiting its usefulness. Upstream appears comatose if not dead. version = "2014-07-03"; diff --git a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix index 208cbb83209c..0950445bd3ec 100644 --- a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix @@ -2,7 +2,7 @@ , pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: stdenv.mkDerivation rec { - name = "duperemove-${version}"; + pname = "duperemove"; version = "0.11.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix index dcaad81a5a3f..14f6afa99f0c 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "e2tools"; version = "0.0.16"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${name}.tar.gz"; + url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz"; sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/encfs/default.nix b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix index 1a9951a33fd7..19767b7013ae 100644 --- a/nixpkgs/pkgs/tools/filesystems/encfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "encfs-${version}"; + pname = "encfs"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/exfat/default.nix b/nixpkgs/pkgs/tools/filesystems/exfat/default.nix index 97a96651a68e..24db663aee02 100644 --- a/nixpkgs/pkgs/tools/filesystems/exfat/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/exfat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: stdenv.mkDerivation rec { - name = "exfat-${version}"; + pname = "exfat"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix index 0211ab63b3e9..40159b5fb6e6 100644 --- a/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.2"; - name = "ext4magic-${version}"; + pname = "ext4magic"; src = fetchurl { - url = "mirror://sourceforge/ext4magic/${name}.tar.gz"; + url = "mirror://sourceforge/ext4magic/${pname}-${version}.tar.gz"; sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix index e0c5ea3def4e..274126e1a718 100644 --- a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.4"; - name = "extundelete-${version}"; + pname = "extundelete"; src = fetchurl { url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix index 90bb443dfdd2..d7fa971c9878 100644 --- a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "f2fs-tools-${version}"; + pname = "f2fs-tools"; version = "1.11.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/nixpkgs/pkgs/tools/filesystems/f3/default.nix index 598263c8895e..d28875829388 100644 --- a/nixpkgs/pkgs/tools/filesystems/f3/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/f3/default.nix @@ -3,7 +3,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "f3"; version = "7.2"; diff --git a/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix index 7bb5dd415a6a..a00104510bf2 100644 --- a/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; - name = "fatresize-${version}"; + pname = "fatresize"; src = fetchurl { url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix index 18d9097dacbc..aee053ad1355 100644 --- a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5.0.456"; - name = "fatsort-${version}"; + pname = "fatsort"; src = fetchurl { - url = "mirror://sourceforge/fatsort/${name}.tar.xz"; + url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 82e2b404b82a..a8eb1118f4d3 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fuse-7z-ng"; version = "git-2014-06-08"; diff --git a/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index ccc5f1f2d4a8..fe46fccf271a 100644 --- a/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,7 +2,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gcsfuse-${version}"; + pname = "gcsfuse"; version = "0.23.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/filesystems/genimage/default.nix b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix index 581970e34fa7..e905222ad45e 100644 --- a/nixpkgs/pkgs/tools/filesystems/genimage/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libconfuse, gettext }: stdenv.mkDerivation rec { - name = "genimage-${version}"; + pname = "genimage"; version = "9"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix index 6a3e280aae36..1e6c73f725a8 100644 --- a/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.5.2"; - name = "genromfs-${version}"; + pname = "genromfs"; src = fetchurl { - url = "mirror://sourceforge/romfs/genromfs/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/romfs/genromfs/${version}/${pname}-${version}.tar.gz"; sha256 = "0q6rpq7cmclmb4ayfyknvzbqysxs4fy8aiahlax1sb2p6k3pzwrh"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix index 72e43725ef59..605e341c4d77 100644 --- a/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,7 +1,7 @@ { pkgconfig, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-mtpfs-${version}"; + pname = "go-mtpfs"; version = "2018-02-09"; rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; diff --git a/nixpkgs/pkgs/tools/filesystems/gpart/default.nix b/nixpkgs/pkgs/tools/filesystems/gpart/default.nix index ca2d0a627ab8..59b4785888b2 100644 --- a/nixpkgs/pkgs/tools/filesystems/gpart/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gpart/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "gpart-${version}"; + pname = "gpart"; version = "0.3"; # GitHub repository 'collating patches for gpart from all distributions': diff --git a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix index 4f7c2248a8ed..59ee358e028a 100644 --- a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; - name = "grive2-${version}"; + pname = "grive2"; src = fetchFromGitHub { owner = "vitalif"; diff --git a/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix index 4594aa9370ca..9b1c2b66e7aa 100644 --- a/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: stdenv.mkDerivation rec { - name = "hubicfuse-${version}"; + pname = "hubicfuse"; version = "3.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix index 083bae24d601..aef6087d3f28 100644 --- a/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "ifuse"; version = "2018-10-08"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix index 6044806a34b7..58963753a51a 100644 --- a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix @@ -2,7 +2,8 @@ let version = "0.5"; in stdenv.mkDerivation { - name = "jmtpfs-${version}"; + pname = "jmtpfs"; + inherit version; src = fetchFromGitHub { sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; diff --git a/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix b/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix index f6637b621b8e..6a9d68291f2c 100644 --- a/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix @@ -28,7 +28,7 @@ let sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q"; }; in stdenv.mkDerivation rec { - name = "lizardfs-${version}"; + pname = "lizardfs"; version = "3.12.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix index 15bb390e3648..4d90e189b950 100644 --- a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fuse, pkgconfig, attr, uthash }: stdenv.mkDerivation rec { - name = "mhddfs-${version}"; + pname = "mhddfs"; version = "0.1.39"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix index 48f13925ab08..6733b3df45ea 100644 --- a/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix @@ -4,7 +4,7 @@ # overriding the same-named attributes. See ./presets.nix for examples. stdenv.mkDerivation rec { - name = "mkspiffs-${version}"; + pname = "mkspiffs"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix index cc8ca8411248..b453067eaef8 100644 --- a/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: stdenv.mkDerivation rec { - name = "mp3fs-${version}"; + pname = "mp3fs"; version = "0.91"; src = fetchurl { - url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix index d0ceaf94a75f..c4910b166de7 100644 --- a/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libuuid, lzo, zlib, acl }: stdenv.mkDerivation rec { - name = "mtd-utils-${version}"; + pname = "mtd-utils"; version = "1.5.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 24aab7dc6dd4..48a72c5dd625 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -8,12 +8,12 @@ assert useNixUdev -> systemd != null; buildPythonApplication rec { - name = "blivet-${version}"; + pname = "blivet"; version = "0.17-1"; src = fetchurl { url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" - + "${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2"; sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix index 6a1c12e3e722..129283e83ebe 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -54,11 +54,12 @@ let }; in buildPythonApplication rec { - name = "nixpart-${version}"; + pname = "nixpart"; version = "0.4.1"; + disabled = python.isPy3k; src = fetchurl { - url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; + url = "https://github.com/NixOS/nixpart/archive/v${version}.tar.gz"; sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; @@ -66,10 +67,11 @@ in buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "NixOS storage manager/partitioner"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/NixOS/nixpart"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.aszlig ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 881301ed38e5..408d02bced74 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, lvm2, dmraid }: stdenv.mkDerivation rec { - name = "pyblock-${version}"; + pname = "pyblock"; version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = fetchurl rec { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index ce1d0bf28a16..ffe31b464b8a 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -1,13 +1,13 @@ { stdenv, python, buildPythonApplication, fetchurl, urlgrabber }: buildPythonApplication rec { - name = "pykickstart-${version}"; + pname = "pykickstart"; version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; src = fetchurl rec { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" - + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; + + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index fd6c5b913093..e0947b01f51b 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }: buildPythonApplication rec { - name = "pyparted-${version}"; + pname = "pyparted"; version = "3.10"; src = fetchurl { - url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; + url = "https://fedorahosted.org/releases/p/y/pyparted/${pname}-${version}.tar.gz"; sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix index ce00367c771c..8f59ff809a83 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonApplication, blivet }: buildPythonApplication rec { - name = "nixpart-${version}"; + pname = "nixpart"; version = "1.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix index c919bfade3ac..3660649553d5 100644 --- a/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "ntfs3g"; version = "2017.3.23"; - name = "${pname}-${version}"; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix index 2457ac59a213..424f84ec34f9 100644 --- a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nettle }: stdenv.mkDerivation rec { - name = "rdfind-${version}"; + pname = "rdfind"; version = "1.4.1"; src = fetchurl { - url = "https://rdfind.pauldreik.se/${name}.tar.gz"; + url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz"; sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index 967a8ee43bef..c9af30f873b4 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -2,10 +2,11 @@ let version = "1.2.1"; in stdenv.mkDerivation rec { - name = "reiser4progs-${version}"; + pname = "reiser4progs"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; + url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix index 345974bed58d..a89ea0657500 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -2,10 +2,11 @@ let version = "3.6.24"; in stdenv.mkDerivation rec { - name = "reiserfsprogs-${version}"; + pname = "reiserfsprogs"; + inherit version; src = fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${name}.tar.xz"; + url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz"; sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix index 8fb002b2d7fd..73f88964f2c8 100644 --- a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix @@ -3,7 +3,7 @@ , fuse, curl, expat }: stdenv.mkDerivation rec { - name = "s3backer-${version}"; + pname = "s3backer"; version = "1.5.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix b/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix index 816c09161dcf..3fc082dad462 100644 --- a/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }: stdenv.mkDerivation rec { - name = "s3fs-fuse-${version}"; + pname = "s3fs-fuse"; version = "1.85"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/securefs/default.nix b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix index a21aacb7e6b8..c5a5af212d90 100644 --- a/nixpkgs/pkgs/tools/filesystems/securefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix @@ -3,7 +3,7 @@ , fuse }: stdenv.mkDerivation rec { - name = "securefs-${version}"; + pname = "securefs"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix b/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix index 94c45ec4689a..997aa321afa3 100644 --- a/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/simg2img/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { - name = "simg2img-${version}"; + pname = "simg2img"; version = "1.1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index 26cef4ac90f2..be46abb2694d 100644 --- a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: stdenv.mkDerivation rec { - name = "smbnetfs-${version}"; + pname = "smbnetfs"; version = "0.6.1"; src = fetchurl { - url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2"; sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix index 725ff3e56dcd..b5ffdade98f8 100644 --- a/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "snapraid-${version}"; + pname = "snapraid"; version = "11.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix index 59a786116df6..9a0073f939fb 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix @@ -7,7 +7,7 @@ assert lz4Support -> (lz4 != null); stdenv.mkDerivation rec { - name = "squashfs-${version}"; + pname = "squashfs"; version = "4.4dev_20180612"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index 40e350846c5f..abe896801025 100644 --- a/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { pname = "squashfuse"; version = "0.1.103"; - name = "${pname}-${version}"; meta = { description = "FUSE filesystem to mount squashfs archives"; diff --git a/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix index 73b7f51fd364..4a1215397be6 100644 --- a/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.5.2"; - name = "sshfs-fuse-${version}"; + pname = "sshfs-fuse"; src = fetchFromGitHub { owner = "libfuse"; diff --git a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix index fd557a7ff565..67e21ac4c2c4 100644 --- a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchFromGitHub, go, fuse }: stdenv.mkDerivation rec { - name = "tmsu-${version}"; + pname = "tmsu"; version = "0.7.4"; go-sqlite3 = fetchgit { diff --git a/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix index 65eafe76710d..62b4b9301397 100644 --- a/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix @@ -3,12 +3,11 @@ stdenv.mkDerivation rec { pname = "u3-tool"; version = "0.3"; - name = "${pname}-${version}"; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/udftools/default.nix b/nixpkgs/pkgs/tools/filesystems/udftools/default.nix index f17f9e0d2de5..11ea490446d0 100644 --- a/nixpkgs/pkgs/tools/filesystems/udftools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/udftools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - name = "udftools-${version}"; + pname = "udftools"; version = "2.0"; src = fetchFromGitHub { owner = "pali"; diff --git a/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix index cfe3ff421fe4..73272b83989e 100644 --- a/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, fuse }: stdenv.mkDerivation rec { - name = "unionfs-fuse-${version}"; + pname = "unionfs-fuse"; version = "2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix index 98cc327bc29c..aa28ee625969 100644 --- a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - name = "xfsprogs-${version}"; + pname = "xfsprogs"; version = "4.19.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix b/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix index 4c0c2343dd2a..557367ea22cd 100644 --- a/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0"; }; - name = "XtreemFS-${version}"; + pname = "XtreemFS"; version = "1.5.1.81"; buildInputs = [ which attr makeWrapper python ]; diff --git a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix index 61fd5f26e308..041d9a4e3f8b 100644 --- a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { - name = "yandex-disk-${version}"; + pname = "yandex-disk"; version = "0.1.5.1039"; src = fetchurl { - url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"; sha256 = p.sha256; }; diff --git a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix index c311ac1af231..734c8df9b6ae 100644 --- a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, e2fsprogs }: stdenv.mkDerivation rec { - name = "zerofree-${version}"; + pname = "zerofree"; version = "1.1.1"; src = fetchurl { - url = "https://frippery.org/uml/${name}.tgz"; + url = "https://frippery.org/uml/${pname}-${version}.tgz"; sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; diff --git a/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix index 518e92814a41..476d80653127 100644 --- a/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix @@ -2,7 +2,8 @@ let version = "0.3.6"; in stdenv.mkDerivation rec { - name = "zfstools-${version}"; + pname = "zfstools"; + inherit version; src = fetchFromGitHub { sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg"; diff --git a/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix index 0e182d3bd2ea..0269df84634f 100644 --- a/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: stdenv.mkDerivation rec { - name = "zkfuse-${version}"; + pname = "zkfuse"; inherit (zookeeper) version src; sourceRoot = "${zookeeper.name}/src/contrib/zkfuse"; diff --git a/nixpkgs/pkgs/tools/graphics/appleseed/default.nix b/nixpkgs/pkgs/tools/graphics/appleseed/default.nix index 72f1a4188075..876861087201 100644 --- a/nixpkgs/pkgs/tools/graphics/appleseed/default.nix +++ b/nixpkgs/pkgs/tools/graphics/appleseed/default.nix @@ -9,7 +9,7 @@ let boost_static = boost165.override { }; in stdenv.mkDerivation rec { - name = "appleseed-${version}"; + pname = "appleseed"; version = "2.0.5-beta"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index 23a1f26db976..160b77229b3c 100644 --- a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -5,7 +5,8 @@ let version = "2.1.1"; in stdenv.mkDerivation rec { - name = "argyllcms-${version}"; + pname = "argyllcms"; + inherit version; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a diff --git a/nixpkgs/pkgs/tools/graphics/barcode/default.nix b/nixpkgs/pkgs/tools/graphics/barcode/default.nix index de09c2b27804..179085e1fd6b 100644 --- a/nixpkgs/pkgs/tools/graphics/barcode/default.nix +++ b/nixpkgs/pkgs/tools/graphics/barcode/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "0.99"; pname = "barcode"; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"; }; diff --git a/nixpkgs/pkgs/tools/graphics/blockhash/default.nix b/nixpkgs/pkgs/tools/graphics/blockhash/default.nix index ad72933cc771..b4f99a9192cd 100644 --- a/nixpkgs/pkgs/tools/graphics/blockhash/default.nix +++ b/nixpkgs/pkgs/tools/graphics/blockhash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: stdenv.mkDerivation rec { - name = "blockhash-${version}"; + pname = "blockhash"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/briss/default.nix b/nixpkgs/pkgs/tools/graphics/briss/default.nix index 57a6c8c9673c..e57f80f738f3 100644 --- a/nixpkgs/pkgs/tools/graphics/briss/default.nix +++ b/nixpkgs/pkgs/tools/graphics/briss/default.nix @@ -8,7 +8,8 @@ let sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; in stdenv.mkDerivation { - name = "briss-${version}"; + pname = "briss"; + inherit version; src = fetchurl { url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; inherit sha256; diff --git a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix index c65d1302dcaf..2c96e872f4e6 100644 --- a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpng, bison, flex, ffmpeg }: stdenv.mkDerivation rec { - name = "cfdg-${version}"; + pname = "cfdg"; version = "3.0.9"; src = fetchurl { sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp cfdg $out/bin/ - mkdir -p $out/share/doc/${name} - cp *.txt $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} + cp *.txt $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/graphics/convchain/default.nix b/nixpkgs/pkgs/tools/graphics/convchain/default.nix index 12fc6934531a..b1ce3082d25b 100644 --- a/nixpkgs/pkgs/tools/graphics/convchain/default.nix +++ b/nixpkgs/pkgs/tools/graphics/convchain/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { - name = "convchain-${version}"; + pname = "convchain"; version = "0.0pre20160901"; src = fetchFromGitHub { owner = "mxgmn"; diff --git a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix index 9fcb7ba404d0..04b73995580b 100644 --- a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, imagemagick }: stdenv.mkDerivation rec { - name = "cuneiform-${version}"; + pname = "cuneiform"; version = "1.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/graphics/dpic/default.nix b/nixpkgs/pkgs/tools/graphics/dpic/default.nix index 33e948663372..f21b84c15218 100644 --- a/nixpkgs/pkgs/tools/graphics/dpic/default.nix +++ b/nixpkgs/pkgs/tools/graphics/dpic/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dpic-${version}"; + pname = "dpic"; version = "2016.01.12"; src = fetchurl { - url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz"; + url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz"; }; diff --git a/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix b/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix index 2ffe4eb7f809..79c905756537 100644 --- a/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -3,11 +3,11 @@ , help2man, pkgconfig, perl, texlive }: stdenv.mkDerivation rec { - name = "enblend-enfuse-${version}"; + pname = "enblend-enfuse"; version = "4.2"; src = fetchurl { - url = "mirror://sourceforge/enblend/${name}.tar.gz"; + url = "mirror://sourceforge/enblend/${pname}-${version}.tar.gz"; sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7"; }; diff --git a/nixpkgs/pkgs/tools/graphics/epstool/default.nix b/nixpkgs/pkgs/tools/graphics/epstool/default.nix index 9735adca53dc..2ad52d2de437 100644 --- a/nixpkgs/pkgs/tools/graphics/epstool/default.nix +++ b/nixpkgs/pkgs/tools/graphics/epstool/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.08"; - name = "epstool-${version}"; + pname = "epstool"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz"; diff --git a/nixpkgs/pkgs/tools/graphics/escrotum/default.nix b/nixpkgs/pkgs/tools/graphics/escrotum/default.nix index 2a4f3c9cbff7..16f33251dd6a 100644 --- a/nixpkgs/pkgs/tools/graphics/escrotum/default.nix +++ b/nixpkgs/pkgs/tools/graphics/escrotum/default.nix @@ -4,17 +4,24 @@ }: buildPythonApplication { - name = "escrotum-2017-01-28"; + name = "escrotum-2019-06-10"; src = fetchFromGitHub { owner = "Roger"; repo = "escrotum"; - rev = "a51e330f976c1c9e1ac6932c04c41381722d2171"; - sha256 = "0vbpyihqgm0fyh22ashy4lhsrk67n31nw3bs14d1wr7ky0l3rdnj"; + rev = "f6c300315cb4402e37f16b56aad2d206e24c5281"; + sha256 = "0x7za74lkwn3v6j9j04ifgdwdlx9akh1izkw7vkkzj9ag9qjrzb0"; }; propagatedBuildInputs = [ pygtk numpy ]; + outputs = [ "out" "man" ]; + + postInstall = '' + mkdir -p $man/share/man/man1 + cp man/escrotum.1 $man/share/man/man1/ + ''; + meta = with lib; { homepage = https://github.com/Roger/escrotum; description = "Linux screen capture using pygtk, inspired by scrot"; diff --git a/nixpkgs/pkgs/tools/graphics/facedetect/default.nix b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix index 02a3a70fe516..aab2e111e85f 100644 --- a/nixpkgs/pkgs/tools/graphics/facedetect/default.nix +++ b/nixpkgs/pkgs/tools/graphics/facedetect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages }: stdenv.mkDerivation rec { - name = "facedetect-${version}"; + pname = "facedetect"; version = "0.1"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -v -m644 -D README.rst $out/share/doc/${name}/README.rst + install -v -m644 -D README.rst $out/share/doc/${pname}-${version}/README.rst install -v -m755 -D facedetect $out/bin/facedetect wrapPythonPrograms ''; diff --git a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix index 5d42482b3091..17e1c710586b 100644 --- a/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix +++ b/nixpkgs/pkgs/tools/graphics/fast-neural-doodle/default.nix @@ -2,7 +2,7 @@ , python, numpy, scipy, h5py, scikitlearn, pillow }: stdenv.mkDerivation rec { - name = "fast-neural-doodle-${version}"; + pname = "fast-neural-doodle"; version = "0.0pre2016-07-01"; buildInputs = [ torch torch-hdf5 python numpy h5py scikitlearn scipy pillow diff --git a/nixpkgs/pkgs/tools/graphics/fim/default.nix b/nixpkgs/pkgs/tools/graphics/fim/default.nix index 7303f27fe111..296ba43a5ed7 100644 --- a/nixpkgs/pkgs/tools/graphics/fim/default.nix +++ b/nixpkgs/pkgs/tools/graphics/fim/default.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "fim-${version}"; + pname = "fim"; version = "0.6"; src = fetchurl { - url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz"; + url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz"; sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp"; }; diff --git a/nixpkgs/pkgs/tools/graphics/flam3/default.nix b/nixpkgs/pkgs/tools/graphics/flam3/default.nix index e619a889219c..e05f05a977bf 100644 --- a/nixpkgs/pkgs/tools/graphics/flam3/default.nix +++ b/nixpkgs/pkgs/tools/graphics/flam3/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "flam3"; version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}"; rev = "e0801543538451234d7a8a240ba3b417cbda5b21"; diff --git a/nixpkgs/pkgs/tools/graphics/ggobi/default.nix b/nixpkgs/pkgs/tools/graphics/ggobi/default.nix index 0ed1855a338c..de02865c36e2 100644 --- a/nixpkgs/pkgs/tools/graphics/ggobi/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ggobi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.1.11"; - name = "ggobi-${version}"; + pname = "ggobi"; src = fetchurl { url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/graphics/glee/default.nix b/nixpkgs/pkgs/tools/graphics/glee/default.nix index 52f5a0997274..ae6291811a4a 100644 --- a/nixpkgs/pkgs/tools/graphics/glee/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glee/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchgit, cmake, libGLU_combined, xorg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "glee"; rev = "f727ec7463d514b6279981d12833f2e11d62b33d"; version = "20170205-${stdenv.lib.strings.substring 0 7 rev}"; diff --git a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 1331e38aef7e..111a9b59afda 100644 --- a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -2,7 +2,7 @@ python27, wayland, udev, mesa, wafHook }: stdenv.mkDerivation rec { - name = "glmark2-${version}"; + pname = "glmark2"; version = "2017-09-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix b/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix index 1f8a98e0296b..0710f47cb571 100644 --- a/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glxinfo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libGL, libX11 }: stdenv.mkDerivation rec { - name = "glxinfo-${version}"; + pname = "glxinfo"; version = "8.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 51212a3ea946..848d804bb385 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -13,7 +13,8 @@ let sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; }; in stdenv.mkDerivation rec { - name = "gmic-${version}"; + pname = "gmic"; + inherit version; outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; diff --git a/nixpkgs/pkgs/tools/graphics/gmic_krita_qt/default.nix b/nixpkgs/pkgs/tools/graphics/gmic_krita_qt/default.nix index 7ea73ab8db8d..e5bdf6f31775 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic_krita_qt/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic_krita_qt/default.nix @@ -7,7 +7,8 @@ let version = "2.3.6"; in stdenv.mkDerivation rec { - name = "gmic_krita_qt-${version}"; + pname = "gmic_krita_qt"; + inherit version; gmic-community = fetchFromGitHub { owner = "dtschump"; diff --git a/nixpkgs/pkgs/tools/graphics/graphviz/base.nix b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix index db21df9b5d0d..6cdd6dd71c1d 100644 --- a/nixpkgs/pkgs/tools/graphics/graphviz/base.nix +++ b/nixpkgs/pkgs/tools/graphics/graphviz/base.nix @@ -25,7 +25,8 @@ let in stdenv.mkDerivation rec { - name = "graphviz-${version}"; + pname = "graphviz"; + inherit version; src = fetchFromGitLab { owner = "graphviz"; diff --git a/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix index 1d3a8b26aae8..4c251f21c71f 100644 --- a/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gromit-mpx-${version}"; + pname = "gromit-mpx"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/ibniz/default.nix b/nixpkgs/pkgs/tools/graphics/ibniz/default.nix index 11fad25b85ae..564685c1ceaf 100644 --- a/nixpkgs/pkgs/tools/graphics/ibniz/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ibniz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "ibniz-${version}"; + pname = "ibniz"; version = "1.18"; src = fetchurl { - url = "http://www.pelulamu.net/ibniz/${name}.tar.gz"; + url = "http://www.pelulamu.net/ibniz/${pname}-${version}.tar.gz"; sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2"; }; diff --git a/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix b/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix index 8db5b6c7dea7..1099b11176c8 100644 --- a/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -3,7 +3,7 @@ let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { version = "1.7.4"; - name = "imgur-screenshot-${version}"; + pname = "imgur-screenshot"; src = fetchFromGitHub { owner = "jomo"; diff --git a/nixpkgs/pkgs/tools/graphics/jhead/default.nix b/nixpkgs/pkgs/tools/graphics/jhead/default.nix index e4405455097d..a2592d5522b9 100644 --- a/nixpkgs/pkgs/tools/graphics/jhead/default.nix +++ b/nixpkgs/pkgs/tools/graphics/jhead/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - name = "jhead-${version}"; + pname = "jhead"; version = "3.03"; src = fetchurl { - url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz"; + url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2"; }; @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { mkdir -p \ $out/bin \ $out/man/man1 \ - $out/share/doc/${name} + $out/share/doc/${pname}-${version} cp -v jhead $out/bin cp -v jhead.1 $out/man/man1 - cp -v *.txt $out/share/doc/${name} + cp -v *.txt $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/graphics/lepton/default.nix b/nixpkgs/pkgs/tools/graphics/lepton/default.nix index fec092db0c52..b0836d670862 100644 --- a/nixpkgs/pkgs/tools/graphics/lepton/default.nix +++ b/nixpkgs/pkgs/tools/graphics/lepton/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "lepton-${version}"; + pname = "lepton"; src = fetchFromGitHub { repo = "lepton"; diff --git a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix index a3cefddeb413..1f1da8df3f2b 100644 --- a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix +++ b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix @@ -2,11 +2,11 @@ , libGLU_combined, boost, glm, freetype }: stdenv.mkDerivation rec { - name = "logstalgia-${version}"; + pname = "logstalgia"; version = "1.1.2"; src = fetchurl { - url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; + url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd"; }; diff --git a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix index ffba2280e8a5..b65cbfca7bbe 100644 --- a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix +++ b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix @@ -14,7 +14,7 @@ let boost_static = boost165.override { }; in stdenv.mkDerivation rec { - name = "luxcorerender-${version}"; + pname = "luxcorerender"; version = "2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/maim/default.nix b/nixpkgs/pkgs/tools/graphics/maim/default.nix index 360a233e139f..63758e23b150 100644 --- a/nixpkgs/pkgs/tools/graphics/maim/default.nix +++ b/nixpkgs/pkgs/tools/graphics/maim/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "maim-${version}"; + pname = "maim"; version = "5.5.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/mscgen/default.nix b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix index 666cdae131e2..832a48baab72 100644 --- a/nixpkgs/pkgs/tools/graphics/mscgen/default.nix +++ b/nixpkgs/pkgs/tools/graphics/mscgen/default.nix @@ -4,7 +4,8 @@ let version = "0.20"; in stdenv.mkDerivation { - name = "mscgen-${version}"; + pname = "mscgen"; + inherit version; src = fetchurl { url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/graphics/neural-style/default.nix b/nixpkgs/pkgs/tools/graphics/neural-style/default.nix index 99421cfde170..a4706e95ceef 100644 --- a/nixpkgs/pkgs/tools/graphics/neural-style/default.nix +++ b/nixpkgs/pkgs/tools/graphics/neural-style/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}: stdenv.mkDerivation rec { - name = "neural-style-${version}"; + pname = "neural-style"; version = "0.0pre2016.08.15"; buildInputs = [torch loadcaffe]; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/nifskope/default.nix b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix index 42da24e32399..ebebe5087522 100644 --- a/nixpkgs/pkgs/tools/graphics/nifskope/default.nix +++ b/nixpkgs/pkgs/tools/graphics/nifskope/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "nifskope-${version}"; + pname = "nifskope"; version = "2.0.dev7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/optar/default.nix b/nixpkgs/pkgs/tools/graphics/optar/default.nix index bc1419070757..c1138e5f4584 100644 --- a/nixpkgs/pkgs/tools/graphics/optar/default.nix +++ b/nixpkgs/pkgs/tools/graphics/optar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, imagemagick, libpng }: stdenv.mkDerivation rec { - name = "optar-${version}"; + pname = "optar"; version = "20150210"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix b/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix index 058900b8e237..46eb61d1cf75 100644 --- a/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pdf2svg/default.nix @@ -2,7 +2,7 @@ , cairo, gtk2, poppler }: stdenv.mkDerivation rec { - name = "pdf2svg-${version}"; + pname = "pdf2svg"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/pdftag/default.nix b/nixpkgs/pkgs/tools/graphics/pdftag/default.nix index 8428480ca037..7e0229363188 100644 --- a/nixpkgs/pkgs/tools/graphics/pdftag/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pdftag/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "pdftag"; - name = "${pname}-${version}"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix b/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix index d394a816a49d..dc5acc9433f6 100644 --- a/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/nixpkgs/pkgs/tools/graphics/perceptualdiff/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "perceptualdiff"; - name = "${pname}-${version}"; version = "2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 77edcd345780..08c5f308f5c1 100644 --- a/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -4,12 +4,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pfstools"; version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${name}.tgz"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz"; sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six"; }; diff --git a/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/nixpkgs/pkgs/tools/graphics/pgf/default.nix index c91c18e3f0b6..b65962ee7ba2 100644 --- a/nixpkgs/pkgs/tools/graphics/pgf/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pgf/default.nix @@ -6,7 +6,8 @@ let version = "6.14.12"; in stdenv.mkDerivation { - name = "pgf-${version}"; + pname = "pgf"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix index 4e7d1e361f91..b519733f964d 100644 --- a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { - name = "pngquant-${version}"; + pname = "pngquant"; version = "2.12.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/povray/default.nix b/nixpkgs/pkgs/tools/graphics/povray/default.nix index dc9d9630ae5a..d2042540d713 100644 --- a/nixpkgs/pkgs/tools/graphics/povray/default.nix +++ b/nixpkgs/pkgs/tools/graphics/povray/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "povray-${version}"; + pname = "povray"; version = "3.7.0.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/qrcode/default.nix b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix index 44444e6148ab..eec8c5158b43 100644 --- a/nixpkgs/pkgs/tools/graphics/qrcode/default.nix +++ b/nixpkgs/pkgs/tools/graphics/qrcode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "qrcode-git-${version}"; + pname = "qrcode-git"; version = "20160804"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/rocket/default.nix b/nixpkgs/pkgs/tools/graphics/rocket/default.nix index c27eacaec8a2..8628b72bbae2 100644 --- a/nixpkgs/pkgs/tools/graphics/rocket/default.nix +++ b/nixpkgs/pkgs/tools/graphics/rocket/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase }: stdenv.mkDerivation rec { - name = "rocket-${version}"; + pname = "rocket"; version = "2018-06-09"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/s2png/default.nix b/nixpkgs/pkgs/tools/graphics/s2png/default.nix index fd538eec573d..e7d3b8151a44 100644 --- a/nixpkgs/pkgs/tools/graphics/s2png/default.nix +++ b/nixpkgs/pkgs/tools/graphics/s2png/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }: stdenv.mkDerivation rec { - name = "s2png-${version}"; + pname = "s2png"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/scanbd/default.nix b/nixpkgs/pkgs/tools/graphics/scanbd/default.nix index 5dbbd20cd827..fd26869d298b 100644 --- a/nixpkgs/pkgs/tools/graphics/scanbd/default.nix +++ b/nixpkgs/pkgs/tools/graphics/scanbd/default.nix @@ -2,12 +2,12 @@ , dbus, libconfuse, libjpeg, sane-backends, systemd }: stdenv.mkDerivation rec { - name = "scanbd-${version}"; + pname = "scanbd"; version = "1.5.1"; src = fetchurl { sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n"; - url = "mirror://sourceforge/scanbd/${name}.tgz"; + url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/graphics/sng/default.nix b/nixpkgs/pkgs/tools/graphics/sng/default.nix index 182ab5806d7b..c7d2f49406b7 100644 --- a/nixpkgs/pkgs/tools/graphics/sng/default.nix +++ b/nixpkgs/pkgs/tools/graphics/sng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpng, netpbm }: stdenv.mkDerivation rec { - name = "sng-${version}"; + pname = "sng"; version = "1.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix index c1e6c2afecce..a3497aefe102 100644 --- a/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix +++ b/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "structure-synth-${version}"; + pname = "structure-synth"; version = "v1.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/graphics/swfdec/default.nix b/nixpkgs/pkgs/tools/graphics/swfdec/default.nix index 1c3c0f3b4515..8a64e25d879a 100644 --- a/nixpkgs/pkgs/tools/graphics/swfdec/default.nix +++ b/nixpkgs/pkgs/tools/graphics/swfdec/default.nix @@ -4,7 +4,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "swfdec"; version = "0.8.4"; diff --git a/nixpkgs/pkgs/tools/graphics/syntex/default.nix b/nixpkgs/pkgs/tools/graphics/syntex/default.nix index 0862293830d5..693f116a6e80 100644 --- a/nixpkgs/pkgs/tools/graphics/syntex/default.nix +++ b/nixpkgs/pkgs/tools/graphics/syntex/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { - name = "syntex-${version}"; + pname = "syntex"; version = "0.0pre20160915"; src = fetchFromGitHub { owner = "mxgmn"; diff --git a/nixpkgs/pkgs/tools/graphics/twilight/default.nix b/nixpkgs/pkgs/tools/graphics/twilight/default.nix index 3769860d469b..42a86187a72d 100644 --- a/nixpkgs/pkgs/tools/graphics/twilight/default.nix +++ b/nixpkgs/pkgs/tools/graphics/twilight/default.nix @@ -4,7 +4,8 @@ let version = "2018-04-19"; in stdenv.mkDerivation rec { - name = "twilight-${version}"; + pname = "twilight"; + inherit version; src = fetchFromGitHub { owner = "tweakoz"; diff --git a/nixpkgs/pkgs/tools/graphics/unpaper/default.nix b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix index b58114a61a5d..44a86e961ec8 100644 --- a/nixpkgs/pkgs/tools/graphics/unpaper/default.nix +++ b/nixpkgs/pkgs/tools/graphics/unpaper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libav, libxslt }: stdenv.mkDerivation rec { - name = "unpaper-${version}"; + pname = "unpaper"; version = "6.1"; src = fetchurl { - url = "https://www.flameeyes.eu/files/${name}.tar.xz"; + url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz"; sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13"; }; diff --git a/nixpkgs/pkgs/tools/graphics/vips/default.nix b/nixpkgs/pkgs/tools/graphics/vips/default.nix index db06c2a1588a..ad352c04ad91 100644 --- a/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "vips-${version}"; + pname = "vips"; version = "8.8.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index 320b4eed14c3..5851e4a2d46a 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -2,14 +2,14 @@ glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { - name = "vulkan-tools-${version}"; - version = "1.1.106.0"; + pname = "vulkan-tools"; + version = "1.1.114.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8"; + sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/graphics/wallutils/default.nix b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix index 56fd53502444..ba1044e3bb40 100644 --- a/nixpkgs/pkgs/tools/graphics/wallutils/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix @@ -3,7 +3,7 @@ }: buildGoModule rec { - name = "wallutils-${version}"; + pname = "wallutils"; version = "5.8.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix index 20d07e52f6c7..65fe38937dfb 100644 --- a/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { - name = "wavefunctioncollapse-${version}"; + pname = "wavefunctioncollapse"; version = "0.0pre20170130"; src = fetchFromGitHub { owner = "mxgmn"; diff --git a/nixpkgs/pkgs/tools/graphics/welkin/default.nix b/nixpkgs/pkgs/tools/graphics/welkin/default.nix index 2882ae960de1..be4ba53319ae 100644 --- a/nixpkgs/pkgs/tools/graphics/welkin/default.nix +++ b/nixpkgs/pkgs/tools/graphics/welkin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "welkin-${version}"; + pname = "welkin"; version = "1.1"; src = fetchsvn { diff --git a/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix b/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix index ebd8953853c9..2aa6abcccfc4 100644 --- a/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -4,7 +4,7 @@ mkDerivation rec { version = "0.12.5"; - name = "wkhtmltopdf-${version}"; + pname = "wkhtmltopdf"; src = fetchFromGitHub { owner = "wkhtmltopdf"; diff --git a/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix b/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix index 7321128a6b5a..6dd0b2068784 100644 --- a/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix +++ b/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - name = "yafaray-core-${version}"; + pname = "yafaray-core"; version = "3.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/yaxg/default.nix b/nixpkgs/pkgs/tools/graphics/yaxg/default.nix index 8fbc09a6d82b..094ec2d5bc49 100644 --- a/nixpkgs/pkgs/tools/graphics/yaxg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/yaxg/default.nix @@ -2,7 +2,7 @@ maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }: stdenv.mkDerivation rec { - name = "yaxg-${version}"; + pname = "yaxg"; version = "unstable-2018-05-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/graphics/zxing/default.nix b/nixpkgs/pkgs/tools/graphics/zxing/default.nix index 3efb68e60d2b..97bbeb4d2d43 100644 --- a/nixpkgs/pkgs/tools/graphics/zxing/default.nix +++ b/nixpkgs/pkgs/tools/graphics/zxing/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "zxing-${version}"; + pname = "zxing"; version = "3.1.0"; # Maven builds are hard to get right core_jar = fetchurl { diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index a3f12d648d55..d1e7f85f75f3 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-anthy-${version}"; + pname = "fcitx-anthy"; version = "0.2.3"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz"; sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index e2d58c564989..d9b202f7ef15 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-chewing-${version}"; + pname = "fcitx-chewing"; version = "0.2.3"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-chewing/${pname}-${version}.tar.xz"; sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index f7bb7126bef0..4c0a7f0b4109 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }: stdenv.mkDerivation rec { - name = "fcitx-cloudpinyin-${version}"; + pname = "fcitx-cloudpinyin"; version = "0.3.6"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${pname}-${version}.tar.xz"; sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index 32c9ecff9bd8..c9a40b84a6d9 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-hangul-${version}"; + pname = "fcitx-hangul"; version = "0.3.1"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-hangul/${pname}-${version}.tar.xz"; sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 5b55e0f04785..9e0ef551d82c 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: stdenv.mkDerivation rec { - name = "fcitx-libpinyin-${version}"; + pname = "fcitx-libpinyin"; version = "0.5.3"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz"; sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index 292d2dbb57f5..8b25b2846ff5 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-m17n-${version}"; + pname = "fcitx-m17n"; version = "0.2.4"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-m17n/${pname}-${version}.tar.xz"; sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 2bd4bf1c878c..095be7469cd8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "fcitx-rime-${version}"; + pname = "fcitx-rime"; version = "0.3.2"; src = fetchurl { - url = "https://download.fcitx-im.org/fcitx-rime/${name}.tar.xz"; + url = "https://download.fcitx-im.org/fcitx-rime/${pname}-${version}.tar.xz"; sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix index c2e8837f5d13..cf0a0f1fa17e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }: stdenv.mkDerivation rec { - name = "fcitx-skk-${version}"; + pname = "fcitx-skk"; version = "0.1.4"; src = fetchFromGitHub { owner = "fcitx"; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix index 918edf0240a5..833e417ae913 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { - name = "fcitx-table-extra-${version}"; + pname = "fcitx-table-extra"; version = "0.3.8"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-table-extra/${pname}-${version}.tar.xz"; sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 929cdb30b919..ffee83875a17 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { - name = "fcitx-table-other-${version}"; + pname = "fcitx-table-other"; version = "0.2.4"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-table-other/${pname}-${version}.tar.xz"; sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index ddfa41dda318..1deff93e2016 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "fcitx-unikey-${version}"; + pname = "fcitx-unikey"; version = "0.2.5"; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-unikey/${name}.tar.xz"; + url = "http://download.fcitx-im.org/fcitx-unikey/${pname}-${version}.tar.xz"; sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix index b32368c93d3c..34dd3ac3509b 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -36,7 +36,7 @@ let }; in stdenv.mkDerivation rec { - name = "fcitx-${version}"; + pname = "fcitx"; version = "4.2.9.6"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 77ec251ec881..d2f68fd5269e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-anthy-${version}"; + pname = "ibus-anthy"; version = "1.5.11"; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0"; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index daebceaf8876..3b8b3489a1d2 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ibus-hangul-${version}"; + pname = "ibus-hangul"; version = "1.5.1"; src = fetchurl { - url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 19d862e03085..589ddd09144f 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -7,10 +7,9 @@ stdenv.mkDerivation rec { pname = "ibus-kkc"; version = "1.5.22"; - name = "${pname}-${version}"; src = fetchurl { - url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz"; + url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 3bdb69391cc4..fc4677e06b06 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-libpinyin-${version}"; + pname = "ibus-libpinyin"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index a0d50cf94790..01b227f6f1b4 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-m17n-${version}"; + pname = "ibus-m17n"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index 368de091777e..c3ee5eafd7be 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -14,7 +14,7 @@ let sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n"; }; in stdenv.mkDerivation rec { - name = "ibus-table-chinese-${version}"; + pname = "ibus-table-chinese"; version = "1.8.2"; srcs = [ src cmakeFedoraSrc ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index ff01c8419260..5e839b354a34 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }: stdenv.mkDerivation rec { - name = "ibus-table-others-${version}"; + pname = "ibus-table-others"; version = "1.3.9"; src = fetchurl { - url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index e31d1ddfaa80..107c8c60271e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ibus-uniemoji-${version}"; + pname = "ibus-uniemoji"; version = "0.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index 07fa8d2beb56..d36697221a4f 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -40,7 +40,7 @@ let ''; }; cldrEmojiAnnotation = stdenv.mkDerivation rec { - name = "cldr-emoji-annotation-${version}"; + pname = "cldr-emoji-annotation"; version = "31.90.0_1"; src = fetchFromGitHub { owner = "fujiwarat"; @@ -80,7 +80,7 @@ let in stdenv.mkDerivation rec { - name = "ibus-${version}"; + pname = "ibus"; version = "1.5.20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 8d02d4edde8e..85fccc46de08 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: stdenv.mkDerivation rec { - name = "ibus-qt-${version}"; + pname = "ibus-qt"; version = "1.3.3"; src = fetchurl { - url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz"; + url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz"; sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix index bb179e18e078..cd7d1cd8bbfc 100644 --- a/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "keyfuzz-${version}"; + pname = "keyfuzz"; version = "0.2"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix index 75670dfe9dfb..f4b2f7e94e74 100644 --- a/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation rec { pname = "libinput-gestures"; version = "2.39"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bulletmark"; diff --git a/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix b/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix index 33de43b6f5e5..68889d45df04 100644 --- a/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/libkkc/default.nix @@ -7,10 +7,9 @@ stdenv.mkDerivation rec { pname = "libkkc"; version = "0.3.5"; - name = "${pname}-${version}"; src = fetchurl { - url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz"; + url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index cecacd4af954..cf32e8d51ca3 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { - name = "skk-dicts-unstable-${version}"; + pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix index 8661da66b92a..d4ef2e2422ec 100644 --- a/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -9,7 +9,7 @@ # - We for the moment do not package them to keep the dependencies slim. # Probably, shall package the newer tools as skktools-extra in the future. stdenv.mkDerivation rec { - name = "skktools-${version}"; + pname = "skktools"; version = "1.3.3"; src = fetchFromGitHub { owner = "skk-dev"; diff --git a/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index 55cf09455823..02993b248ab7 100644 --- a/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "tegaki-zinnia-japanese-${version}"; + pname = "tegaki-zinnia-japanese"; version = "0.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix index 82dd387f536d..ff14a13da04f 100644 --- a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }: stdenv.mkDerivation rec { - name = "touchegg-${version}"; + pname = "touchegg"; version = "1.1.1"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz"; sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; diff --git a/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix b/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix index ec8ac8845597..a9e106f2c720 100644 --- a/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: stdenv.mkDerivation rec { - name = "triggerhappy-${version}"; + pname = "triggerhappy"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix index 984eecf9e9d5..7fe00bd4dfce 100644 --- a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix @@ -39,7 +39,7 @@ assert withMisc -> libeb != null; stdenv.mkDerivation rec { version = "1.8.8"; - name = "uim-${version}"; + pname = "uim"; src = fetchFromGitHub { owner = "uim"; diff --git a/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix index 60f3a0feb55b..ce87e1a71412 100644 --- a/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/zinnia/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zinnia-${version}"; + pname = "zinnia"; version = "2016-08-28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/0x0/default.nix b/nixpkgs/pkgs/tools/misc/0x0/default.nix index ad129503de33..a349a3f2fc0e 100644 --- a/nixpkgs/pkgs/tools/misc/0x0/default.nix +++ b/nixpkgs/pkgs/tools/misc/0x0/default.nix @@ -1,7 +1,7 @@ { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: stdenv.mkDerivation rec { - name = "0x0-${version}"; + pname = "0x0"; version = "2018-06-24"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/misc/aescrypt/default.nix b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix index 3c529f31f66e..75d8d71b8952 100644 --- a/nixpkgs/pkgs/tools/misc/aescrypt/default.nix +++ b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.14"; - name = "aescrypt-${version}"; + pname = "aescrypt"; src = fetchurl { - url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz"; + url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz"; sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; }; diff --git a/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix index 8ee363ed91dc..7b869d66d1c3 100644 --- a/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; - name = "alarm-clock-applet-${version}"; + pname = "alarm-clock-applet"; src = fetchFromGitHub { owner = "joh"; diff --git a/nixpkgs/pkgs/tools/misc/antimicro/default.nix b/nixpkgs/pkgs/tools/misc/antimicro/default.nix index 62d46bba5b0d..6ff0c7cd0d7d 100644 --- a/nixpkgs/pkgs/tools/misc/antimicro/default.nix +++ b/nixpkgs/pkgs/tools/misc/antimicro/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: mkDerivation rec { - name = "antimicro-${version}"; + pname = "antimicro"; version = "2.23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/aptly/default.nix b/nixpkgs/pkgs/tools/misc/aptly/default.nix index 2dac9bd60c93..55cfa09aa24f 100644 --- a/nixpkgs/pkgs/tools/misc/aptly/default.nix +++ b/nixpkgs/pkgs/tools/misc/aptly/default.nix @@ -22,7 +22,8 @@ let in buildGoPackage { - name = "aptly-${version}"; + pname = "aptly"; + inherit version; src = aptlySrc; diff --git a/nixpkgs/pkgs/tools/misc/argtable/default.nix b/nixpkgs/pkgs/tools/misc/argtable/default.nix index 6b1512e854b0..8b2a2a4b2150 100644 --- a/nixpkgs/pkgs/tools/misc/argtable/default.nix +++ b/nixpkgs/pkgs/tools/misc/argtable/default.nix @@ -2,7 +2,7 @@ , fetchgit }: stdenv.mkDerivation rec { - name = "argtable-${version}"; + pname = "argtable"; version = "3.0.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix index dc51d04e4b5e..4f50e0f556b6 100644 --- a/nixpkgs/pkgs/tools/misc/arp-scan/default.nix +++ b/nixpkgs/pkgs/tools/misc/arp-scan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "arp-scan-${version}"; + pname = "arp-scan"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/aspcud/default.nix b/nixpkgs/pkgs/tools/misc/aspcud/default.nix index 859112d29bc2..b58f603ce594 100644 --- a/nixpkgs/pkgs/tools/misc/aspcud/default.nix +++ b/nixpkgs/pkgs/tools/misc/aspcud/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.9.4"; - name = "aspcud-${version}"; + pname = "aspcud"; src = fetchzip { url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/autojump/default.nix b/nixpkgs/pkgs/tools/misc/autojump/default.nix index ca4dde7a450c..8294e92d13f3 100644 --- a/nixpkgs/pkgs/tools/misc/autojump/default.nix +++ b/nixpkgs/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, bash }: stdenv.mkDerivation rec { - name = "autojump-${version}"; + pname = "autojump"; version = "22.5.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/automirror/default.nix b/nixpkgs/pkgs/tools/misc/automirror/default.nix index 3fd520513570..3bfb2d656d90 100644 --- a/nixpkgs/pkgs/tools/misc/automirror/default.nix +++ b/nixpkgs/pkgs/tools/misc/automirror/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, git, ronn}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "automirror"; version = "49"; diff --git a/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix index 3b3a96e8b6e1..fd9bbda699f1 100644 --- a/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -9,7 +9,8 @@ let version = "1.8.1"; in stdenv.mkDerivation { - name = "autorandr-${version}"; + pname = "autorandr"; + inherit version; buildInputs = [ python ]; diff --git a/nixpkgs/pkgs/tools/misc/autorevision/default.nix b/nixpkgs/pkgs/tools/misc/autorevision/default.nix index 75c7b258a449..ee07221b7559 100644 --- a/nixpkgs/pkgs/tools/misc/autorevision/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorevision/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "autorevision-${version}"; + pname = "autorevision"; version = "1.21"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix index 5ead0e1020cb..6f2afc888e84 100644 --- a/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "azure-vhd-utils-${version}"; + pname = "azure-vhd-utils"; version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; diff --git a/nixpkgs/pkgs/tools/misc/bandwidth/default.nix b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix index 4f90c0f03e9a..3b5e72c89f7f 100644 --- a/nixpkgs/pkgs/tools/misc/bandwidth/default.nix +++ b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix @@ -10,11 +10,11 @@ let else throw "Unknown architecture"; in stdenv.mkDerivation rec { - name = "bandwidth-${version}"; + pname = "bandwidth"; version = "1.5.1"; src = fetchurl { - url = "https://zsmith.co/archives/${name}.tar.gz"; + url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; diff --git a/nixpkgs/pkgs/tools/misc/bat/default.nix b/nixpkgs/pkgs/tools/misc/bat/default.nix index 205bc196811b..267b820df073 100644 --- a/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -1,25 +1,27 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, zlib , Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "0yyvlplskjvxb2cspqsvfsnahd5m0s83psrp777ng0wc0kr1adbw"; + sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6"; fetchSubmodules = true; }; - cargoSha256 = "078n31c0isvxvna0s1m12xv4bkh15rb2nixfyg4c501mlkalb517"; + cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz"; - nativeBuildInputs = [ cmake pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 install -m 444 -Dt $out/share/fish/vendor_completions.d assets/completions/bat.fish diff --git a/nixpkgs/pkgs/tools/misc/bbe/default.nix b/nixpkgs/pkgs/tools/misc/bbe/default.nix index ecff2459ef26..b0af13160d21 100644 --- a/nixpkgs/pkgs/tools/misc/bbe/default.nix +++ b/nixpkgs/pkgs/tools/misc/bbe/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "bbe-${version}"; + pname = "bbe"; version = "0.2.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix index 89d684614314..c7a9af4abd1a 100644 --- a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "bibtex2html-${version}"; + pname = "bibtex2html"; version = "1.99"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/bibtool/default.nix b/nixpkgs/pkgs/tools/misc/bibtool/default.nix index 5e8a8c56b0a7..7664b96563b2 100644 --- a/nixpkgs/pkgs/tools/misc/bibtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bibtool-${version}"; + pname = "bibtool"; version = "2.67"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/bibutils/default.nix b/nixpkgs/pkgs/tools/misc/bibutils/default.nix index d7cca2a77bdc..d84c6ebaabc6 100644 --- a/nixpkgs/pkgs/tools/misc/bibutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bibutils-${version}"; + pname = "bibutils"; version = "6.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix b/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix index 4248dd6bd93c..8d587e34af46 100644 --- a/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/blink1-tool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libusb1, pkgconfig, ... }: stdenv.mkDerivation rec { - name = "blink1-${version}"; + pname = "blink1"; version = "1.98a"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/blsd/default.nix b/nixpkgs/pkgs/tools/misc/blsd/default.nix index 8e3e08fb5e55..655fd44c0399 100644 --- a/nixpkgs/pkgs/tools/misc/blsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/blsd/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: buildGoPackage rec { - name = "blsd-${version}"; + pname = "blsd"; version = "2017-07-27"; goPackagePath = "github.com/junegunn/blsd"; diff --git a/nixpkgs/pkgs/tools/misc/bmon/default.nix b/nixpkgs/pkgs/tools/misc/bmon/default.nix index fc10538bbbbd..e4664e34b964 100644 --- a/nixpkgs/pkgs/tools/misc/bmon/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmon/default.nix @@ -2,7 +2,7 @@ , libnl }: stdenv.mkDerivation rec { - name = "bmon-${version}"; + pname = "bmon"; version = "4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix b/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix index 90fc68dcc5cc..b86bc38cb267 100644 --- a/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix +++ b/nixpkgs/pkgs/tools/misc/buildtorrent/default.nix @@ -3,10 +3,11 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "buildtorrent-${version}"; + pname = "buildtorrent"; + inherit version; src = fetchurl { - url = "https://mathr.co.uk/blog/code/${name}.tar.gz"; + url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz"; sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; }; diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index 61d0bf60a4d6..2c48f995ca2d 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -5,13 +5,12 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "calamares"; version = "3.2.11"; # release including submodule src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw"; }; diff --git a/nixpkgs/pkgs/tools/misc/capture/default.nix b/nixpkgs/pkgs/tools/misc/capture/default.nix index a3b30423aa8f..377297ee4799 100644 --- a/nixpkgs/pkgs/tools/misc/capture/default.nix +++ b/nixpkgs/pkgs/tools/misc/capture/default.nix @@ -1,7 +1,7 @@ { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { - name = "capture-unstable-${version}"; + pname = "capture-unstable"; version = "2019-03-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/chelf/default.nix b/nixpkgs/pkgs/tools/misc/chelf/default.nix index 4c54ab239d29..f9740f223754 100644 --- a/nixpkgs/pkgs/tools/misc/chelf/default.nix +++ b/nixpkgs/pkgs/tools/misc/chelf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "chelf-${version}"; + pname = "chelf"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 4eb6f302f1b0..b6fffddeb53d 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "chezmoi-${version}"; + pname = "chezmoi"; version = "1.5.5"; goPackagePath = "github.com/twpayne/chezmoi"; diff --git a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix index 48ce782536f2..a1b1b4eac2d5 100644 --- a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "cht.sh-${version}"; + pname = "cht.sh"; version = "unstable-2019-08-06"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix index e913d5176839..575cb686f9d4 100644 --- a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix +++ b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix @@ -3,7 +3,7 @@ mkDerivation rec { version = "0.3.2"; - name = "ckb-next-${version}"; + pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; diff --git a/nixpkgs/pkgs/tools/misc/clac/default.nix b/nixpkgs/pkgs/tools/misc/clac/default.nix index e4b3fab818b7..f71faf6ab749 100644 --- a/nixpkgs/pkgs/tools/misc/clac/default.nix +++ b/nixpkgs/pkgs/tools/misc/clac/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clac"; version = "0.0.0.20170503"; diff --git a/nixpkgs/pkgs/tools/misc/clasp/default.nix b/nixpkgs/pkgs/tools/misc/clasp/default.nix index 135eda554b36..31c35af81186 100644 --- a/nixpkgs/pkgs/tools/misc/clasp/default.nix +++ b/nixpkgs/pkgs/tools/misc/clasp/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "clasp-${version}"; + pname = "clasp"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/clex/default.nix b/nixpkgs/pkgs/tools/misc/clex/default.nix index 54a6fac17a3c..d5fd4e97df10 100644 --- a/nixpkgs/pkgs/tools/misc/clex/default.nix +++ b/nixpkgs/pkgs/tools/misc/clex/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "clex-${version}"; + pname = "clex"; version = "4.6.patch9"; src = fetchurl { sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc"; - url = "${meta.homepage}/download/${name}.tar.gz"; + url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/clipnotify/default.nix b/nixpkgs/pkgs/tools/misc/clipnotify/default.nix index 6bd0f8be2fa6..91c428def280 100644 --- a/nixpkgs/pkgs/tools/misc/clipnotify/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipnotify/default.nix @@ -1,6 +1,6 @@ { libX11, libXfixes, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "clipnotify-${version}"; + pname = "clipnotify"; version = "git-2018-02-20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/clipster/default.nix b/nixpkgs/pkgs/tools/misc/clipster/default.nix index ed0239256cdf..d12f9f6c1f49 100644 --- a/nixpkgs/pkgs/tools/misc/clipster/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipster/default.nix @@ -2,7 +2,7 @@ gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "clipster-${version}"; + pname = "clipster"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/cloc/default.nix b/nixpkgs/pkgs/tools/misc/cloc/default.nix index 38041f0b32da..987d694a0a41 100644 --- a/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "cloc-${version}"; + pname = "cloc"; version = "1.82"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index b9046bf19ca5..bc23958b5815 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "cloud-sql-proxy-${version}"; + pname = "cloud-sql-proxy"; version = "1.13"; goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; diff --git a/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix index bda8ebcf3b0e..5408c39920be 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix - name = "cloud-utils-${version}"; + pname = "cloud-utils"; version = "0.30"; src = fetchurl { url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/colord-kde/default.nix b/nixpkgs/pkgs/tools/misc/colord-kde/default.nix index 12821cf864c2..41c80146e68f 100644 --- a/nixpkgs/pkgs/tools/misc/colord-kde/default.nix +++ b/nixpkgs/pkgs/tools/misc/colord-kde/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "colord-kde-${version}"; + pname = "colord-kde"; version = "0.5.0"; src = fetchurl { - url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz"; + url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; diff --git a/nixpkgs/pkgs/tools/misc/contacts/default.nix b/nixpkgs/pkgs/tools/misc/contacts/default.nix index a7d230d8e898..1b3c5f169699 100644 --- a/nixpkgs/pkgs/tools/misc/contacts/default.nix +++ b/nixpkgs/pkgs/tools/misc/contacts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1a-3"; - name = "contacts-${version}"; + pname = "contacts"; src = fetchurl { url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/cowsay/default.nix b/nixpkgs/pkgs/tools/misc/cowsay/default.nix index 6b5c9c513944..fb44b051b7ee 100644 --- a/nixpkgs/pkgs/tools/misc/cowsay/default.nix +++ b/nixpkgs/pkgs/tools/misc/cowsay/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ version = "3.03+dfsg2"; - name = "cowsay-${version}"; + pname = "cowsay"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/c/cowsay/cowsay_${version}.orig.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix index 9a764c12941e..547e2a1f059f 100644 --- a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cpulimit-${version}"; + pname = "cpulimit"; version = "2.6"; src = fetchurl { - url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; + url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz"; sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; }; diff --git a/nixpkgs/pkgs/tools/misc/cpuminer/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix index b4abb3097b98..db0ab75d9166 100644 --- a/nixpkgs/pkgs/tools/misc/cpuminer/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, jansson, perl }: stdenv.mkDerivation rec { - name = "cpuminer-${version}"; + pname = "cpuminer"; version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; + url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz"; sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa"; }; diff --git a/nixpkgs/pkgs/tools/misc/crex/default.nix b/nixpkgs/pkgs/tools/misc/crex/default.nix index 696fbe863832..a00f8d6654f5 100644 --- a/nixpkgs/pkgs/tools/misc/crex/default.nix +++ b/nixpkgs/pkgs/tools/misc/crex/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "crex"; version = "0.2.5"; diff --git a/nixpkgs/pkgs/tools/misc/cunit/default.nix b/nixpkgs/pkgs/tools/misc/cunit/default.nix index 6bbf049d2445..f1930c925ff4 100644 --- a/nixpkgs/pkgs/tools/misc/cunit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cunit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: stdenv.mkDerivation rec { - name = "CUnit-${version}"; + pname = "CUnit"; version = "2.1-3"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool]; src = fetchurl { - url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2"; sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm"; }; diff --git a/nixpkgs/pkgs/tools/misc/cutecom/default.nix b/nixpkgs/pkgs/tools/misc/cutecom/default.nix index 94f36adcf9b0..83010477c50d 100644 --- a/nixpkgs/pkgs/tools/misc/cutecom/default.nix +++ b/nixpkgs/pkgs/tools/misc/cutecom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }: stdenv.mkDerivation rec { - name = "cutecom-${version}"; + pname = "cutecom"; version = "0.50.0"; src = fetchFromGitHub { owner = "neundorf"; diff --git a/nixpkgs/pkgs/tools/misc/dashing/default.nix b/nixpkgs/pkgs/tools/misc/dashing/default.nix index 5a82c7660890..f45889e78d85 100644 --- a/nixpkgs/pkgs/tools/misc/dashing/default.nix +++ b/nixpkgs/pkgs/tools/misc/dashing/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "dashing-unstable-${version}"; + pname = "dashing-unstable"; version = "2018-02-15"; rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49"; diff --git a/nixpkgs/pkgs/tools/misc/datamash/default.nix b/nixpkgs/pkgs/tools/misc/datamash/default.nix index 230a97da5e44..efeb760e560b 100644 --- a/nixpkgs/pkgs/tools/misc/datamash/default.nix +++ b/nixpkgs/pkgs/tools/misc/datamash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "datamash-${version}"; + pname = "datamash"; version = "1.4"; src = fetchurl { - url = "mirror://gnu/datamash/${name}.tar.gz"; + url = "mirror://gnu/datamash/${pname}-${version}.tar.gz"; sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a"; }; diff --git a/nixpkgs/pkgs/tools/misc/dateutils/default.nix b/nixpkgs/pkgs/tools/misc/dateutils/default.nix index 05a312bb8bca..b440808833fc 100644 --- a/nixpkgs/pkgs/tools/misc/dateutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/dateutils/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.6"; - name = "dateutils-${version}"; + pname = "dateutils"; src = fetchurl { - url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; + url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816"; }; diff --git a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix index 8dcaecf9851c..ab52d73ac27b 100644 --- a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: stdenv.mkDerivation rec { - name = "dbus-map-${version}"; + pname = "dbus-map"; version = "2015-05-28"; src = fetchFromGitHub { owner = "taviso"; diff --git a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 8453aa677477..0d5efb2ca22b 100644 --- a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -5,7 +5,8 @@ let version = "0.4.4"; in stdenv.mkDerivation rec { - name = "ddccontrol-${version}"; + pname = "ddccontrol"; + inherit version; src = fetchFromGitHub { owner = "ddccontrol"; diff --git a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 3a607b4ec751..0ddceb76ffe8 100644 --- a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -2,7 +2,7 @@ , glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }: stdenv.mkDerivation rec { - name = "ddcutil-${version}"; + pname = "ddcutil"; version = "0.9.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix b/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix index 3ed284aa3e1f..35db9ef7db36 100644 --- a/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix +++ b/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix @@ -9,7 +9,7 @@ let inherit (python3Packages) python setuptools; in stdenv.mkDerivation rec { version = "2.16.8"; - name = "debian-devscripts-${version}"; + pname = "debian-devscripts"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; diff --git a/nixpkgs/pkgs/tools/misc/ding-libs/default.nix b/nixpkgs/pkgs/tools/misc/ding-libs/default.nix index 61c8a8370d7f..e99e9289b676 100644 --- a/nixpkgs/pkgs/tools/misc/ding-libs/default.nix +++ b/nixpkgs/pkgs/tools/misc/ding-libs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, check }: stdenv.mkDerivation rec { - name = "ding-libs-${version}"; + pname = "ding-libs"; version = "0.6.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/direnv/default.nix b/nixpkgs/pkgs/tools/misc/direnv/default.nix index e71971ccb091..22c0721d79d8 100644 --- a/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, bash }: buildGoPackage rec { - name = "direnv-${version}"; + pname = "direnv"; version = "2.20.1"; goPackagePath = "github.com/direnv/direnv"; diff --git a/nixpkgs/pkgs/tools/misc/diskscan/default.nix b/nixpkgs/pkgs/tools/misc/diskscan/default.nix index 7b97e58fdf96..193a631ccdc3 100644 --- a/nixpkgs/pkgs/tools/misc/diskscan/default.nix +++ b/nixpkgs/pkgs/tools/misc/diskscan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, ncurses, zlib }: stdenv.mkDerivation rec { - name = "diskscan-${version}"; + pname = "diskscan"; version = "0.20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix index affcd310bea0..efe65683e07b 100644 --- a/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/docbook2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat }: stdenv.mkDerivation rec { - name = "docbook2mdoc-${version}"; + pname = "docbook2mdoc"; version = "0.0.9"; src = fetchurl { - url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk"; }; diff --git a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix index f6bc091c14af..c1baf8e82f5f 100644 --- a/nixpkgs/pkgs/tools/misc/docker-ls/default.nix +++ b/nixpkgs/pkgs/tools/misc/docker-ls/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, stdenv, docker }: buildGoPackage rec { - name = "docker-ls-${version}"; + pname = "docker-ls"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/docui/default.nix b/nixpkgs/pkgs/tools/misc/docui/default.nix index 47abcf79869d..66c0cfc82b1b 100644 --- a/nixpkgs/pkgs/tools/misc/docui/default.nix +++ b/nixpkgs/pkgs/tools/misc/docui/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "docui-${version}"; + pname = "docui"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/dtach/default.nix b/nixpkgs/pkgs/tools/misc/dtach/default.nix index c50e3adb6abb..7d85decbb84b 100644 --- a/nixpkgs/pkgs/tools/misc/dtach/default.nix +++ b/nixpkgs/pkgs/tools/misc/dtach/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dtach-${version}"; + pname = "dtach"; version = "0.9"; src = fetchurl { - url = "mirror://sourceforge/project/dtach/dtach/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/dtach/dtach/${version}/${pname}-${version}.tar.gz"; sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j"; }; diff --git a/nixpkgs/pkgs/tools/misc/duc/default.nix b/nixpkgs/pkgs/tools/misc/duc/default.nix index 82b29bb67f66..77ad7cd8ccd9 100644 --- a/nixpkgs/pkgs/tools/misc/duc/default.nix +++ b/nixpkgs/pkgs/tools/misc/duc/default.nix @@ -7,7 +7,7 @@ assert enableCairo -> cairo != null && pango != null; stdenv.mkDerivation rec { - name = "duc-${version}"; + pname = "duc"; version = "1.4.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix index 892287fa2d70..1b9a6c9bbea2 100644 --- a/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix +++ b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dumptorrent-${version}"; + pname = "dumptorrent"; version = "1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix index 5eb4055d5b96..bcd3ec6d8f7f 100644 --- a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix +++ b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix @@ -2,7 +2,8 @@ let version = "2018-12-06"; in stdenv.mkDerivation rec { - name = "edid-decode-unstable-${version}"; + pname = "edid-decode-unstable"; + inherit version; src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; diff --git a/nixpkgs/pkgs/tools/misc/emv/default.nix b/nixpkgs/pkgs/tools/misc/emv/default.nix index 6f491ac93496..160c3982cc15 100644 --- a/nixpkgs/pkgs/tools/misc/emv/default.nix +++ b/nixpkgs/pkgs/tools/misc/emv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "emv-${version}"; + pname = "emv"; version = "1.95"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index 19bcd77923b9..954b570c79da 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, coreutils, ncurses }: stdenv.mkDerivation rec { - name = "entr-${version}"; + pname = "entr"; version = "4.2"; src = fetchurl { - url = "http://entrproject.org/code/${name}.tar.gz"; + url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17"; }; diff --git a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix index ea08608da01c..db31df982cf8 100644 --- a/nixpkgs/pkgs/tools/misc/envdir-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/envdir-go/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { version = "1.0.0"; - name = "envdir-${version}"; + pname = "envdir"; goPackagePath = "github.com/d10n/envdir"; diff --git a/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/nixpkgs/pkgs/tools/misc/envsubst/default.nix index 86f78af25603..9b2153d17cb1 100644 --- a/nixpkgs/pkgs/tools/misc/envsubst/default.nix +++ b/nixpkgs/pkgs/tools/misc/envsubst/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "envsubst-${version}"; + pname = "envsubst"; version = "1.1.0"; goPackagePath = "github.com/a8m/envsubst"; diff --git a/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix b/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix index b9efead27988..8d65aee9e7a8 100644 --- a/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix +++ b/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "eot_utilities"; version = "1.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix index 9d3b796c8796..52b56f10ea97 100644 --- a/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "esptool-ck-${version}"; + pname = "esptool-ck"; version = "0.4.13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ethtool/default.nix b/nixpkgs/pkgs/tools/misc/ethtool/default.nix index a6afa03a3f15..8fa1eccadf01 100644 --- a/nixpkgs/pkgs/tools/misc/ethtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-${version}"; + pname = "ethtool"; version = "5.2"; src = fetchurl { - url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; + url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz"; sha256 = "01bq2g7amycfp4syzcswz52pgphdgswklziqfjwnq3c6844dfpv6"; }; diff --git a/nixpkgs/pkgs/tools/misc/expect/default.nix b/nixpkgs/pkgs/tools/misc/expect/default.nix index bb701f187fa8..fe18a5065608 100644 --- a/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.45.4"; - name = "expect-${version}"; + pname = "expect"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/fdupes/default.nix b/nixpkgs/pkgs/tools/misc/fdupes/default.nix index 84b61f9aae92..25179c36c01f 100644 --- a/nixpkgs/pkgs/tools/misc/fdupes/default.nix +++ b/nixpkgs/pkgs/tools/misc/fdupes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fdupes-${version}"; + pname = "fdupes"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 73734ee5ea0f..90092c9b0c0c 100644 --- a/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.50"; + version = "0.2.51"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "06virzmg3prvwk5gilr19qrpi93wvv7jq096kgsbn3rmnv3ys1zh"; + sha256 = "1ckzgzbv2fh5y7c5r0b9n6y2migmsrnlwdg7dybr0c82s39swr7f"; }; - cargoSha256 = "1g72nz3nha41cvsb514z4k78yw7xcsh3nm0bl2wqy9dvdzgp1lm1"; + cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index 14858428ee99..b3ed85ca2282 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { - name = "file-${version}"; + pname = "file"; version = "5.37"; src = fetchurl { urls = [ - "ftp://ftp.astron.com/pub/file/${name}.tar.gz" - "https://distfiles.macports.org/file/${name}.tar.gz" + "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" + "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9"; }; diff --git a/nixpkgs/pkgs/tools/misc/filebench/default.nix b/nixpkgs/pkgs/tools/misc/filebench/default.nix index e934da76e6e5..a16695cf7c32 100644 --- a/nixpkgs/pkgs/tools/misc/filebench/default.nix +++ b/nixpkgs/pkgs/tools/misc/filebench/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, bison, flex }: stdenv.mkDerivation rec { - name = "filebench-${version}"; + pname = "filebench"; version = "1.4.9.1"; src = fetchurl { - url = "mirror://sourceforge/filebench/${name}.tar.gz"; + url = "mirror://sourceforge/filebench/${pname}-${version}.tar.gz"; sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc"; }; diff --git a/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/nixpkgs/pkgs/tools/misc/flashrom/default.nix index a7ca7700c71b..18914a304f34 100644 --- a/nixpkgs/pkgs/tools/misc/flashrom/default.nix +++ b/nixpkgs/pkgs/tools/misc/flashrom/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: stdenv.mkDerivation rec { - name = "flashrom-${version}"; + pname = "flashrom"; version = "1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix index a72279b90b6e..692f7daa9cf6 100644 --- a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix +++ b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "fltrdr-${version}"; + pname = "fltrdr"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/fondu/default.nix b/nixpkgs/pkgs/tools/misc/fondu/default.nix index e31da3bfd212..33efd2bd6143 100644 --- a/nixpkgs/pkgs/tools/misc/fondu/default.nix +++ b/nixpkgs/pkgs/tools/misc/fondu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "060102"; - name = "fondu-${version}"; + pname = "fondu"; src = fetchurl { url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz"; diff --git a/nixpkgs/pkgs/tools/misc/fortune/default.nix b/nixpkgs/pkgs/tools/misc/fortune/default.nix index 45d27e7b7c82..871f113a41dd 100644 --- a/nixpkgs/pkgs/tools/misc/fortune/default.nix +++ b/nixpkgs/pkgs/tools/misc/fortune/default.nix @@ -13,7 +13,8 @@ let srcs = { version = "2.6.2"; in stdenv.mkDerivation { - name = "fortune-mod-${version}"; + pname = "fortune-mod"; + inherit version; src = srcs.fortune; diff --git a/nixpkgs/pkgs/tools/misc/fpart/default.nix b/nixpkgs/pkgs/tools/misc/fpart/default.nix index f75dfec5e562..563152cc10df 100644 --- a/nixpkgs/pkgs/tools/misc/fpart/default.nix +++ b/nixpkgs/pkgs/tools/misc/fpart/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "fpart-${version}"; + pname = "fpart"; version = "1.1.0"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4"; }; diff --git a/nixpkgs/pkgs/tools/misc/fpp/default.nix b/nixpkgs/pkgs/tools/misc/fpp/default.nix index 8b7c2b430882..ac731bcdbe86 100644 --- a/nixpkgs/pkgs/tools/misc/fpp/default.nix +++ b/nixpkgs/pkgs/tools/misc/fpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - name = "fpp-${version}"; + pname = "fpp"; version = "0.8.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/fsmark/default.nix b/nixpkgs/pkgs/tools/misc/fsmark/default.nix index 0e821ce7f1f5..ac56d948bdad 100644 --- a/nixpkgs/pkgs/tools/misc/fsmark/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsmark/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fsmark-${version}"; + pname = "fsmark"; version = "3.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/fsmon/default.nix b/nixpkgs/pkgs/tools/misc/fsmon/default.nix index f9e40b6b7867..dde69778e5fe 100644 --- a/nixpkgs/pkgs/tools/misc/fsmon/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsmon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fsmon-${version}"; + pname = "fsmon"; version = "1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/fsql/default.nix b/nixpkgs/pkgs/tools/misc/fsql/default.nix index e723db260eb5..4e7db2dc4847 100644 --- a/nixpkgs/pkgs/tools/misc/fsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsql/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "fsql-${version}"; + pname = "fsql"; version = "0.3.1"; goPackagePath = "github.com/kshvmdn/fsql"; diff --git a/nixpkgs/pkgs/tools/misc/fwup/default.nix b/nixpkgs/pkgs/tools/misc/fwup/default.nix index a5baf4de5b84..a189e8c1dba5 100644 --- a/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -3,7 +3,7 @@ , libarchive, darwin, coreutils }: stdenv.mkDerivation rec { - name = "fwup-${version}"; + pname = "fwup"; version = "1.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/fzy/default.nix b/nixpkgs/pkgs/tools/misc/fzy/default.nix index 6a04213e21ae..5b05ce534d70 100644 --- a/nixpkgs/pkgs/tools/misc/fzy/default.nix +++ b/nixpkgs/pkgs/tools/misc/fzy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fzy-${version}"; + pname = "fzy"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/gams/default.nix b/nixpkgs/pkgs/tools/misc/gams/default.nix index 011231692f3a..ba0b76026a58 100644 --- a/nixpkgs/pkgs/tools/misc/gams/default.nix +++ b/nixpkgs/pkgs/tools/misc/gams/default.nix @@ -4,7 +4,7 @@ assert licenseFile != null; stdenv.mkDerivation rec { version = "25.0.2"; - name = "gams-${version}"; + pname = "gams"; src = fetchurl { url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe"; sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; diff --git a/nixpkgs/pkgs/tools/misc/gawp/default.nix b/nixpkgs/pkgs/tools/misc/gawp/default.nix index c187b09624ad..002853abc1d3 100644 --- a/nixpkgs/pkgs/tools/misc/gawp/default.nix +++ b/nixpkgs/pkgs/tools/misc/gawp/default.nix @@ -3,7 +3,7 @@ with builtins; buildGoPackage rec { - name = "gawp-${version}"; + pname = "gawp"; version = "20160121-${stdenv.lib.strings.substring 0 7 rev}"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; diff --git a/nixpkgs/pkgs/tools/misc/gbdfed/default.nix b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix index 6307d012debd..9b41dba4e259 100644 --- a/nixpkgs/pkgs/tools/misc/gbdfed/default.nix +++ b/nixpkgs/pkgs/tools/misc/gbdfed/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "gbdfed-${version}"; + pname = "gbdfed"; src = fetchurl { - url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${name}.tar.bz2"; + url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${pname}-${version}.tar.bz2"; sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; diff --git a/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/nixpkgs/pkgs/tools/misc/geekbench/default.nix index d71227ae8f53..0f32d1e63b1e 100644 --- a/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "geekbench-${version}"; + pname = "geekbench"; version = "4.4.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/geteltorito/default.nix b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix index b95c7179141d..d6fbb6233312 100644 --- a/nixpkgs/pkgs/tools/misc/geteltorito/default.nix +++ b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix @@ -1,7 +1,7 @@ { stdenv, perl, ronn, fetchurl }: stdenv.mkDerivation rec { - name = "geteltorito-${version}"; + pname = "geteltorito"; version = "0.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix index b79388c6f29d..e5c0997c8e3e 100644 --- a/nixpkgs/pkgs/tools/misc/gh-ost/default.nix +++ b/nixpkgs/pkgs/tools/misc/gh-ost/default.nix @@ -7,7 +7,8 @@ let in buildGoPackage ({ - name = "gh-ost-${version}"; + pname = "gh-ost"; + inherit version; inherit goPackagePath; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/gibo/default.nix b/nixpkgs/pkgs/tools/misc/gibo/default.nix index 5c8bacac162c..a8e957ce4840 100644 --- a/nixpkgs/pkgs/tools/misc/gibo/default.nix +++ b/nixpkgs/pkgs/tools/misc/gibo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, coreutils, findutils, git }: stdenv.mkDerivation rec { - name = "gibo-${version}"; + pname = "gibo"; version = "1.0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/git-town/default.nix b/nixpkgs/pkgs/tools/misc/git-town/default.nix index afcf9cf4c781..5438f71930da 100644 --- a/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-town-${version}"; + pname = "git-town"; version = "7.2.0"; goPackagePath = "github.com/Originate/git-town"; diff --git a/nixpkgs/pkgs/tools/misc/gnokii/default.nix b/nixpkgs/pkgs/tools/misc/gnokii/default.nix index be4de738c1c3..581a1f84fc7f 100644 --- a/nixpkgs/pkgs/tools/misc/gnokii/default.nix +++ b/nixpkgs/pkgs/tools/misc/gnokii/default.nix @@ -2,12 +2,12 @@ , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { - name = "gnokii-${version}"; + pname = "gnokii"; version = "0.6.31"; src = fetchurl { sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8"; - url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz"; + url = "https://www.gnokii.org/download/gnokii/${pname}-${version}.tar.gz"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/nixpkgs/pkgs/tools/misc/goaccess/default.nix index 0430f010e97a..6fad9829d799 100644 --- a/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "goaccess-${version}"; + pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/gosu/default.nix b/nixpkgs/pkgs/tools/misc/gosu/default.nix index d7c10220f4b7..bd53529a5d25 100644 --- a/nixpkgs/pkgs/tools/misc/gosu/default.nix +++ b/nixpkgs/pkgs/tools/misc/gosu/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gosu-${version}"; + pname = "gosu"; version = "2017-05-09"; rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; diff --git a/nixpkgs/pkgs/tools/misc/graylog/default.nix b/nixpkgs/pkgs/tools/misc/graylog/default.nix index 59ac70a8162f..0f448cc089c8 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { + pname = "graylog"; version = "3.1.0"; - name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; diff --git a/nixpkgs/pkgs/tools/misc/gringo/default.nix b/nixpkgs/pkgs/tools/misc/gringo/default.nix index 6c5bac11e738..51c6d9c20758 100644 --- a/nixpkgs/pkgs/tools/misc/gringo/default.nix +++ b/nixpkgs/pkgs/tools/misc/gringo/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "gringo-${version}"; + pname = "gringo"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index ec1c5897ed79..7e30ffe0b288 100644 --- a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -31,7 +31,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04-rc1"; + version = "2.04"; in ( @@ -40,12 +40,13 @@ assert zfsSupport -> zfs != null; assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { - name = "grub-${version}"; + pname = "grub"; + inherit version; src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; - rev = name; - sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; + rev = "${pname}-${version}"; + sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/nixpkgs/pkgs/tools/misc/grub/trusted.nix index ca4e477adce7..7b432df3e8b8 100644 --- a/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -29,7 +29,8 @@ let in stdenv.mkDerivation rec { - name = "trustedGRUB2-${version}"; + pname = "trustedGRUB2"; + inherit version; src = if for_HP_laptop then fetchgit { diff --git a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix index ec77f3965273..edb9508df31a 100644 --- a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix @@ -5,7 +5,7 @@ let arch = else if stdenv.isx86_64 then "x86_64" else throw "Unknown architecture"; in stdenv.mkDerivation rec { - name = "grub4dos-${version}"; + pname = "grub4dos"; version = "0.4.6a-2019-05-12"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix index f7cdf5ca608b..78a678f0714d 100644 --- a/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version="1.1.3"; - name = "gsmartcontrol-${version}"; + pname = "gsmartcontrol"; src = fetchurl { url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/misc/gti/default.nix b/nixpkgs/pkgs/tools/misc/gti/default.nix index a66b32c789c2..bca481cade45 100644 --- a/nixpkgs/pkgs/tools/misc/gti/default.nix +++ b/nixpkgs/pkgs/tools/misc/gti/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gti-${version}"; + pname = "gti"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/h5utils/default.nix b/nixpkgs/pkgs/tools/misc/h5utils/default.nix index db18cae77b1f..9fe267771102 100644 --- a/nixpkgs/pkgs/tools/misc/h5utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/h5utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.13.1"; - name = "h5utils-${version}"; + pname = "h5utils"; # fetchurl is used instead of fetchFromGitHub because the git repo version requires # additional tools to build compared to the tarball release; see the README for details. diff --git a/nixpkgs/pkgs/tools/misc/hakuneko/default.nix b/nixpkgs/pkgs/tools/misc/hakuneko/default.nix index be5e1371cd45..8c2e7dc7451d 100644 --- a/nixpkgs/pkgs/tools/misc/hakuneko/default.nix +++ b/nixpkgs/pkgs/tools/misc/hakuneko/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, wxGTK30, openssl, curl }: stdenv.mkDerivation rec { - name = "hakuneko-${version}"; + pname = "hakuneko"; version = "1.4.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix index 8b19cd038951..af4d4228c2c6 100644 --- a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix @@ -2,7 +2,8 @@ let version = "0.0.5"; in stdenv.mkDerivation { - name = "hdaps-gl-${version}"; + pname = "hdaps-gl"; + inherit version; src = fetchzip { url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz"; sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4"; diff --git a/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/nixpkgs/pkgs/tools/misc/hdf4/default.nix index bd3bebc881ee..e765e9234745 100644 --- a/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "hdf-${version}"; + pname = "hdf"; version = "4.2.14"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix b/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix index 17b48ad8741a..d27f6fc01bce 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/1_8.nix @@ -24,9 +24,9 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { version = "1.8.19"; - name = "hdf5-${version}"; + pname = "hdf5"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ; }; diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index e6402322d35a..336010718dda 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -17,9 +17,9 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { version = "1.10.5"; - name = "hdf5-${version}"; + pname = "hdf5"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8"; }; diff --git a/nixpkgs/pkgs/tools/misc/hdfjava/default.nix b/nixpkgs/pkgs/tools/misc/hdfjava/default.nix index 0fe72425d79c..6087a76e6bd1 100644 --- a/nixpkgs/pkgs/tools/misc/hdfjava/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdfjava/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, javac }: stdenv.mkDerivation rec { - name = "hdf-java-${version}"; + pname = "hdf-java"; version = "3.3.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/nixpkgs/pkgs/tools/misc/hdfview/default.nix index 82801da322c6..fb6914c01d0a 100644 --- a/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { - name = "hdfview-${version}"; + pname = "hdfview"; version = "2.14"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; + url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz"; sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; }; diff --git a/nixpkgs/pkgs/tools/misc/hebcal/default.nix b/nixpkgs/pkgs/tools/misc/hebcal/default.nix index 55542b4c7fc6..39678abeba43 100644 --- a/nixpkgs/pkgs/tools/misc/hebcal/default.nix +++ b/nixpkgs/pkgs/tools/misc/hebcal/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.18"; - name = "hebcal-${version}"; + pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; diff --git a/nixpkgs/pkgs/tools/misc/hexd/default.nix b/nixpkgs/pkgs/tools/misc/hexd/default.nix index b080e23b265a..eabb7838e8ac 100644 --- a/nixpkgs/pkgs/tools/misc/hexd/default.nix +++ b/nixpkgs/pkgs/tools/misc/hexd/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "hexd-${version}"; + pname = "hexd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/hhpc/default.nix b/nixpkgs/pkgs/tools/misc/hhpc/default.nix index b4ee1f2f5c0d..4b1b0d0c7623 100644 --- a/nixpkgs/pkgs/tools/misc/hhpc/default.nix +++ b/nixpkgs/pkgs/tools/misc/hhpc/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, xorg, pkgconfig}: stdenv.mkDerivation rec { - name = "hhpc-${version}"; + pname = "hhpc"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/hostsblock/default.nix b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix index a0fcc6074dc0..61832a5d3260 100644 --- a/nixpkgs/pkgs/tools/misc/hostsblock/default.nix +++ b/nixpkgs/pkgs/tools/misc/hostsblock/default.nix @@ -20,7 +20,7 @@ ] }: stdenv.mkDerivation rec { - name = "hostsblock-${version}"; + pname = "hostsblock"; version = "20161213"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/hpl/default.nix b/nixpkgs/pkgs/tools/misc/hpl/default.nix index d9aaefb46d94..16bc0393f23c 100644 --- a/nixpkgs/pkgs/tools/misc/hpl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hpl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openblasCompat, mpi } : stdenv.mkDerivation rec { - name = "hpl-${version}"; + pname = "hpl"; version = "2.3"; src = fetchurl { - url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz"; + url = "http://www.netlib.org/benchmark/hpl/${pname}-${version}.tar.gz"; sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j"; }; diff --git a/nixpkgs/pkgs/tools/misc/i3cat/default.nix b/nixpkgs/pkgs/tools/misc/i3cat/default.nix index 7035f2ecedff..bc934c424f30 100644 --- a/nixpkgs/pkgs/tools/misc/i3cat/default.nix +++ b/nixpkgs/pkgs/tools/misc/i3cat/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "i3cat-${version}"; + pname = "i3cat"; version = "20150321-${stdenv.lib.strings.substring 0 7 rev}"; rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; diff --git a/nixpkgs/pkgs/tools/misc/i3minator/default.nix b/nixpkgs/pkgs/tools/misc/i3minator/default.nix index 898ecd9df4a8..372eebb59f61 100644 --- a/nixpkgs/pkgs/tools/misc/i3minator/default.nix +++ b/nixpkgs/pkgs/tools/misc/i3minator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "i3minator-${version}"; + pname = "i3minator"; version = "0.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ical2org/default.nix b/nixpkgs/pkgs/tools/misc/ical2org/default.nix index 141fc968a2d4..872de2c702b6 100644 --- a/nixpkgs/pkgs/tools/misc/ical2org/default.nix +++ b/nixpkgs/pkgs/tools/misc/ical2org/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage}: buildGoPackage rec { - name = "ical2org-${version}"; + pname = "ical2org"; version="1.1.5"; goPackagePath = "github.com/rjhorniii/ical2org"; diff --git a/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix index 15af413a999d..98b039e3f8ae 100644 --- a/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "ideviceinstaller"; version = "2018-10-01"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/nixpkgs/pkgs/tools/misc/ifdtool/default.nix b/nixpkgs/pkgs/tools/misc/ifdtool/default.nix index 7d15825c27e8..7fe4ad86b8eb 100644 --- a/nixpkgs/pkgs/tools/misc/ifdtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ifdtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ifdtool-${version}"; + pname = "ifdtool"; version = "4.9"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/intelmetool/default.nix b/nixpkgs/pkgs/tools/misc/intelmetool/default.nix index 66378e457a26..87aa7df8d6d7 100644 --- a/nixpkgs/pkgs/tools/misc/intelmetool/default.nix +++ b/nixpkgs/pkgs/tools/misc/intelmetool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, zlib, pciutils }: stdenv.mkDerivation rec { - name = "intelmetool-${version}"; + pname = "intelmetool"; version = "4.8.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix b/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix index caefcb835a3f..981d9f2dc6cf 100644 --- a/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { - name = "ipad_charge-${version}"; + pname = "ipad_charge"; version = "2015-02-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ised/default.nix b/nixpkgs/pkgs/tools/misc/ised/default.nix index a87d199d9bd4..3529324b30ad 100644 --- a/nixpkgs/pkgs/tools/misc/ised/default.nix +++ b/nixpkgs/pkgs/tools/misc/ised/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ised-${version}"; + pname = "ised"; version = "2.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/ised/${name}.tar.bz2"; + url = "mirror://sourceforge/project/ised/${pname}-${version}.tar.bz2"; sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb"; }; diff --git a/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/nixpkgs/pkgs/tools/misc/jdupes/default.nix index d82347fef8f8..bf1501155d96 100644 --- a/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jdupes-${version}"; + pname = "jdupes"; version = "1.13.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/keychain/default.nix b/nixpkgs/pkgs/tools/misc/keychain/default.nix index 208c04ff039b..c19ed50ece2d 100644 --- a/nixpkgs/pkgs/tools/misc/keychain/default.nix +++ b/nixpkgs/pkgs/tools/misc/keychain/default.nix @@ -2,7 +2,7 @@ , perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { - name = "keychain-${version}"; + pname = "keychain"; version = "2.8.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/kt/default.nix b/nixpkgs/pkgs/tools/misc/kt/default.nix index be0ceda511c4..c272584e2c05 100644 --- a/nixpkgs/pkgs/tools/misc/kt/default.nix +++ b/nixpkgs/pkgs/tools/misc/kt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "kt-${version}"; + pname = "kt"; version = "12.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/latex2html/default.nix b/nixpkgs/pkgs/tools/misc/latex2html/default.nix index b7963c3ed817..2ca99eb61e88 100644 --- a/nixpkgs/pkgs/tools/misc/latex2html/default.nix +++ b/nixpkgs/pkgs/tools/misc/latex2html/default.nix @@ -6,7 +6,7 @@ # https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb stdenv.mkDerivation rec { - name = "latex2html-${version}"; + pname = "latex2html"; version = "2018"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/nixpkgs/pkgs/tools/misc/lbdb/default.nix index e48d6354eb53..6624eb5102d3 100644 --- a/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -12,7 +12,8 @@ in with stdenv.lib; with perlPackages; stdenv.mkDerivation { - name = "lbdb-${version}"; + pname = "lbdb"; + inherit version; src = fetchurl { url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; diff --git a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix index 72c9cecf5406..5955c1104d3f 100644 --- a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: stdenv.mkDerivation rec { - name = "ldapvi-${version}"; + pname = "ldapvi"; version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; # use latest git, it includes some important patches since 2007 release diff --git a/nixpkgs/pkgs/tools/misc/ldmtool/default.nix b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix index c6b544f9e0a1..b59c46a84779 100644 --- a/nixpkgs/pkgs/tools/misc/ldmtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldmtool/default.nix @@ -2,7 +2,7 @@ libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "ldmtool-${version}"; + pname = "ldmtool"; version = "0.2.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/lf/default.nix b/nixpkgs/pkgs/tools/misc/lf/default.nix index 95f88654425f..61e115e71eb7 100644 --- a/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "lf-${version}"; + pname = "lf"; version = "13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/libcpuid/default.nix b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix index 8c9db5b8a778..e31112a74d8a 100644 --- a/nixpkgs/pkgs/tools/misc/libcpuid/default.nix +++ b/nixpkgs/pkgs/tools/misc/libcpuid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libcpuid-${version}"; + pname = "libcpuid"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix index d489a5188f14..9bc7c372d93c 100644 --- a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix +++ b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.05"; - name = "quota-${version}"; + pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/logstash/5.x.nix b/nixpkgs/pkgs/tools/misc/logstash/5.x.nix index 7834bc96bef0..2545dd1e6bc0 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/5.x.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/5.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = elk5Version; - name = "logstash-${version}"; + pname = "logstash"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0"; }; diff --git a/nixpkgs/pkgs/tools/misc/logstash/contrib.nix b/nixpkgs/pkgs/tools/misc/logstash/contrib.nix index dc33d2ece548..b580d559868b 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/contrib.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/contrib.nix @@ -4,7 +4,7 @@ # $path/logstash/{inputs,codecs,filters,outputs}/*.rb stdenv.mkDerivation rec { version = "1.4.2"; - name = "logstash-contrib-${version}"; + pname = "logstash-contrib"; src = fetchzip { url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock index f6aa88bbdea1..ed48cc5921b0 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - lolcat (99.9.99) + lolcat (100.0.0) manpages (~> 0.6.1) optimist (~> 3.0.0) - paint (~> 2.0.0) + paint (~> 2.1.0) manpages (0.6.1) optimist (3.0.0) - paint (2.0.3) + paint (2.1.1) PLATFORMS ruby diff --git a/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix index f21e5637993d..2c2bc9cead10 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0422869sf6hif1nrfzi8fwklnrdqj6hxxwg3403xvd9d50yndrn4"; + sha256 = "0k1m2ihcprjq9jdmq2v3xlf27hqbpr2vjnnyfwp3z2zspzbl0nys"; type = "gem"; }; - version = "99.9.99"; + version = "100.0.0"; }; manpages = { groups = ["default"]; @@ -35,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2"; + sha256 = "0rrb2p2yk6ffhm0gz8ba431mf63kq7w27gwavxl7n8qd2splj4mh"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; -} +} \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/misc/ltunify/default.nix b/nixpkgs/pkgs/tools/misc/ltunify/default.nix index cb594391e2a1..4521f8b407a6 100644 --- a/nixpkgs/pkgs/tools/misc/ltunify/default.nix +++ b/nixpkgs/pkgs/tools/misc/ltunify/default.nix @@ -4,7 +4,7 @@ # adding this to services.udev.packages on NixOS stdenv.mkDerivation rec { - name = "ltunify-${version}"; + pname = "ltunify"; version = "unstable-20180330"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/mandoc/default.nix b/nixpkgs/pkgs/tools/misc/mandoc/default.nix index 9ddd92188016..828e23582363 100644 --- a/nixpkgs/pkgs/tools/misc/mandoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mandoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "mandoc-${version}"; + pname = "mandoc"; version = "1.14.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/massren/default.nix b/nixpkgs/pkgs/tools/misc/massren/default.nix index e2ff4868c9ea..6d198a35605d 100644 --- a/nixpkgs/pkgs/tools/misc/massren/default.nix +++ b/nixpkgs/pkgs/tools/misc/massren/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "massren-${version}"; + pname = "massren"; version = "1.5.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/nixpkgs/pkgs/tools/misc/mbuffer/default.nix index 59ed474e9bc2..44b00adf5c17 100644 --- a/nixpkgs/pkgs/tools/misc/mbuffer/default.nix +++ b/nixpkgs/pkgs/tools/misc/mbuffer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20190725"; - name = "mbuffer-${version}"; + pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; diff --git a/nixpkgs/pkgs/tools/misc/mc/default.nix b/nixpkgs/pkgs/tools/misc/mc/default.nix index 7f0cdac1dbfa..b2711903ead1 100644 --- a/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -2,11 +2,11 @@ , libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}: stdenv.mkDerivation rec { - name = "mc-${version}"; + pname = "mc"; version = "4.8.23"; src = fetchurl { - url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; + url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"; }; diff --git a/nixpkgs/pkgs/tools/misc/mcrypt/default.nix b/nixpkgs/pkgs/tools/misc/mcrypt/default.nix index 52c96fda1973..bc520c57a338 100644 --- a/nixpkgs/pkgs/tools/misc/mcrypt/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcrypt/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.8"; - name = "mcrypt-${version}"; + pname = "mcrypt"; src = fetchurl { - url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${pname}-${version}.tar.gz"; sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; }; diff --git a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix index 8a3842322f98..b365086c46d3 100644 --- a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix @@ -4,7 +4,8 @@ let version = "0.7.1"; in stdenv.mkDerivation { - name = "mdbtools-${version}"; + pname = "mdbtools"; + inherit version; src = fetchFromGitHub { owner = "brianb"; diff --git a/nixpkgs/pkgs/tools/misc/megacli/default.nix b/nixpkgs/pkgs/tools/misc/megacli/default.nix index bbd78feaaf87..5121491625f0 100644 --- a/nixpkgs/pkgs/tools/misc/megacli/default.nix +++ b/nixpkgs/pkgs/tools/misc/megacli/default.nix @@ -1,7 +1,7 @@ { stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }: stdenv.mkDerivation rec { - name = "megacli-${version}"; + pname = "megacli"; version = "8.07.14"; src = diff --git a/nixpkgs/pkgs/tools/misc/mht2htm/default.nix b/nixpkgs/pkgs/tools/misc/mht2htm/default.nix index 4f6c4bad97c7..e382db0b92c3 100644 --- a/nixpkgs/pkgs/tools/misc/mht2htm/default.nix +++ b/nixpkgs/pkgs/tools/misc/mht2htm/default.nix @@ -4,7 +4,7 @@ let date = "07.apr.2016"; in stdenv.mkDerivation rec { - name = "mht2mht-${version}"; + pname = "mht2mht"; version = "1.8.1.35"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/minicom/default.nix b/nixpkgs/pkgs/tools/misc/minicom/default.nix index 3c2ed1352257..3e23e2bddcc1 100644 --- a/nixpkgs/pkgs/tools/misc/minicom/default.nix +++ b/nixpkgs/pkgs/tools/misc/minicom/default.nix @@ -2,7 +2,7 @@ , lrzsz, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "minicom-${version}"; + pname = "minicom"; version = "2.7.1"; # The repository isn't tagged properly, so we need to use commit refs diff --git a/nixpkgs/pkgs/tools/misc/ministat/default.nix b/nixpkgs/pkgs/tools/misc/ministat/default.nix index 7b9549a80fea..7b8b8a82b727 100644 --- a/nixpkgs/pkgs/tools/misc/ministat/default.nix +++ b/nixpkgs/pkgs/tools/misc/ministat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "ministat-${version}"; + pname = "ministat"; version = "20150715-1"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/misc/mktorrent/default.nix b/nixpkgs/pkgs/tools/misc/mktorrent/default.nix index da1e8be7cf49..b2f7fdf2a906 100644 --- a/nixpkgs/pkgs/tools/misc/mktorrent/default.nix +++ b/nixpkgs/pkgs/tools/misc/mktorrent/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, openssl}: stdenv.mkDerivation rec { - name = "mktorrent-${version}"; + pname = "mktorrent"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/mlocate/default.nix b/nixpkgs/pkgs/tools/misc/mlocate/default.nix index baf418ac9f04..f8fb253af471 100644 --- a/nixpkgs/pkgs/tools/misc/mlocate/default.nix +++ b/nixpkgs/pkgs/tools/misc/mlocate/default.nix @@ -3,11 +3,11 @@ let dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; in stdenv.mkDerivation rec { - name = "mlocate-${version}"; + pname = "mlocate"; version = "0.26"; src = fetchurl { - url = "https://releases.pagure.org/mlocate/${name}.tar.xz"; + url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz"; sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh"; }; diff --git a/nixpkgs/pkgs/tools/misc/mmake/default.nix b/nixpkgs/pkgs/tools/misc/mmake/default.nix index 1d3a355dd950..a791cbe5d482 100644 --- a/nixpkgs/pkgs/tools/misc/mmake/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmake/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mmake-${version}"; + pname = "mmake"; version = "1.2.0"; goPackagePath = "github.com/tj/mmake"; diff --git a/nixpkgs/pkgs/tools/misc/mmv/default.nix b/nixpkgs/pkgs/tools/misc/mmv/default.nix index 602c9c26c787..6129f15c734f 100644 --- a/nixpkgs/pkgs/tools/misc/mmv/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mmv-${version}"; + pname = "mmv"; version = "1.01b"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 16762d243dbb..25d7eaba55ed 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -52,7 +52,8 @@ let throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "mongodb-compass-${version}"; + pname = "mongodb-compass"; + inherit version; inherit src; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index a728450d76e5..dc7a64bdcf7e 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -10,7 +10,7 @@ in with stdenv.lib; buildGoPackage rec { - name = "mongo-tools-${version}"; + pname = "mongo-tools"; version = "3.7.2"; rev = "r${version}"; diff --git a/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/nixpkgs/pkgs/tools/misc/moreutils/default.nix index 00cbc8b46295..336d673f7ecd 100644 --- a/nixpkgs/pkgs/tools/misc/moreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/moreutils/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "moreutils-${version}"; + pname = "moreutils"; version = "0.63"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix index 5be323a6f4bc..df84084fc9c1 100644 --- a/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix +++ b/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: stdenv.mkDerivation rec { - name = "mpdscribble-${version}"; + pname = "mpdscribble"; version = "0.22"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/mprime/default.nix b/nixpkgs/pkgs/tools/misc/mprime/default.nix index 778671f0b54e..363e90ab5f23 100644 --- a/nixpkgs/pkgs/tools/misc/mprime/default.nix +++ b/nixpkgs/pkgs/tools/misc/mprime/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "mprime-${version}"; + pname = "mprime"; version = "29.4b7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/mrtg/default.nix b/nixpkgs/pkgs/tools/misc/mrtg/default.nix index 26fcea669c22..922592a256d0 100644 --- a/nixpkgs/pkgs/tools/misc/mrtg/default.nix +++ b/nixpkgs/pkgs/tools/misc/mrtg/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "2.17.7"; - name = "mrtg-${version}"; + pname = "mrtg"; src = fetchurl { - url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz"; sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; }; diff --git a/nixpkgs/pkgs/tools/misc/ms-sys/default.nix b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix index 04271b610699..2607cf6f300a 100644 --- a/nixpkgs/pkgs/tools/misc/ms-sys/default.nix +++ b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "ms-sys-${version}"; + pname = "ms-sys"; version = "2.6.0"; src = fetchurl { - url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; + url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz"; sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz"; }; diff --git a/nixpkgs/pkgs/tools/misc/multitail/default.nix b/nixpkgs/pkgs/tools/misc/multitail/default.nix index 07561d390cd0..3037b672498c 100644 --- a/nixpkgs/pkgs/tools/misc/multitail/default.nix +++ b/nixpkgs/pkgs/tools/misc/multitail/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.4.2"; - name = "multitail-${version}"; + pname = "multitail"; src = fetchurl { - url = "https://www.vanheusden.com/multitail/${name}.tgz"; + url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz"; sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"; }; diff --git a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix index 9c483fe3b8f2..183871c39a7e 100644 --- a/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix +++ b/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mysqltuner-${version}"; + pname = "mysqltuner"; version = "1.7.13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix index 57036acb58e8..525c16b6024b 100644 --- a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix +++ b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "nagstamon-${version}"; + pname = "nagstamon"; version = "3.2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/nbench/default.nix b/nixpkgs/pkgs/tools/misc/nbench/default.nix index 2312ce236abd..a1a6347642b6 100644 --- a/nixpkgs/pkgs/tools/misc/nbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/nbench/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nbench-byte-${version}"; + pname = "nbench-byte"; version = "2.2.3"; src = fetchurl { - url = "http://www.math.utah.edu/~mayer/linux/${name}.tar.gz"; + url = "http://www.math.utah.edu/~mayer/linux/${pname}-${version}.tar.gz"; sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj"; }; diff --git a/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/nixpkgs/pkgs/tools/misc/ncdu/default.nix index 6b2e7d681706..d29626c99d18 100644 --- a/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ncdu-${version}"; + pname = "ncdu"; version = "1.14.1"; src = fetchurl { - url = "https://dev.yorhel.nl/download/${name}.tar.gz"; + url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy"; }; diff --git a/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/nixpkgs/pkgs/tools/misc/neofetch/default.nix index 18ae88547a09..5850c4a90af7 100644 --- a/nixpkgs/pkgs/tools/misc/neofetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/neofetch/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "neofetch-${version}"; - version = "6.0.0"; + pname = "neofetch"; + version = "6.1.0"; + src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0j0r40llyry1sgc6p9wd7jrpydps2lnj4rwajjp37697g2bik89i"; + sha256 = "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"; }; dontBuild = true; - makeFlags = [ - "PREFIX=$(out)" - "SYSCONFDIR=$(out)/etc" + "PREFIX=${placeholder "out"}" + "SYSCONFDIR=${placeholder "out"}/etc" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix index e19eac1c51e5..91dd56c9b0f4 100644 --- a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2019-02-13"; - name = "nginx-config-formatter-${version}"; + pname = "nginx-config-formatter"; src = fetchFromGitHub { owner = "1connect"; diff --git a/nixpkgs/pkgs/tools/misc/nms/default.nix b/nixpkgs/pkgs/tools/misc/nms/default.nix index 3037262322f2..0005ffe824b0 100644 --- a/nixpkgs/pkgs/tools/misc/nms/default.nix +++ b/nixpkgs/pkgs/tools/misc/nms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nms-${version}"; + pname = "nms"; version = "0.3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/noteshrink/default.nix b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix index 77c84ab45118..b197e9bc5d2e 100644 --- a/nixpkgs/pkgs/tools/misc/noteshrink/default.nix +++ b/nixpkgs/pkgs/tools/misc/noteshrink/default.nix @@ -3,7 +3,7 @@ with python3.pkgs; buildPythonApplication rec { - name = "noteshrink-${version}"; + pname = "noteshrink"; version = "0.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix index 93c0f5e346bf..307a08bbdf93 100644 --- a/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix +++ b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, dbus, pkgconfig }: stdenv.mkDerivation rec { - name = "notify-desktop-${version}"; + pname = "notify-desktop"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/nvramtool/default.nix b/nixpkgs/pkgs/tools/misc/nvramtool/default.nix index fdce7076661a..ecff547e9513 100644 --- a/nixpkgs/pkgs/tools/misc/nvramtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/nvramtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, iasl, flex, bison }: stdenv.mkDerivation rec { - name = "nvramtool-${version}"; + pname = "nvramtool"; version = "4.8.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix b/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix index 6d508a48901a..3b45b7b06442 100644 --- a/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/oci-image-tool/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "oci-image-tool-${version}"; + pname = "oci-image-tool"; version = "1.0.0-rc1"; goPackagePath = "github.com/opencontainers/image-tools"; diff --git a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix index 9ffb89aca6b1..4317c46190db 100644 --- a/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -4,7 +4,7 @@ let system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; in stdenv.mkDerivation rec { - name = "ocz-ssd-guru-${version}"; + pname = "ocz-ssd-guru"; version = "1.0.1170"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index f6aea4a92ab9..2a0846dd5116 100644 --- a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "opentsdb-${version}"; + pname = "opentsdb"; version = "2.3.1"; src = fetchurl { - url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd"; }; diff --git a/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/nixpkgs/pkgs/tools/misc/os-prober/default.nix index 59a60e356b80..78426329975c 100644 --- a/nixpkgs/pkgs/tools/misc/os-prober/default.nix +++ b/nixpkgs/pkgs/tools/misc/os-prober/default.nix @@ -10,7 +10,7 @@ ntfs3g # ntfs3g stdenv.mkDerivation rec { version = "1.76"; - name = "os-prober-${version}"; + pname = "os-prober"; src = fetchurl { url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2"; sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g"; diff --git a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index f14fb5269970..370d19247113 100644 --- a/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: stdenv.mkDerivation rec { - name = "osm2pgsql-${version}"; + pname = "osm2pgsql"; version = "0.96.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/otfcc/default.nix b/nixpkgs/pkgs/tools/misc/otfcc/default.nix index 96e5e6a1d94e..4b28a7c45e5d 100644 --- a/nixpkgs/pkgs/tools/misc/otfcc/default.nix +++ b/nixpkgs/pkgs/tools/misc/otfcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, premake5 }: stdenv.mkDerivation rec { - name = "otfcc-${version}"; + pname = "otfcc"; version = "0.9.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/parcellite/default.nix b/nixpkgs/pkgs/tools/misc/parcellite/default.nix index 1e747961499c..5313b69933b6 100644 --- a/nixpkgs/pkgs/tools/misc/parcellite/default.nix +++ b/nixpkgs/pkgs/tools/misc/parcellite/default.nix @@ -3,7 +3,7 @@ , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { - name = "parcellite-${version}"; + pname = "parcellite"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/pastebinit/default.nix b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix index a5e45dc259b9..c2c8e2b85733 100644 --- a/nixpkgs/pkgs/tools/misc/pastebinit/default.nix +++ b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5"; - name = "pastebinit-${version}"; + pname = "pastebinit"; src = fetchurl { - url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; diff --git a/nixpkgs/pkgs/tools/misc/pb_cli/default.nix b/nixpkgs/pkgs/tools/misc/pb_cli/default.nix index fe1d848ee502..858422b85328 100644 --- a/nixpkgs/pkgs/tools/misc/pb_cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/pb_cli/default.nix @@ -6,7 +6,7 @@ assert video -> capture != null; assert clipboard -> xclip != null; stdenv.mkDerivation rec { - name = "pb_cli-unstable-${version}"; + pname = "pb_cli-unstable"; version = "2019-03-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index c16106f4637b..6c1bc5fcf04d 100644 --- a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }: stdenv.mkDerivation rec { - name = "phoronix-test-suite-${version}"; + pname = "phoronix-test-suite"; version = "8.8.1"; src = fetchurl { - url = "https://phoronix-test-suite.com/releases/${name}.tar.gz"; + url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn"; }; diff --git a/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix index 74d24db574ff..dd07fee34054 100644 --- a/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/phraseapp-client/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "phraseapp-client-${version}"; + pname = "phraseapp-client"; version = "1.11.0"; goPackagePath = "github.com/phrase/phraseapp-client"; diff --git a/nixpkgs/pkgs/tools/misc/pick/default.nix b/nixpkgs/pkgs/tools/misc/pick/default.nix index 45b0da6f8db0..ceb2bace7db9 100644 --- a/nixpkgs/pkgs/tools/misc/pick/default.nix +++ b/nixpkgs/pkgs/tools/misc/pick/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: stdenv.mkDerivation rec { - name = "pick-${version}"; + pname = "pick"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/picocom/default.nix b/nixpkgs/pkgs/tools/misc/picocom/default.nix index c49695fd9ad9..1ad219403687 100644 --- a/nixpkgs/pkgs/tools/misc/picocom/default.nix +++ b/nixpkgs/pkgs/tools/misc/picocom/default.nix @@ -5,7 +5,7 @@ assert stdenv.isDarwin -> IOKit != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "picocom-${version}"; + pname = "picocom"; version = "3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/pipelight/default.nix b/nixpkgs/pkgs/tools/misc/pipelight/default.nix index abbd64cb62fd..5bd1e3470829 100644 --- a/nixpkgs/pkgs/tools/misc/pipelight/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipelight/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { version = "0.2.8.2"; - name = "pipelight-${version}"; + pname = "pipelight"; src = fetchurl { url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/pixd/default.nix b/nixpkgs/pkgs/tools/misc/pixd/default.nix index ececef398501..a16333f6e440 100644 --- a/nixpkgs/pkgs/tools/misc/pixd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pixd/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pixd-${version}"; + pname = "pixd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 1cf64362e6d6..eb2881b29f75 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2019.8"; - name = "plantuml-${version}"; + pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; diff --git a/nixpkgs/pkgs/tools/misc/plotinus/default.nix b/nixpkgs/pkgs/tools/misc/plotinus/default.nix index 41913f966534..d2a7f3f37ea1 100644 --- a/nixpkgs/pkgs/tools/misc/plotinus/default.nix +++ b/nixpkgs/pkgs/tools/misc/plotinus/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "plotinus-${version}"; + pname = "plotinus"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/plowshare/default.nix b/nixpkgs/pkgs/tools/misc/plowshare/default.nix index 191f8980d832..1d3e8c6c33db 100644 --- a/nixpkgs/pkgs/tools/misc/plowshare/default.nix +++ b/nixpkgs/pkgs/tools/misc/plowshare/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "plowshare-${version}"; + pname = "plowshare"; version = "2.1.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix index 0bd61c0fcdf5..5712e02e8ea0 100644 --- a/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/pod2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pod2mdoc-${version}"; + pname = "pod2mdoc"; version = "0.0.10"; src = fetchurl { - url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f"; }; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index 2c9ed7be039e..5c1b1be2db3b 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -3,7 +3,6 @@ buildGoModule rec { pname = "powerline-go"; version = "1.13.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "justjanne"; diff --git a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix index 2a34224c1266..0c9d3a0ea799 100644 --- a/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix +++ b/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.37"; - name = "profile-cleaner-${version}"; + pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; diff --git a/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix index ac98df58784f..989a2d3f22b9 100644 --- a/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.34"; - name = "profile-sync-daemon-${version}"; + pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/progress/default.nix b/nixpkgs/pkgs/tools/misc/progress/default.nix index b29d0eafcc9e..3edca413f3aa 100644 --- a/nixpkgs/pkgs/tools/misc/progress/default.nix +++ b/nixpkgs/pkgs/tools/misc/progress/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: stdenv.mkDerivation rec { - name = "progress-${version}"; + pname = "progress"; version = "0.14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 1aaed4feafe8..ca3016d11874 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { - name = "pspg-${version}"; + pname = "pspg"; version = "1.6.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix b/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix index 6af33691a07d..613ad263ed34 100644 --- a/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix +++ b/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "radeon-profile-${version}"; + pname = "radeon-profile"; version = "20170714"; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/tools/misc/rcm/default.nix b/nixpkgs/pkgs/tools/misc/rcm/default.nix index 11ac0fc14199..3d97874df7de 100644 --- a/nixpkgs/pkgs/tools/misc/rcm/default.nix +++ b/nixpkgs/pkgs/tools/misc/rcm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rcm-${version}"; + pname = "rcm"; version = "1.3.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix index 484bb765c0db..88aff4f3c084 100644 --- a/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix +++ b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }: stdenv.mkDerivation rec { - name = "recoverjpeg-${version}"; + pname = "recoverjpeg"; version = "2.6.3"; src = fetchurl { - url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; + url = "https://www.rfc1149.net/download/recoverjpeg/${pname}-${version}.tar.gz"; sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv"; }; diff --git a/nixpkgs/pkgs/tools/misc/rig/default.nix b/nixpkgs/pkgs/tools/misc/rig/default.nix index ee7b2623b1dd..627758e9c5e7 100644 --- a/nixpkgs/pkgs/tools/misc/rig/default.nix +++ b/nixpkgs/pkgs/tools/misc/rig/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.11"; - name = "rig-${version}"; + pname = "rig"; src = fetchurl { url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index bd60e786036f..af5bfedf2037 100644 --- a/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-${version}"; + pname = "rlwrap"; version = "0.43"; src = fetchurl { - url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; }; diff --git a/nixpkgs/pkgs/tools/misc/rmlint/default.nix b/nixpkgs/pkgs/tools/misc/rmlint/default.nix index 320edd83021f..7b7fa9ce705e 100644 --- a/nixpkgs/pkgs/tools/misc/rmlint/default.nix +++ b/nixpkgs/pkgs/tools/misc/rmlint/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "rmlint-${version}"; + pname = "rmlint"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix index 925bb199b279..232949b7dace 100644 --- a/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix +++ b/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix @@ -5,7 +5,7 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "rockbox-utility-${version}"; + pname = "rockbox-utility"; version = "1.4.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/roundup/default.nix b/nixpkgs/pkgs/tools/misc/roundup/default.nix index e24b1fce06ef..7eebc1943009 100644 --- a/nixpkgs/pkgs/tools/misc/roundup/default.nix +++ b/nixpkgs/pkgs/tools/misc/roundup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ronn, shocco }: stdenv.mkDerivation rec { - name = "roundup-${version}"; + pname = "roundup"; version = "0.0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/routino/default.nix b/nixpkgs/pkgs/tools/misc/routino/default.nix index 650ac9f660aa..d852818b3155 100644 --- a/nixpkgs/pkgs/tools/misc/routino/default.nix +++ b/nixpkgs/pkgs/tools/misc/routino/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "routino-${version}"; + pname = "routino"; version = "3.2"; src = fetchurl { - url = "https://routino.org/download/${name}.tgz"; + url = "https://routino.org/download/${pname}-${version}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; diff --git a/nixpkgs/pkgs/tools/misc/rw/default.nix b/nixpkgs/pkgs/tools/misc/rw/default.nix index 345f26852dcb..b6e53e465360 100644 --- a/nixpkgs/pkgs/tools/misc/rw/default.nix +++ b/nixpkgs/pkgs/tools/misc/rw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rw-${version}"; + pname = "rw"; version = "1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/sam-ba/default.nix b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix index 2d1db4eb64c7..acab41e8ff54 100644 --- a/nixpkgs/pkgs/tools/misc/sam-ba/default.nix +++ b/nixpkgs/pkgs/tools/misc/sam-ba/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { version = "2.16"; - name = "sam-ba-${version}"; + pname = "sam-ba"; src = fetchzip { url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip"; diff --git a/nixpkgs/pkgs/tools/misc/scanmem/default.nix b/nixpkgs/pkgs/tools/misc/scanmem/default.nix index bd760adecf75..65b7b47256a8 100644 --- a/nixpkgs/pkgs/tools/misc/scanmem/default.nix +++ b/nixpkgs/pkgs/tools/misc/scanmem/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.17"; - name = "scanmem-${version}"; + pname = "scanmem"; src = fetchFromGitHub { owner = "scanmem"; diff --git a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix index 1b7afdfbe9df..2ba3224a5f8b 100644 --- a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix +++ b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: buildPythonApplication rec { - name = "scfbuild-${version}"; + pname = "scfbuild"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/screen/default.nix b/nixpkgs/pkgs/tools/misc/screen/default.nix index df1fcd89ac78..beeeb84aac93 100644 --- a/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { - name = "screen-${version}"; + pname = "screen"; version = "4.6.2"; src = fetchurl { - url = "mirror://gnu/screen/${name}.tar.gz"; + url = "mirror://gnu/screen/${pname}-${version}.tar.gz"; sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v"; }; diff --git a/nixpkgs/pkgs/tools/misc/screenfetch/default.nix b/nixpkgs/pkgs/tools/misc/screenfetch/default.nix index a9cd9d75de8e..883c2edd80a3 100644 --- a/nixpkgs/pkgs/tools/misc/screenfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/screenfetch/default.nix @@ -19,7 +19,7 @@ let ])); in stdenv.mkDerivation rec { - name = "screenFetch-${version}"; + pname = "screenFetch"; version = "3.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/sdate/default.nix b/nixpkgs/pkgs/tools/misc/sdate/default.nix index 23dccc0273d1..742b25601c08 100644 --- a/nixpkgs/pkgs/tools/misc/sdate/default.nix +++ b/nixpkgs/pkgs/tools/misc/sdate/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "sdate-${version}"; + pname = "sdate"; version = "0.5"; src = fetchurl { url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix index 6a2ed3bcb911..e821d5e4332a 100644 --- a/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix +++ b/nixpkgs/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation rec { - name = "sdl-jstest-${version}"; + pname = "sdl-jstest"; version = "2018-06-15"; # Submodules diff --git a/nixpkgs/pkgs/tools/misc/sl/default.nix b/nixpkgs/pkgs/tools/misc/sl/default.nix index c0f877f4c414..4ef91f6c55a3 100644 --- a/nixpkgs/pkgs/tools/misc/sl/default.nix +++ b/nixpkgs/pkgs/tools/misc/sl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "sl-${version}"; + pname = "sl"; version = "5.05"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/slop/default.nix b/nixpkgs/pkgs/tools/misc/slop/default.nix index 6f7c9d3506b2..65031c2a1fe7 100644 --- a/nixpkgs/pkgs/tools/misc/slop/default.nix +++ b/nixpkgs/pkgs/tools/misc/slop/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "slop-${version}"; + pname = "slop"; version = "7.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/smenu/default.nix b/nixpkgs/pkgs/tools/misc/smenu/default.nix index f5e1fd7b1b4d..c6661ee62e46 100644 --- a/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.15"; - name = "smenu-${version}"; + pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; diff --git a/nixpkgs/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix index ac0b950a1da5..5eba12285ded 100644 --- a/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -4,7 +4,7 @@ , lvm2, pam, python, utillinux }: stdenv.mkDerivation rec { - name = "snapper-${version}"; + pname = "snapper"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/sonota/default.nix b/nixpkgs/pkgs/tools/misc/sonota/default.nix index de9366d1d0ff..d111e0b2b717 100644 --- a/nixpkgs/pkgs/tools/misc/sonota/default.nix +++ b/nixpkgs/pkgs/tools/misc/sonota/default.nix @@ -12,7 +12,7 @@ let }; in buildPythonApplication rec { - name = "sonota-unstable-${version}"; + pname = "sonota-unstable"; version = "2018-10-07"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index e0bd36b21952..487858e61872 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "0zq99ll0vyafr2piffazprhvbs3sxb6863cp2qw596ilqg7ffi04"; + sha256 = "0y6ixl3i1brak226hh02da1zzlcv41f0kb648dqii6dzyhrwhrld"; }; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "0qlgng5j6l1r9j5vn3wnq25qr6f4nh10x90awiqyzz8jypb0ng2c"; + cargoSha256 = "1xk4ngxhgww921fk40d4ziprnzgp927lhdwwzcifcb0hdyl0854p"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix index 794c06b8044e..e4e1adf20016 100644 --- a/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { version = "2.8.1"; - name = "staruml-${version}"; + pname = "staruml"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/subberthehut/default.nix b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix index e5cc5ad4198f..e54dc3b3f2b6 100644 --- a/nixpkgs/pkgs/tools/misc/subberthehut/default.nix +++ b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: stdenv.mkDerivation rec { - name = "subberthehut-${version}"; + pname = "subberthehut"; version = "20"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/sutils/default.nix b/nixpkgs/pkgs/tools/misc/sutils/default.nix index c96ac41fb268..8d42d2d823f3 100644 --- a/nixpkgs/pkgs/tools/misc/sutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/sutils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2"; - name = "sutils-${version}"; + pname = "sutils"; src = fetchFromGitHub { owner = "baskerville"; diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 15b8f1bf3b42..12ba89304c0e 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -4,7 +4,7 @@ let inherit (python3Packages) python nose pycrypto pyyaml requests mock; in stdenv.mkDerivation rec { - name = "svtplay-dl-${version}"; + pname = "svtplay-dl"; version = "2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix index fd0a766f54e9..0d1ebd70041f 100644 --- a/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix @@ -6,7 +6,7 @@ libudev0-shim }: stdenv.mkDerivation rec { - name = "sweep-visualizer-${version}"; + pname = "sweep-visualizer"; version = "0.15.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix index 6750bbe8ae69..35259dada3db 100644 --- a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix +++ b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "system-config-printer-${version}"; + pname = "system-config-printer"; version = "1.5.11"; src = fetchurl { - url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q"; }; diff --git a/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix index 73e144d93aa1..dd48156d4564 100644 --- a/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix +++ b/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "systrayhelper-${version}"; + pname = "systrayhelper"; version = "0.0.4"; rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9"; diff --git a/nixpkgs/pkgs/tools/misc/teleconsole/default.nix b/nixpkgs/pkgs/tools/misc/teleconsole/default.nix index 2d3eb91250a8..4cac9befe16a 100644 --- a/nixpkgs/pkgs/tools/misc/teleconsole/default.nix +++ b/nixpkgs/pkgs/tools/misc/teleconsole/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "teleconsole-${version}"; + pname = "teleconsole"; version = "0.4.0"; goPackagePath = "github.com/gravitational/teleconsole"; diff --git a/nixpkgs/pkgs/tools/misc/tewisay/default.nix b/nixpkgs/pkgs/tools/misc/tewisay/default.nix index 2d713ae3821c..d875b098ab56 100644 --- a/nixpkgs/pkgs/tools/misc/tewisay/default.nix +++ b/nixpkgs/pkgs/tools/misc/tewisay/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { - name = "tewisay-unstable-${version}"; + pname = "tewisay-unstable"; version = "2017-04-14"; goPackagePath = "github.com/lucy/tewisay"; diff --git a/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix b/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix index 47216838476a..abc25db2fa7e 100644 --- a/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix +++ b/nixpkgs/pkgs/tools/misc/texi2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "texi2mdoc-${version}"; + pname = "texi2mdoc"; version = "0.1.2"; src = fetchurl { - url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs"; }; diff --git a/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix index 8cbea666f123..0739435084d2 100644 --- a/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: stdenv.mkDerivation rec { - name = "thin-provisioning-tools-${version}"; + pname = "thin-provisioning-tools"; version = "0.7.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/time/default.nix b/nixpkgs/pkgs/tools/misc/time/default.nix index 8f297542a3ca..bb6276f70655 100644 --- a/nixpkgs/pkgs/tools/misc/time/default.nix +++ b/nixpkgs/pkgs/tools/misc/time/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "time-${version}"; + pname = "time"; version = "1.9"; src = fetchurl { - url = "mirror://gnu/time/${name}.tar.gz"; + url = "mirror://gnu/time/${pname}-${version}.tar.gz"; sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v"; }; diff --git a/nixpkgs/pkgs/tools/misc/tio/default.nix b/nixpkgs/pkgs/tools/misc/tio/default.nix index ed26895fba6f..3a8388280d65 100644 --- a/nixpkgs/pkgs/tools/misc/tio/default.nix +++ b/nixpkgs/pkgs/tools/misc/tio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { - name = "tio-${version}"; + pname = "tio"; version = "1.32"; src = fetchzip { diff --git a/nixpkgs/pkgs/tools/misc/tldr/default.nix b/nixpkgs/pkgs/tools/misc/tldr/default.nix index fcd556c55966..d4ff9d8c8442 100644 --- a/nixpkgs/pkgs/tools/misc/tldr/default.nix +++ b/nixpkgs/pkgs/tools/misc/tldr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: stdenv.mkDerivation rec { - name = "tldr-${version}"; + pname = "tldr"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/tlp/default.nix b/nixpkgs/pkgs/tools/misc/tlp/default.nix index 6e431fdc98ea..e5932d9e9462 100644 --- a/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -14,7 +14,7 @@ let ); in stdenv.mkDerivation rec { - name = "tlp-${version}"; + pname = "tlp"; version = "1.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/tmate/default.nix b/nixpkgs/pkgs/tools/misc/tmate/default.nix index c87fe8bf446c..420692c070c7 100644 --- a/nixpkgs/pkgs/tools/misc/tmate/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmate/default.nix @@ -2,7 +2,7 @@ , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { - name = "tmate-${version}"; + pname = "tmate"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix index 968ead6131be..fa024e58fa81 100644 --- a/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix +++ b/nixpkgs/pkgs/tools/misc/togglesg-download/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { - name = "togglesg-download-git-${version}"; + pname = "togglesg-download-git"; version = "2017-12-07"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/toilet/default.nix b/nixpkgs/pkgs/tools/misc/toilet/default.nix index 2729f6f88594..abc6933a777e 100644 --- a/nixpkgs/pkgs/tools/misc/toilet/default.nix +++ b/nixpkgs/pkgs/tools/misc/toilet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libcaca }: stdenv.mkDerivation rec { - name = "toilet-${version}"; + pname = "toilet"; version = "0.3"; src = fetchurl { - url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${name}.tar.gz"; + url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${pname}-${version}.tar.gz"; sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; diff --git a/nixpkgs/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix index 4591c5ac5b5a..be0c33fb6e54 100644 --- a/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -6,7 +6,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "toybox"; version = "0.8.1"; diff --git a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix index eed527da4168..bfb97c22b1d3 100644 --- a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { version = "1.8.3"; - name = "ttfautohint-${version}"; + pname = "ttfautohint"; src = fetchurl { - url = "mirror://savannah/freetype/${name}.tar.gz"; + url = "mirror://savannah/freetype/${pname}-${version}.tar.gz"; sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7"; }; diff --git a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix index 5663bcc35fdb..59091bcd2bd1 100644 --- a/nixpkgs/pkgs/tools/misc/ttwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttwatch/default.nix @@ -2,7 +2,7 @@ , enableUnsafe ? false }: stdenv.mkDerivation rec { - name = "ttwatch-${version}"; + pname = "ttwatch"; version = "2018-12-04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/tty-clock/default.nix b/nixpkgs/pkgs/tools/misc/tty-clock/default.nix index 113359a8bcea..edaa9b662e76 100644 --- a/nixpkgs/pkgs/tools/misc/tty-clock/default.nix +++ b/nixpkgs/pkgs/tools/misc/tty-clock/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, pkgconfig }: stdenv.mkDerivation rec { - name = "tty-clock-${version}"; + pname = "tty-clock"; version = "2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ttylog/default.nix b/nixpkgs/pkgs/tools/misc/ttylog/default.nix index fda9dc506e2f..70856fba7319 100644 --- a/nixpkgs/pkgs/tools/misc/ttylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttylog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "ttylog-${version}"; + pname = "ttylog"; version = "0.31"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix index 78aeab00a50f..45aa9ea5c0b2 100644 --- a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "ttyplot-${version}"; + pname = "ttyplot"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ttyrec/default.nix b/nixpkgs/pkgs/tools/misc/ttyrec/default.nix index ca6651718117..56ec9afea438 100644 --- a/nixpkgs/pkgs/tools/misc/ttyrec/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyrec/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ttyrec-${version}"; + pname = "ttyrec"; version = "1.0.8"; src = fetchurl { - url = "http://0xcc.net/ttyrec/${name}.tar.gz"; + url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz"; sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec"; }; diff --git a/nixpkgs/pkgs/tools/misc/txt2man/default.nix b/nixpkgs/pkgs/tools/misc/txt2man/default.nix index f37892a231a5..90f9559e6b7c 100644 --- a/nixpkgs/pkgs/tools/misc/txt2man/default.nix +++ b/nixpkgs/pkgs/tools/misc/txt2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { - name = "txt2man-${version}"; + pname = "txt2man"; version = "1.6.0"; src = fetchurl { - url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz"; + url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; }; diff --git a/nixpkgs/pkgs/tools/misc/txtw/default.nix b/nixpkgs/pkgs/tools/misc/txtw/default.nix index 90a9e0fa66ff..b642fb6ec5ce 100644 --- a/nixpkgs/pkgs/tools/misc/txtw/default.nix +++ b/nixpkgs/pkgs/tools/misc/txtw/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "txtw-${version}"; + pname = "txtw"; src = fetchFromGitHub { owner = "baskerville"; diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix index 195a31b63e5b..d80af088342a 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix @@ -7,7 +7,7 @@ # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed stdenv.mkDerivation rec { - name = "ultrastar-creator-${version}"; + pname = "ultrastar-creator"; version = "2019-04-23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix index 3ab404d02077..0a3bb19d14b9 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix @@ -83,7 +83,8 @@ let }; in stdenv.mkDerivation { - name = "ultrastar-manager-${version}"; + pname = "ultrastar-manager"; + inherit version; src = patchedSrc; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/umlet/default.nix b/nixpkgs/pkgs/tools/misc/umlet/default.nix index 9ac60ca8b13a..2b70848cbb81 100644 --- a/nixpkgs/pkgs/tools/misc/umlet/default.nix +++ b/nixpkgs/pkgs/tools/misc/umlet/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { major = "14"; minor = "3"; version = "${major}.${minor}.0"; - name = "umlet-${version}"; + pname = "umlet"; src = fetchurl { url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip"; diff --git a/nixpkgs/pkgs/tools/misc/units/default.nix b/nixpkgs/pkgs/tools/misc/units/default.nix index 374e1b9eaf63..8f66f566aa7d 100644 --- a/nixpkgs/pkgs/tools/misc/units/default.nix +++ b/nixpkgs/pkgs/tools/misc/units/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "units-${version}"; + pname = "units"; version = "2.19"; src = fetchurl { - url = "mirror://gnu/units/${name}.tar.gz"; + url = "mirror://gnu/units/${pname}-${version}.tar.gz"; sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2"; }; diff --git a/nixpkgs/pkgs/tools/misc/up/default.nix b/nixpkgs/pkgs/tools/misc/up/default.nix index 01b62eed56c3..b3937175604d 100644 --- a/nixpkgs/pkgs/tools/misc/up/default.nix +++ b/nixpkgs/pkgs/tools/misc/up/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "up-${version}"; + pname = "up"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/upower-notify/default.nix b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix index 7751e03df193..607cb47ed4e8 100644 --- a/nixpkgs/pkgs/tools/misc/upower-notify/default.nix +++ b/nixpkgs/pkgs/tools/misc/upower-notify/default.nix @@ -7,7 +7,7 @@ # (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) & # ''; buildGoPackage rec { - name = "upower-notify-${version}"; + pname = "upower-notify"; version = "20160310-${stdenv.lib.strings.substring 0 7 rev}"; rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; diff --git a/nixpkgs/pkgs/tools/misc/urjtag/default.nix b/nixpkgs/pkgs/tools/misc/urjtag/default.nix index 545d7c554acc..fe89e74cb697 100644 --- a/nixpkgs/pkgs/tools/misc/urjtag/default.nix +++ b/nixpkgs/pkgs/tools/misc/urjtag/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.10"; - name = "urjtag-${version}"; + pname = "urjtag"; src = fetchsvn { url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag"; diff --git a/nixpkgs/pkgs/tools/misc/vimer/default.nix b/nixpkgs/pkgs/tools/misc/vimer/default.nix index a655aa9502e5..7f81774aebee 100644 --- a/nixpkgs/pkgs/tools/misc/vimer/default.nix +++ b/nixpkgs/pkgs/tools/misc/vimer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.0"; - name = "vimer-${version}"; + pname = "vimer"; src = fetchFromGitHub { owner = "susam"; diff --git a/nixpkgs/pkgs/tools/misc/vimpager/build.nix b/nixpkgs/pkgs/tools/misc/vimpager/build.nix index e9733c7ef799..858cbe9e317a 100644 --- a/nixpkgs/pkgs/tools/misc/vimpager/build.nix +++ b/nixpkgs/pkgs/tools/misc/vimpager/build.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit version; - name = "vimpager-${version}"; + pname = "vimpager"; src = fetchFromGitHub { inherit sha256; diff --git a/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/nixpkgs/pkgs/tools/misc/wakatime/default.nix index 4f1ca8f89ceb..06280b49fbf1 100644 --- a/nixpkgs/pkgs/tools/misc/wakatime/default.nix +++ b/nixpkgs/pkgs/tools/misc/wakatime/default.nix @@ -2,7 +2,7 @@ with python3Packages; buildPythonApplication rec { - name = "wakatime-${version}"; + pname = "wakatime"; version = "10.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix index 00e26d762a44..de3a19c3f51c 100644 --- a/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix +++ b/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix @@ -2,7 +2,7 @@ , wayland, wayland-protocols }: stdenv.mkDerivation rec { - name = "wl-clipboard-${version}"; + pname = "wl-clipboard"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/woeusb/default.nix b/nixpkgs/pkgs/tools/misc/woeusb/default.nix index 12a97a2e8e46..f25034dd8cda 100644 --- a/nixpkgs/pkgs/tools/misc/woeusb/default.nix +++ b/nixpkgs/pkgs/tools/misc/woeusb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.3.0"; - name = "woeusb-${version}"; + pname = "woeusb"; src = fetchFromGitHub { owner = "slacka"; diff --git a/nixpkgs/pkgs/tools/misc/woof/default.nix b/nixpkgs/pkgs/tools/misc/woof/default.nix index 35da2e0a4e94..fa3ab747f64f 100644 --- a/nixpkgs/pkgs/tools/misc/woof/default.nix +++ b/nixpkgs/pkgs/tools/misc/woof/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2012-05-31"; - name = "woof-${version}"; + pname = "woof"; src = fetchurl { url = "http://www.home.unix-ag.org/simon/woof-${version}.py"; diff --git a/nixpkgs/pkgs/tools/misc/wv/default.nix b/nixpkgs/pkgs/tools/misc/wv/default.nix index f19d448e5fc2..78affe34b58b 100644 --- a/nixpkgs/pkgs/tools/misc/wv/default.nix +++ b/nixpkgs/pkgs/tools/misc/wv/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "wv"; version = "1.2.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; + url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; diff --git a/nixpkgs/pkgs/tools/misc/wyrd/default.nix b/nixpkgs/pkgs/tools/misc/wyrd/default.nix index 1029dbb29d8c..ec516555273a 100644 --- a/nixpkgs/pkgs/tools/misc/wyrd/default.nix +++ b/nixpkgs/pkgs/tools/misc/wyrd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.6"; - name = "wyrd-${version}"; + pname = "wyrd"; src = fetchurl { url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix b/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix index aad5b35c79ff..62e2b31fa153 100644 --- a/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix @@ -6,7 +6,8 @@ let version = "2011-12-26"; in stdenv.mkDerivation { - name = "xburst-tools-${version}"; + pname = "xburst-tools"; + inherit version; src = fetchgit { url = git://projects.qi-hardware.com/xburst-tools.git; diff --git a/nixpkgs/pkgs/tools/misc/xclip/default.nix b/nixpkgs/pkgs/tools/misc/xclip/default.nix index 79565af8e926..69009b86af8c 100644 --- a/nixpkgs/pkgs/tools/misc/xclip/default.nix +++ b/nixpkgs/pkgs/tools/misc/xclip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { - name = "xclip-${version}"; + pname = "xclip"; version = "0.13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix index 8260d7921ecc..28268052826c 100644 --- a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }: stdenv.mkDerivation rec { - name = "xdaliclock-${version}"; + pname = "xdaliclock"; version = "2.44"; src = fetchurl { - url="https://www.jwz.org/xdaliclock/${name}.tar.gz"; + url="https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz"; sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0"; }; diff --git a/nixpkgs/pkgs/tools/misc/xdo/default.nix b/nixpkgs/pkgs/tools/misc/xdo/default.nix index c33e01fa0e71..f042b9e209f7 100644 --- a/nixpkgs/pkgs/tools/misc/xdo/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }: stdenv.mkDerivation rec { - name = "xdo-${version}"; + pname = "xdo"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/xflux/gui.nix b/nixpkgs/pkgs/tools/misc/xflux/gui.nix index d8959687945a..f3f80143c57a 100644 --- a/nixpkgs/pkgs/tools/misc/xflux/gui.nix +++ b/nixpkgs/pkgs/tools/misc/xflux/gui.nix @@ -3,7 +3,7 @@ , libappindicator-gtk2, xflux, librsvg, wrapGAppsHook }: pythonPackages.buildPythonApplication rec { - name = "xflux-gui-${version}"; + pname = "xflux-gui"; version = "1.1.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/xiccd/default.nix b/nixpkgs/pkgs/tools/misc/xiccd/default.nix index f51746e312e5..43a674069706 100644 --- a/nixpkgs/pkgs/tools/misc/xiccd/default.nix +++ b/nixpkgs/pkgs/tools/misc/xiccd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: stdenv.mkDerivation rec { - name = "xiccd-${version}"; + pname = "xiccd"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix index 7a092e595621..ad5086f2f595 100644 --- a/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix +++ b/nixpkgs/pkgs/tools/misc/xmonad-log/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "xmonad-log-${version}"; + pname = "xmonad-log"; version = "0.1.0"; goPackagePath = "github.com/xintron/xmonad-log"; diff --git a/nixpkgs/pkgs/tools/misc/xsel/default.nix b/nixpkgs/pkgs/tools/misc/xsel/default.nix index 0ec7d58598f8..cd4d709fb769 100644 --- a/nixpkgs/pkgs/tools/misc/xsel/default.nix +++ b/nixpkgs/pkgs/tools/misc/xsel/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }: stdenv.mkDerivation rec { - name = "xsel-unstable-${version}"; + pname = "xsel-unstable"; version = "2018-01-10"; diff --git a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 303722aac0b8..d369bb4fed78 100644 --- a/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }: pythonPackages.buildPythonApplication rec { - name = "yle-dl-${version}"; + pname = "yle-dl"; version = "2.31"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 1fe58f945041..d378e541b503 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.08.13"; + version = "2019.09.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj"; + sha256 = "0jbby0x5krww1acc8qxhmmwg0dsqmj6yjnynfm7r6k3rxbvlydqr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix index 8308d5eebcd0..c20fe68b7b22 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: stdenv.mkDerivation rec { - name = "yubikey-personalization-${version}"; + pname = "yubikey-personalization"; version = "1.20.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix b/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix index a8b621e32ac4..d21573885123 100644 --- a/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix @@ -3,7 +3,7 @@ let pythonPackages = python2Packages; in pythonPackages.buildPythonApplication rec { - name = "zabbix-cli-${version}"; + pname = "zabbix-cli"; version = "2.1.1"; propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; diff --git a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix index 61945266e13b..657d93a3ca0e 100644 --- a/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { - name = "zsh-autoenv-${version}"; + pname = "zsh-autoenv"; version = "2017-12-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix b/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix index 108071edb64c..be64ff47e6be 100644 --- a/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zsh-navigation-tools-${version}"; + pname = "zsh-navigation-tools"; version = "2.2.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/acme-client/default.nix b/nixpkgs/pkgs/tools/networking/acme-client/default.nix index 1e10529082f5..60b3b6df69aa 100644 --- a/nixpkgs/pkgs/tools/networking/acme-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/acme-client/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "acme-client-${version}"; + pname = "acme-client"; version = "0.1.16"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/argus-clients/default.nix b/nixpkgs/pkgs/tools/networking/argus-clients/default.nix index dccab1796fbc..08db7b4f58d8 100644 --- a/nixpkgs/pkgs/tools/networking/argus-clients/default.nix +++ b/nixpkgs/pkgs/tools/networking/argus-clients/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "argus-clients"; version = "3.0.8.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://qosient.com/argus/src/${name}.tar.gz"; + url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz"; sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj"; }; diff --git a/nixpkgs/pkgs/tools/networking/argus/default.nix b/nixpkgs/pkgs/tools/networking/argus/default.nix index 8b9d1e3b704c..72c0a78a447b 100644 --- a/nixpkgs/pkgs/tools/networking/argus/default.nix +++ b/nixpkgs/pkgs/tools/networking/argus/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "argus"; version = "3.0.8.2"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://qosient.com/argus/src/${name}.tar.gz"; + url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz"; sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; diff --git a/nixpkgs/pkgs/tools/networking/aria2/default.nix b/nixpkgs/pkgs/tools/networking/aria2/default.nix index 8d9ec9288114..e086105e19e9 100644 --- a/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "aria2-${version}"; + pname = "aria2"; version = "1.34.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/assh/default.nix b/nixpkgs/pkgs/tools/networking/assh/default.nix index 7904ffb0d04e..bfb1abaeaf23 100644 --- a/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }: buildGoPackage rec { - name = "assh-${version}"; + pname = "assh"; version = "2.7.0"; goPackagePath = "github.com/moul/advanced-ssh-config"; diff --git a/nixpkgs/pkgs/tools/networking/asynk/default.nix b/nixpkgs/pkgs/tools/networking/asynk/default.nix index de8bcc8e7ff6..4d069a7e6d7d 100644 --- a/nixpkgs/pkgs/tools/networking/asynk/default.nix +++ b/nixpkgs/pkgs/tools/networking/asynk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "ASynK-${version}"; + pname = "ASynK"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz"; sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1"; }; diff --git a/nixpkgs/pkgs/tools/networking/atftp/default.nix b/nixpkgs/pkgs/tools/networking/atftp/default.nix index e6d5abc17618..7fcd677044fe 100644 --- a/nixpkgs/pkgs/tools/networking/atftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/atftp/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: stdenv.mkDerivation rec { - name = "atftp-${version}"; + pname = "atftp"; version = "0.7.2"; src = fetchurl { - url = "mirror://sourceforge/atftp/${name}.tar.gz"; + url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s"; }; diff --git a/nixpkgs/pkgs/tools/networking/biosdevname/default.nix b/nixpkgs/pkgs/tools/networking/biosdevname/default.nix index 93a98a10daad..7cd7254518ad 100644 --- a/nixpkgs/pkgs/tools/networking/biosdevname/default.nix +++ b/nixpkgs/pkgs/tools/networking/biosdevname/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }: stdenv.mkDerivation rec { - name = "biosdevname-${version}"; + pname = "biosdevname"; version = "0.7.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/bud/default.nix b/nixpkgs/pkgs/tools/networking/bud/default.nix index 386642614bc9..2c5e1a2f8f4a 100644 --- a/nixpkgs/pkgs/tools/networking/bud/default.nix +++ b/nixpkgs/pkgs/tools/networking/bud/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, python, gyp, utillinux }: stdenv.mkDerivation rec { - name = "bud-${version}"; + pname = "bud"; version = "0.34.1"; diff --git a/nixpkgs/pkgs/tools/networking/bully/default.nix b/nixpkgs/pkgs/tools/networking/bully/default.nix index 81dd294d786a..46bac3d5b5b2 100644 --- a/nixpkgs/pkgs/tools/networking/bully/default.nix +++ b/nixpkgs/pkgs/tools/networking/bully/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "bully-${version}"; + pname = "bully"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 993e9ad74692..12885982d26d 100644 --- a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -12,7 +12,8 @@ let exec ${jre}/bin/java -jar ${jar} "$@" ''; in stdenv.mkDerivation { - name = "burpsuite-${version}"; + pname = "burpsuite"; + inherit version; buildCommand = '' mkdir -p $out/bin echo "${launcher}" > $out/bin/burpsuite diff --git a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix index a06b409ca49b..4637a39e6e90 100644 --- a/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix +++ b/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix @@ -4,10 +4,11 @@ let version = "0.6.1"; in stdenv.mkDerivation rec { - name = "bwm-ng-${version}"; + pname = "bwm-ng"; + inherit version; src = fetchurl { - url = "https://www.gropp.org/bwm-ng/${name}.tar.gz"; + url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; diff --git a/nixpkgs/pkgs/tools/networking/ccnet/default.nix b/nixpkgs/pkgs/tools/networking/ccnet/default.nix index 6fac4a282d01..2c78b20138aa 100644 --- a/nixpkgs/pkgs/tools/networking/ccnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/ccnet/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "6.1.8"; seafileVersion = "6.1.8"; - name = "ccnet-${version}"; + pname = "ccnet"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/chrony/default.nix b/nixpkgs/pkgs/tools/networking/chrony/default.nix index 127244a29927..bbc0cac05516 100644 --- a/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -4,12 +4,12 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "chrony-${version}"; + pname = "chrony"; version = "3.5"; src = fetchurl { - url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; + url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf"; }; diff --git a/nixpkgs/pkgs/tools/networking/cmst/default.nix b/nixpkgs/pkgs/tools/networking/cmst/default.nix index cc88153bab9c..dcda354e4b42 100644 --- a/nixpkgs/pkgs/tools/networking/cmst/default.nix +++ b/nixpkgs/pkgs/tools/networking/cmst/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation rec { - name = "cmst-${version}"; +mkDerivation rec { + pname = "cmst"; version = "2019.01.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; - rev = name; + rev = "${pname}-${version}"; sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh"; }; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "QT GUI for Connman with system tray icon"; homepage = https://github.com/andrew-bibb/cmst; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.matejc ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/tools/networking/cntlm/default.nix b/nixpkgs/pkgs/tools/networking/cntlm/default.nix index 6267e3a7790d..9b8a1f0e7904 100644 --- a/nixpkgs/pkgs/tools/networking/cntlm/default.nix +++ b/nixpkgs/pkgs/tools/networking/cntlm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which}: stdenv.mkDerivation rec { - name = "cntlm-${version}"; + pname = "cntlm"; version = "0.92.3"; src = fetchurl { - url = "mirror://sourceforge/cntlm/${name}.tar.gz"; + url = "mirror://sourceforge/cntlm/${pname}-${version}.tar.gz"; sha256 = "1632szz849wasvh5sm6rm1zbvbrkq35k7kcyvx474gyl4h4x2flw"; }; diff --git a/nixpkgs/pkgs/tools/networking/connect/default.nix b/nixpkgs/pkgs/tools/networking/connect/default.nix index 3d63340adb0b..17923081dfdf 100644 --- a/nixpkgs/pkgs/tools/networking/connect/default.nix +++ b/nixpkgs/pkgs/tools/networking/connect/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "connect-${version}"; + pname = "connect"; version ="1.105"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix index d5688354a76d..a3c774a62b11 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -2,7 +2,7 @@ gtk3, connman, openconnect, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "connman-gtk-${version}"; + pname = "connman-gtk"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix index 8c4d4fa84865..dd636173cb71 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }: stdenv.mkDerivation rec { - name = "connman-ncurses-${version}"; + pname = "connman-ncurses"; version = "2015-07-21"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix index 42b0c37411c8..3b30935d6cf1 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "connman-notify-${version}"; + pname = "connman-notify"; version = "2014-06-23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix index c39c82df634c..0d91dabaaebb 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, connman, dmenu }: stdenv.mkDerivation rec { - name = "connman_dmenu-${version}"; + pname = "connman_dmenu"; version = "git-29-9-2015"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix b/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix index 7c42cc965a00..17e8551fdda0 100644 --- a/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/connmanui/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: stdenv.mkDerivation rec { - name = "connmanui-${version}"; + pname = "connmanui"; rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516"; version = "22062015-${rev}"; diff --git a/nixpkgs/pkgs/tools/networking/connman/default.nix b/nixpkgs/pkgs/tools/networking/connman/default.nix index a4e8c17a545e..56b0347e17f3 100644 --- a/nixpkgs/pkgs/tools/networking/connman/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/default.nix @@ -3,10 +3,10 @@ wpa_supplicant, readline6, pptp, ppp }: stdenv.mkDerivation rec { - name = "connman-${version}"; + pname = "connman"; version = "1.37"; src = fetchurl { - url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; + url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; }; diff --git a/nixpkgs/pkgs/tools/networking/darkstat/default.nix b/nixpkgs/pkgs/tools/networking/darkstat/default.nix index 4ec23862522e..6509c9c31060 100644 --- a/nixpkgs/pkgs/tools/networking/darkstat/default.nix +++ b/nixpkgs/pkgs/tools/networking/darkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.0.719"; - name = "darkstat-${version}"; + pname = "darkstat"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.bz2"; + url = "${meta.homepage}/${pname}-${version}.tar.bz2"; sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf"; }; diff --git a/nixpkgs/pkgs/tools/networking/davix/default.nix b/nixpkgs/pkgs/tools/networking/davix/default.nix index 4b16eb406e32..ff4d0d64c20f 100644 --- a/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.4"; - name = "davix-${version}"; + pname = "davix"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/5.nix b/nixpkgs/pkgs/tools/networking/dd-agent/5.nix index 02bdb3e2a460..98902e9809b9 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/5.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/5.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { version = "5.11.2"; - name = "dd-agent-${version}"; + pname = "dd-agent"; src = fetchFromGitHub { owner = "datadog"; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index d2ae24c8a710..32fbed7eb9f7 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -6,7 +6,7 @@ let python = pythonPackages.python; in buildGoPackage rec { - name = "datadog-agent-${version}"; + pname = "datadog-agent"; version = "6.11.2"; owner = "DataDog"; repo = "datadog-agent"; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 25ce4bcd68eb..340bf4d863ca 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "datadog-process-agent-${version}"; + pname = "datadog-process-agent"; version = "6.11.1"; owner = "DataDog"; repo = "datadog-process-agent"; diff --git a/nixpkgs/pkgs/tools/networking/dhcp/default.nix b/nixpkgs/pkgs/tools/networking/dhcp/default.nix index 6987bc553a58..24e23e6e0d33 100644 --- a/nixpkgs/pkgs/tools/networking/dhcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcp/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dhcp-${version}"; + pname = "dhcp"; version = "4.4.1"; src = fetchurl { - url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz"; sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia"; }; diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 6d14789e7f42..f0ae7e014beb 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.2.3"; + pname = "dhcpcd"; + version = "8.0.2"; src = fetchurl { - url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl"; + url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik"; }; nativeBuildInputs = [ pkgconfig ]; @@ -27,14 +28,14 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - makeFlags = "PREFIX=\${out}"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; # Hack to make installation succeed. dhcpcd will still use /var/db # at runtime. - installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; + installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]"; + postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/nixpkgs/pkgs/tools/networking/dhcping/default.nix b/nixpkgs/pkgs/tools/networking/dhcping/default.nix index d557c0ab9adb..a6cb05b3865b 100644 --- a/nixpkgs/pkgs/tools/networking/dhcping/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcping-${version}"; + pname = "dhcping"; version = "1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/dibbler/default.nix b/nixpkgs/pkgs/tools/networking/dibbler/default.nix index fd306a0bcca3..43c9455712db 100644 --- a/nixpkgs/pkgs/tools/networking/dibbler/default.nix +++ b/nixpkgs/pkgs/tools/networking/dibbler/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dibbler-${version}"; + pname = "dibbler"; version = "1.0.1"; src = fetchurl { - url = "http://www.klub.com.pl/dhcpv6/dibbler/${name}.tar.gz"; + url = "http://www.klub.com.pl/dhcpv6/dibbler/${pname}-${version}.tar.gz"; sha256 = "18bnwkvax02scjdg5z8gvrkvy1lhssfnlpsaqb5kkh30w1vri1i7"; }; diff --git a/nixpkgs/pkgs/tools/networking/dirb/default.nix b/nixpkgs/pkgs/tools/networking/dirb/default.nix index d4837d28c825..fe845f3cae87 100644 --- a/nixpkgs/pkgs/tools/networking/dirb/default.nix +++ b/nixpkgs/pkgs/tools/networking/dirb/default.nix @@ -4,7 +4,7 @@ let major = "2"; minor = "22"; in stdenv.mkDerivation rec { - name = "dirb-${version}"; + pname = "dirb"; version = "${major}.${minor}"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/djbdns/default.nix b/nixpkgs/pkgs/tools/networking/djbdns/default.nix index b8a7133e7bc7..974f8a1f346a 100644 --- a/nixpkgs/pkgs/tools/networking/djbdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/djbdns/default.nix @@ -11,7 +11,8 @@ let in stdenv.mkDerivation { - name = "djbdns-${version}"; + pname = "djbdns"; + inherit version; src = fetchurl { url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix index c0b2c795a40b..fc4e40929c93 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dnscrypt-proxy-${version}"; + pname = "dnscrypt-proxy"; version = "1.9.5"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${name}.orig.tar.gz"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}-${version}.orig.tar.gz"; sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8"; }; diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix index a43900ea4a52..94d52b953d49 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }: stdenv.mkDerivation rec { - name = "dnscrypt-wrapper-${version}"; + pname = "dnscrypt-wrapper"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix index ed46b49d8c7e..63e19e924fca 100644 --- a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "dnsperf-${version}"; + pname = "dnsperf"; version = "2.3.1"; # The same as the initial commit of the new GitHub repo (only readme changed). diff --git a/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix index fd932617c936..566579555d33 100644 --- a/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -5,7 +5,7 @@ with lib; stdenv.mkDerivation rec { - name = "driftnet-${version}"; + pname = "driftnet"; version = "1.1.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix index d7ff19612eb1..b5d4d5e6dcbe 100644 --- a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix +++ b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix @@ -3,7 +3,8 @@ let version = "3.0.0"; in stdenv.mkDerivation rec { - name = "easyrsa-${version}"; + pname = "easyrsa"; + inherit version; src = fetchFromGitHub { owner = "OpenVPN"; diff --git a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index 12d9da87b39b..f5dfff62a965 100644 --- a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tcl }: stdenv.mkDerivation rec { - name = "eggdrop-${version}"; + pname = "eggdrop"; version = "1.6.21-nix1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/envoy/default.nix b/nixpkgs/pkgs/tools/networking/envoy/default.nix index 83af542b8ad4..2800139f8fac 100644 --- a/nixpkgs/pkgs/tools/networking/envoy/default.nix +++ b/nixpkgs/pkgs/tools/networking/envoy/default.nix @@ -215,7 +215,7 @@ let in stdenv.mkDerivation rec { - name = "envoy-${version}"; + pname = "envoy"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix index 607b11aaffb9..ffd7d25a0dce 100644 --- a/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix +++ b/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }: stdenv.mkDerivation rec { - name = "eternal-terminal-${version}"; + pname = "eternal-terminal"; version = "5.1.10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/fakeroute/default.nix b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix index 9737108e6acf..d5190331d33f 100644 --- a/nixpkgs/pkgs/tools/networking/fakeroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/fakeroute/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fakeroute-${version}"; + pname = "fakeroute"; version = "0.3"; src = fetchurl { - url = "https://moxie.org/software/fakeroute/${name}.tar.gz"; + url = "https://moxie.org/software/fakeroute/${pname}-${version}.tar.gz"; sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f"; }; diff --git a/nixpkgs/pkgs/tools/networking/fastd/default.nix b/nixpkgs/pkgs/tools/networking/fastd/default.nix index ef356935c56a..43efe2090f2c 100644 --- a/nixpkgs/pkgs/tools/networking/fastd/default.nix +++ b/nixpkgs/pkgs/tools/networking/fastd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "18"; - name = "fastd-${version}"; + pname = "fastd"; src = fetchgit { url = "git://git.universe-factory.net/fastd"; diff --git a/nixpkgs/pkgs/tools/networking/ferm/default.nix b/nixpkgs/pkgs/tools/networking/ferm/default.nix index a0b298f3f4ec..2cf111e8ccfc 100644 --- a/nixpkgs/pkgs/tools/networking/ferm/default.nix +++ b/nixpkgs/pkgs/tools/networking/ferm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; - name = "ferm-${version}"; + pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/tools/networking/flannel/default.nix b/nixpkgs/pkgs/tools/networking/flannel/default.nix index 259225e0b7c8..f16fcc7048c8 100644 --- a/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -3,7 +3,7 @@ with lib; buildGoPackage rec { - name = "flannel-${version}"; + pname = "flannel"; version = "0.11.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/networking/freebind/default.nix b/nixpkgs/pkgs/tools/networking/freebind/default.nix index 3f89323de36b..4ac979cc4a6c 100644 --- a/nixpkgs/pkgs/tools/networking/freebind/default.nix +++ b/nixpkgs/pkgs/tools/networking/freebind/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }: stdenv.mkDerivation rec { - name = "freebind-${version}"; + pname = "freebind"; version = "2017-12-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix index 6fdcfaa70db0..354288b3ce60 100644 --- a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -4,7 +4,8 @@ let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in stdenv.mkDerivation { - name = "gmrender-resurrect-${version}"; + pname = "gmrender-resurrect"; + inherit version; src = fetchFromGitHub { owner = "hzeller"; diff --git a/nixpkgs/pkgs/tools/networking/gmvault/default.nix b/nixpkgs/pkgs/tools/networking/gmvault/default.nix index e94c3e4330fb..aab5b77351c9 100644 --- a/nixpkgs/pkgs/tools/networking/gmvault/default.nix +++ b/nixpkgs/pkgs/tools/networking/gmvault/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { version = "1.9.1"; - name = "gmvault-${version}"; + pname = "gmvault"; src = fetchurl { url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz"; - name = "${name}.tar.bz"; + name = "${pname}-${version}.tar.bz"; sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji"; }; diff --git a/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix index db63b16415b2..8261ba6e2842 100644 --- a/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix +++ b/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix @@ -2,7 +2,8 @@ let version = "2.3"; apk = stdenv.mkDerivation { - name = "gnirehtet.apk-${version}"; + pname = "gnirehtet.apk"; + inherit version; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz"; diff --git a/nixpkgs/pkgs/tools/networking/goklp/default.nix b/nixpkgs/pkgs/tools/networking/goklp/default.nix index 88a6b74686c2..c260b47a6332 100644 --- a/nixpkgs/pkgs/tools/networking/goklp/default.nix +++ b/nixpkgs/pkgs/tools/networking/goklp/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goklp-${version}"; + pname = "goklp"; version = "1.6"; goPackagePath = "github.com/AppliedTrust/goklp"; diff --git a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix index 10100b933d4d..12f285c2a60a 100644 --- a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix @@ -3,7 +3,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "grpcurl-${version}"; + pname = "grpcurl"; version = "1.0.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/networking/gvpe/default.nix b/nixpkgs/pkgs/tools/networking/gvpe/default.nix index bcc68a2a19f7..ba59870a6b86 100644 --- a/nixpkgs/pkgs/tools/networking/gvpe/default.nix +++ b/nixpkgs/pkgs/tools/networking/gvpe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: stdenv.mkDerivation rec { - name = "gvpe-${version}"; + pname = "gvpe"; version = "3.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/hans/default.nix b/nixpkgs/pkgs/tools/networking/hans/default.nix index 6fd4ab361630..ccc598b0692f 100644 --- a/nixpkgs/pkgs/tools/networking/hans/default.nix +++ b/nixpkgs/pkgs/tools/networking/hans/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, nettools }: stdenv.mkDerivation rec { - name = "hans-${version}"; + pname = "hans"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 62ac791252d8..d8711d516dc5 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -10,10 +10,9 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; version = "1.9.8"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; + url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id"; }; diff --git a/nixpkgs/pkgs/tools/networking/horst/default.nix b/nixpkgs/pkgs/tools/networking/horst/default.nix index ba76c37a4bba..96fb342e27fc 100644 --- a/nixpkgs/pkgs/tools/networking/horst/default.nix +++ b/nixpkgs/pkgs/tools/networking/horst/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }: stdenv.mkDerivation rec { - name = "horst-${version}"; + pname = "horst"; version = "5.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/hping/default.nix b/nixpkgs/pkgs/tools/networking/hping/default.nix index 3fdebbf49662..6e00a6e9afa8 100644 --- a/nixpkgs/pkgs/tools/networking/hping/default.nix +++ b/nixpkgs/pkgs/tools/networking/hping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, tcl }: stdenv.mkDerivation rec { - name = "hping-${version}"; + pname = "hping"; version = "20051105"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/htpdate/default.nix b/nixpkgs/pkgs/tools/networking/htpdate/default.nix index a4c6e517a753..4a350d237d0f 100644 --- a/nixpkgs/pkgs/tools/networking/htpdate/default.nix +++ b/nixpkgs/pkgs/tools/networking/htpdate/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "htpdate-${version}"; + pname = "htpdate"; src = fetchurl { - url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz"; + url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz"; sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q"; }; diff --git a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix index cfd4658f63f8..bcaca9ef0ce5 100644 --- a/nixpkgs/pkgs/tools/networking/http-prompt/default.nix +++ b/nixpkgs/pkgs/tools/networking/http-prompt/default.nix @@ -3,7 +3,6 @@ pythonPackages.buildPythonApplication rec { pname = "http-prompt"; version = "1.0.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/networking/httperf/default.nix b/nixpkgs/pkgs/tools/networking/httperf/default.nix index fa8bbb91c5be..271be9c2352f 100644 --- a/nixpkgs/pkgs/tools/networking/httperf/default.nix +++ b/nixpkgs/pkgs/tools/networking/httperf/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "httperf"; - name = "${pname}-${version}"; version = "0.9.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/httping/default.nix b/nixpkgs/pkgs/tools/networking/httping/default.nix index 1a6aeb57ab87..e269a38f8218 100644 --- a/nixpkgs/pkgs/tools/networking/httping/default.nix +++ b/nixpkgs/pkgs/tools/networking/httping/default.nix @@ -2,11 +2,11 @@ , fftw ? null }: stdenv.mkDerivation rec { - name = "httping-${version}"; + pname = "httping"; version = "2.5"; src = fetchurl { - url = "https://vanheusden.com/httping/${name}.tgz"; + url = "https://vanheusden.com/httping/${pname}-${version}.tgz"; sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; diff --git a/nixpkgs/pkgs/tools/networking/httplab/default.nix b/nixpkgs/pkgs/tools/networking/httplab/default.nix index 8ec0ce2847dd..a7b157d3ebc2 100644 --- a/nixpkgs/pkgs/tools/networking/httplab/default.nix +++ b/nixpkgs/pkgs/tools/networking/httplab/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "httplab-${version}"; + pname = "httplab"; version = "0.3.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/nixpkgs/pkgs/tools/networking/httpstat/default.nix index 5a29657bd5b1..1649ebfb3cef 100644 --- a/nixpkgs/pkgs/tools/networking/httpstat/default.nix +++ b/nixpkgs/pkgs/tools/networking/httpstat/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "httpstat"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/httptunnel/default.nix b/nixpkgs/pkgs/tools/networking/httptunnel/default.nix index c47dd03cb9d0..df62f90ad0bb 100644 --- a/nixpkgs/pkgs/tools/networking/httptunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/httptunnel/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.3"; - name = "httptunnel-${version}"; + pname = "httptunnel"; src = fetchurl { - url = "http://www.nocrew.org/software/httptunnel/${name}.tar.gz"; + url = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz"; sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"; }; diff --git a/nixpkgs/pkgs/tools/networking/i2p/default.nix b/nixpkgs/pkgs/tools/networking/i2p/default.nix index 7d709df75b60..0b0860126b50 100644 --- a/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -1,7 +1,7 @@ { stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: let wrapper = stdenv.mkDerivation rec { - name = "wrapper-${version}"; + pname = "wrapper"; version = "3.5.35"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 050f1c9cd4a5..97dbb1bdb8ff 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -8,8 +8,6 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { - - name = pname + "-" + version; pname = "i2pd"; version = "2.26.0"; diff --git a/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix index 8b7f4e1c2a04..756e77f1157e 100644 --- a/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/nixpkgs/pkgs/tools/networking/ifstat-legacy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, net_snmp }: stdenv.mkDerivation rec { - name = "ifstat-legacy-${version}"; + pname = "ifstat-legacy"; version = "1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 47352d21c4a2..20169121cd9a 100644 --- a/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -2,7 +2,7 @@ , gnutls, libite, libconfuse }: stdenv.mkDerivation rec { - name = "inadyn-${version}"; + pname = "inadyn"; version = "2.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/iouyap/default.nix b/nixpkgs/pkgs/tools/networking/iouyap/default.nix index c37b409cdfb5..b49b34d6dc7a 100644 --- a/nixpkgs/pkgs/tools/networking/iouyap/default.nix +++ b/nixpkgs/pkgs/tools/networking/iouyap/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "iouyap"; version = "0.97"; diff --git a/nixpkgs/pkgs/tools/networking/ip2location/default.nix b/nixpkgs/pkgs/tools/networking/ip2location/default.nix index 3c2e7f53beeb..c3304c385e7b 100644 --- a/nixpkgs/pkgs/tools/networking/ip2location/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2location/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ip2location-${version}"; + pname = "ip2location"; version = "7.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix index 549461fe5d0b..ab09399cd8e3 100644 --- a/nixpkgs/pkgs/tools/networking/ip2unix/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2unix/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ip2unix-${version}"; + pname = "ip2unix"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/ipcalc/default.nix b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix index 26c8d89b5d48..2727175f0412 100644 --- a/nixpkgs/pkgs/tools/networking/ipcalc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipcalc/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "ipcalc-${version}"; + pname = "ipcalc"; version = "0.41"; src = fetchurl { - url = "http://jodies.de/ipcalc-archive/${name}.tar.gz"; + url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz"; sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a"; }; buildInputs = [perl]; diff --git a/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix b/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix index 9b4edd763057..169fea6c4474 100644 --- a/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix @@ -2,11 +2,11 @@ , geoip ? null, geolite-legacy ? null }: stdenv.mkDerivation rec { - name = "ipv6calc-${version}"; + pname = "ipv6calc"; version = "1.1.0"; src = fetchurl { - url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; + url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"; sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq"; }; diff --git a/nixpkgs/pkgs/tools/networking/kail/default.nix b/nixpkgs/pkgs/tools/networking/kail/default.nix index 7877200116d1..931cfa3a74d9 100644 --- a/nixpkgs/pkgs/tools/networking/kail/default.nix +++ b/nixpkgs/pkgs/tools/networking/kail/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kail-${version}"; + pname = "kail"; version = "0.8.0"; goPackagePath = "github.com/boz/kail"; diff --git a/nixpkgs/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix index a1c156475fb4..bc35a25cfde8 100644 --- a/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -2,13 +2,12 @@ , boost, python3, postgresql, mysql, gmp, bzip2 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "kea"; - version = "1.5.0"; + version = "1.5.0-P1"; src = fetchurl { - url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "1v5a3prgrplw6dp9124f9gpy0kz0jrjwhnvzrw3zcynad2mlzkpd"; + url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; + sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz"; }; patches = [ ./dont-create-var.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/nixpkgs/pkgs/tools/networking/keepalived/default.nix index 43d0944a4159..9ae981e03692 100644 --- a/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "keepalived-${version}"; + pname = "keepalived"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/lftp/default.nix b/nixpkgs/pkgs/tools/networking/lftp/default.nix index b4886f58cbb1..13bdbe17ff8b 100644 --- a/nixpkgs/pkgs/tools/networking/lftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/lftp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: stdenv.mkDerivation rec { - name = "lftp-${version}"; + pname = "lftp"; version = "4.8.4"; src = fetchurl { urls = [ - "https://lftp.tech/ftp/${name}.tar.xz" - "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz" - "https://lftp.yar.ru/ftp/${name}.tar.xz" + "https://lftp.tech/ftp/${pname}-${version}.tar.xz" + "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz" + "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz" ]; sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f"; }; diff --git a/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/nixpkgs/pkgs/tools/networking/lldpd/default.nix index a8e4f2dc83f5..b8ba1357f5f8 100644 --- a/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "lldpd-${version}"; + pname = "lldpd"; version = "1.0.4"; src = fetchurl { - url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; + url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak"; }; diff --git a/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix index c5c7e18ba6d2..52b2a9a94dcb 100644 --- a/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix @@ -15,11 +15,11 @@ let libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { - name = "logmein-hamachi-${version}"; + pname = "logmein-hamachi"; version = "2.1.0.198"; src = fetchurl { - url = "https://www.vpn.net/installers/${name}-${arch}.tgz"; + url = "https://www.vpn.net/installers/${pname}-${version}-${arch}.tgz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/tools/networking/maxscale/default.nix b/nixpkgs/pkgs/tools/networking/maxscale/default.nix index a7648fd59c35..32f6b11d77c5 100644 --- a/nixpkgs/pkgs/tools/networking/maxscale/default.nix +++ b/nixpkgs/pkgs/tools/networking/maxscale/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "maxscale-${version}"; + pname = "maxscale"; version = "2.1.17"; src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "MaxScale"; - rev = "${name}"; + rev = "${pname}-${version}"; sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6"; }; diff --git a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix index 38b2aa531e67..e902f24ca0e5 100644 --- a/nixpkgs/pkgs/tools/networking/mcrcon/default.nix +++ b/nixpkgs/pkgs/tools/networking/mcrcon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mcrcon-${version}"; + pname = "mcrcon"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/megatools/default.nix b/nixpkgs/pkgs/tools/networking/megatools/default.nix index c995eea7b14d..5a6fb5e51042 100644 --- a/nixpkgs/pkgs/tools/networking/megatools/default.nix +++ b/nixpkgs/pkgs/tools/networking/megatools/default.nix @@ -2,7 +2,7 @@ , asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "megatools-${version}"; + pname = "megatools"; version = "1.10.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix b/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix index c3a076076f14..075696cfba1b 100644 --- a/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/nixpkgs/pkgs/tools/networking/memtier-benchmark/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "memtier-benchmark-${version}"; + pname = "memtier-benchmark"; version = "1.2.17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/minidlna/default.nix b/nixpkgs/pkgs/tools/networking/minidlna/default.nix index 56a101b31573..49cc5710e599 100644 --- a/nixpkgs/pkgs/tools/networking/minidlna/default.nix +++ b/nixpkgs/pkgs/tools/networking/minidlna/default.nix @@ -3,7 +3,8 @@ let version = "1.2.1"; in stdenv.mkDerivation { - name = "minidlna-${version}"; + pname = "minidlna"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 3a3ca03f18ae..3c8d15346849 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -1,8 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "minio-client-${version}"; - + pname = "minio-client"; version = "2019-01-30T19-57-22Z"; src = fetchFromGitHub { @@ -14,9 +13,9 @@ buildGoPackage rec { goPackagePath = "github.com/minio/mc"; - buildFlagsArray = [''-ldflags= - -X github.com/minio/mc/cmd.Version=${version} - '']; + preBuild = '' + buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") + ''; meta = with stdenv.lib; { homepage = https://github.com/minio/mc; diff --git a/nixpkgs/pkgs/tools/networking/minissdpd/default.nix b/nixpkgs/pkgs/tools/networking/minissdpd/default.nix index 9809b330faba..1277a17f9bae 100644 --- a/nixpkgs/pkgs/tools/networking/minissdpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/minissdpd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libnfnetlink }: stdenv.mkDerivation rec { - name = "minissdpd-${version}"; + pname = "minissdpd"; version = "1.5.20180223"; src = fetchurl { sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - name = "${name}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; buildInputs = [ libnfnetlink ]; diff --git a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix index 84b31bd5d40c..dc0a4457dde4 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix @@ -3,10 +3,11 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "miniupnpc-${version}"; + pname = "miniupnpc"; + inherit version; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/tools/networking/miredo/default.nix b/nixpkgs/pkgs/tools/networking/miredo/default.nix index babfcf1db216..26f6c2498e18 100644 --- a/nixpkgs/pkgs/tools/networking/miredo/default.nix +++ b/nixpkgs/pkgs/tools/networking/miredo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.6"; - name = "miredo-${version}"; + pname = "miredo"; buildInputs = [ judy ]; diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index 75462659699c..bd035e8f03cb 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -4,7 +4,7 @@ , withMug ? false }: stdenv.mkDerivation rec { - name = "mu-${version}"; + pname = "mu"; version = "1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix b/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix index a352596eed05..a4dcfb4a40f2 100644 --- a/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix +++ b/nixpkgs/pkgs/tools/networking/nat-traverse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "nat-traverse-${version}"; + pname = "nat-traverse"; version = "0.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/ncftp/default.nix b/nixpkgs/pkgs/tools/networking/ncftp/default.nix index 90ac44aa375a..acd9a0e27f86 100644 --- a/nixpkgs/pkgs/tools/networking/ncftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ncftp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, coreutils }: stdenv.mkDerivation rec { - name = "ncftp-${version}"; + pname = "ncftp"; version = "3.2.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix index 255d430a3a5d..77f797fc7c7c 100644 --- a/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.06"; - name = "ndjbdns-${version}"; + pname = "ndjbdns"; src = fetchFromGitHub { owner = "pjps"; diff --git a/nixpkgs/pkgs/tools/networking/netalyzr/default.nix b/nixpkgs/pkgs/tools/networking/netalyzr/default.nix index 8f8cf929e9d4..940a37ab86fa 100644 --- a/nixpkgs/pkgs/tools/networking/netalyzr/default.nix +++ b/nixpkgs/pkgs/tools/networking/netalyzr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "netalyzr-${version}"; + pname = "netalyzr"; version = "57861"; # unfortunately there is not a version specific download URL diff --git a/nixpkgs/pkgs/tools/networking/nethogs/default.nix b/nixpkgs/pkgs/tools/networking/nethogs/default.nix index eac95a32008c..a85d4d7ad108 100644 --- a/nixpkgs/pkgs/tools/networking/nethogs/default.nix +++ b/nixpkgs/pkgs/tools/networking/nethogs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { - name = "nethogs-${version}"; + pname = "nethogs"; version = "0.8.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/netmask/default.nix b/nixpkgs/pkgs/tools/networking/netmask/default.nix index e9704c4babe6..864838bdd390 100644 --- a/nixpkgs/pkgs/tools/networking/netmask/default.nix +++ b/nixpkgs/pkgs/tools/networking/netmask/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, texinfo }: stdenv.mkDerivation rec { - name = "netmask-${version}"; + pname = "netmask"; version = "2.4.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/netrw/default.nix b/nixpkgs/pkgs/tools/networking/netrw/default.nix index d10125e09a65..dfd355237dc0 100644 --- a/nixpkgs/pkgs/tools/networking/netrw/default.nix +++ b/nixpkgs/pkgs/tools/networking/netrw/default.nix @@ -8,7 +8,7 @@ assert checksumType == "mhash" -> libmhash != null; assert checksumType == "openssl" -> openssl != null; stdenv.mkDerivation rec { - name = "netrw-${version}"; + pname = "netrw"; version = "1.3.2"; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/networking/netselect/default.nix b/nixpkgs/pkgs/tools/networking/netselect/default.nix index 702fee86922e..c40f43c214fc 100644 --- a/nixpkgs/pkgs/tools/networking/netselect/default.nix +++ b/nixpkgs/pkgs/tools/networking/netselect/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netselect-${version}"; + pname = "netselect"; version = "0.4"; src = fetchFromGitHub { owner = "apenwarr"; repo = "netselect"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1zncyvjzllrjbdvz7c50d1xjyhs9mwqfy92ndpfc5b3mxqslw4kx"; }; diff --git a/nixpkgs/pkgs/tools/networking/nettee/default.nix b/nixpkgs/pkgs/tools/networking/nettee/default.nix index fdfa446907c1..d95171807dfa 100644 --- a/nixpkgs/pkgs/tools/networking/nettee/default.nix +++ b/nixpkgs/pkgs/tools/networking/nettee/default.nix @@ -5,7 +5,8 @@ let sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r"; in stdenv.mkDerivation { - name = "nettee-${version}"; + pname = "nettee"; + inherit version; src = fetchurl { url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix index c5613341aab1..131ec6751159 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -3,7 +3,7 @@ , libgcrypt, perl, libgudev, avahi, ppp, kmod }: stdenv.mkDerivation rec { - name = "network-manager-${version}"; + pname = "network-manager"; version = "0.9.8.10"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/default.nix index 95d37e164788..5bc915caea65 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/default.nix @@ -7,14 +7,13 @@ , openconnect, curl, meson, ninja, libpsl }: let - pname = "NetworkManager"; pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { - name = "network-manager-${version}"; + pname = "network-manager"; version = "1.18.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad"; }; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/dmenu.nix b/nixpkgs/pkgs/tools/networking/network-manager/dmenu.nix index 665db4cc287b..93a169a3fb0f 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/dmenu.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/dmenu.nix @@ -3,7 +3,7 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { - name = "networkmanager_dmenu-${version}"; + pname = "networkmanager_dmenu"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix index 6b69b97552a8..60c344e8eb4b 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix @@ -2,12 +2,11 @@ , gtk3, gnome3, libsecret }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "NetworkManager-strongswan"; version = "1.4.5"; src = fetchurl { - url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; + url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; }; diff --git a/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 977683f26ccb..0ae309cf94d9 100644 --- a/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -5,7 +5,8 @@ let version = "1.6.18"; in stdenv.mkDerivation { - name = "nfdump-${version}"; + pname = "nfdump"; + inherit version; src = fetchFromGitHub { owner = "phaag"; diff --git a/nixpkgs/pkgs/tools/networking/ngrep/default.nix b/nixpkgs/pkgs/tools/networking/ngrep/default.nix index 9cddc5bbd877..ab8da6236cff 100644 --- a/nixpkgs/pkgs/tools/networking/ngrep/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrep/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, pcre }: stdenv.mkDerivation rec { - name = "ngrep-${version}"; + pname = "ngrep"; version = "1.47"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix index d0aec7889efa..463227741fb3 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, go-bindata, fetchFromGitHub }: buildGoPackage rec { - name = "ngrok-${version}"; + pname = "ngrok"; version = "1.7.1"; rev = "${version}"; diff --git a/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix b/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix index b199d850f971..dc921dc495af 100644 --- a/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nss-pam-ldapd-${version}"; + pname = "nss-pam-ldapd"; version = "0.9.10"; src = fetchurl { - url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; + url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz"; sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0"; }; diff --git a/nixpkgs/pkgs/tools/networking/nuttcp/default.nix b/nixpkgs/pkgs/tools/networking/nuttcp/default.nix index 2ed9c330181c..f01d5ccada19 100644 --- a/nixpkgs/pkgs/tools/networking/nuttcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/nuttcp/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nuttcp-${version}"; + pname = "nuttcp"; version = "8.1.4"; src = fetchurl { urls = [ - "http://nuttcp.net/nuttcp/latest/${name}.c" - "http://nuttcp.net/nuttcp/${name}/${name}.c" - "http://nuttcp.net/nuttcp/beta/${name}.c" + "http://nuttcp.net/nuttcp/latest/${pname}-${version}.c" + "http://nuttcp.net/nuttcp/${pname}-${version}/${pname}-${version}.c" + "http://nuttcp.net/nuttcp/beta/${pname}-${version}.c" ]; sha256 = "1mygfhwxfi6xg0iycivx98ckak2abc3vwndq74278kpd8g0yyqyh"; }; man = fetchurl { - url = "http://nuttcp.net/nuttcp/${name}/nuttcp.8"; + url = "http://nuttcp.net/nuttcp/${pname}-${version}/nuttcp.8"; sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx"; }; diff --git a/nixpkgs/pkgs/tools/networking/nzbget/default.nix b/nixpkgs/pkgs/tools/networking/nzbget/default.nix index af7c4401daec..b3c77f5b797c 100644 --- a/nixpkgs/pkgs/tools/networking/nzbget/default.nix +++ b/nixpkgs/pkgs/tools/networking/nzbget/default.nix @@ -2,7 +2,7 @@ , gnutls, libgcrypt, zlib, openssl }: stdenv.mkDerivation rec { - name = "nzbget-${version}"; + pname = "nzbget"; version = "21.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/ocproxy/default.nix b/nixpkgs/pkgs/tools/networking/ocproxy/default.nix index c93e94e2f287..729f5b319980 100644 --- a/nixpkgs/pkgs/tools/networking/ocproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocproxy/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.60"; - name = "ocproxy-${version}"; + pname = "ocproxy"; src = fetchFromGitHub { owner = "cernekee"; diff --git a/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix index 094bebe628f6..e695c4604229 100644 --- a/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ocserv-${version}"; + pname = "ocserv"; version = "0.12.4"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/networking/olsrd/default.nix b/nixpkgs/pkgs/tools/networking/olsrd/default.nix index 8fa30a5c2211..cff4b7e97137 100644 --- a/nixpkgs/pkgs/tools/networking/olsrd/default.nix +++ b/nixpkgs/pkgs/tools/networking/olsrd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "olsrd-${version}"; + pname = "olsrd"; version = "0.9.6.1"; src = fetchurl { - url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2"; + url = "http://www.olsr.org/releases/0.9/${pname}-${version}.tar.bz2"; sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612"; }; diff --git a/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix index d261e5717052..ba8fc6694d17 100644 --- a/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix +++ b/nixpkgs/pkgs/tools/networking/openconnect_pa/default.nix @@ -4,7 +4,7 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { version = "unstable-2018-10-08"; - name = "openconnect_pa-${version}"; + pname = "openconnect_pa"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/tools/networking/openntpd/default.nix b/nixpkgs/pkgs/tools/networking/openntpd/default.nix index 019806fcd572..9ef8c75b7286 100644 --- a/nixpkgs/pkgs/tools/networking/openntpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/openntpd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "openntpd-${version}"; + pname = "openntpd"; version = "6.2p3"; src = fetchurl { - url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; + url = "mirror://openbsd/OpenNTPD/${pname}-${version}.tar.gz"; sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv"; }; diff --git a/nixpkgs/pkgs/tools/networking/openresolv/default.nix b/nixpkgs/pkgs/tools/networking/openresolv/default.nix index 302e08617afc..73cb98060a03 100644 --- a/nixpkgs/pkgs/tools/networking/openresolv/default.nix +++ b/nixpkgs/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "openresolv-${version}"; + pname = "openresolv"; version = "3.9.1"; src = fetchurl { - url = "mirror://roy/openresolv/${name}.tar.xz"; + url = "mirror://roy/openresolv/${pname}-${version}.tar.xz"; sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q"; }; diff --git a/nixpkgs/pkgs/tools/networking/opensm/default.nix b/nixpkgs/pkgs/tools/networking/opensm/default.nix index d52cc9d8defb..592c24b81fd0 100644 --- a/nixpkgs/pkgs/tools/networking/opensm/default.nix +++ b/nixpkgs/pkgs/tools/networking/opensm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }: stdenv.mkDerivation rec { - name = "opensm-${version}"; + pname = "opensm"; version = "3.3.22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/openssh/default.nix b/nixpkgs/pkgs/tools/networking/openssh/default.nix index 6ce574b9cdc4..bb51e3153e13 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -21,7 +21,7 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-${version}"; + pname = "openssh"; version = if hpnSupport then "7.8p1" else "7.9p1"; src = if hpnSupport then @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { } else fetchurl { - url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; + url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"; }; @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch; sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds"; }) + + ./ssh-keysign.patch ] ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); diff --git a/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign.patch b/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign.patch new file mode 100644 index 000000000000..7258f4a4db15 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign.patch @@ -0,0 +1,29 @@ +diff --git a/pathnames.h b/pathnames.h +index cb44caa4..354fdf05 100644 +--- a/pathnames.h ++++ b/pathnames.h +@@ -124,7 +124,7 @@ + + /* Location of ssh-keysign for hostbased authentication */ + #ifndef _PATH_SSH_KEY_SIGN +-#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" ++#define _PATH_SSH_KEY_SIGN "ssh-keysign" + #endif + + /* Location of ssh-pkcs11-helper to support keys in tokens */ +diff --git a/sshconnect2.c b/sshconnect2.c +index dffee90b..e9a86e59 100644 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -1879,7 +1879,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp, + closefrom(sock + 1); + debug3("%s: [child] pid=%ld, exec %s", + __func__, (long)getpid(), _PATH_SSH_KEY_SIGN); +- execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); ++ execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); + fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN, + strerror(errno)); + } +-- +2.22.0 + diff --git a/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/openvpn/default.nix index 732687ecfa15..c8aa2c1f5c57 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -18,11 +18,11 @@ let }; in stdenv.mkDerivation rec { - name = "openvpn-${version}"; + pname = "openvpn"; version = "2.4.7"; src = fetchurl { - url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz"; + url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4"; }; diff --git a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 8c043294143e..a5305acdf597 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { version = "1.13.0"; - name = "tahoe-lafs-${version}"; + pname = "tahoe-lafs"; namePrefix = ""; src = fetchurl { @@ -65,8 +65,8 @@ pythonPackages.buildPythonApplication rec { cd docs make singlehtml - mkdir -p "$doc/share/doc/${name}" - cp -rv _build/singlehtml/* "$doc/share/doc/${name}" + mkdir -p "$doc/share/doc/${pname}-${version}" + cp -rv _build/singlehtml/* "$doc/share/doc/${pname}-${version}" make info mkdir -p "$info/share/info" diff --git a/nixpkgs/pkgs/tools/networking/packetdrill/default.nix b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix index d770a51dc820..13aa8fcbd00a 100644 --- a/nixpkgs/pkgs/tools/networking/packetdrill/default.nix +++ b/nixpkgs/pkgs/tools/networking/packetdrill/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { version = "1.0"; - name = "packetdrill-${version}"; + pname = "packetdrill"; src = fetchFromGitHub { owner = "google"; repo = "packetdrill"; diff --git a/nixpkgs/pkgs/tools/networking/pacparser/default.nix b/nixpkgs/pkgs/tools/networking/pacparser/default.nix index fbb17308f90c..211256ea72b8 100644 --- a/nixpkgs/pkgs/tools/networking/pacparser/default.nix +++ b/nixpkgs/pkgs/tools/networking/pacparser/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pacparser-${version}"; + pname = "pacparser"; version = "1.3.7"; src = fetchurl { - url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz"; + url = "https://github.com/manugarg/pacparser/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b"; }; diff --git a/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix b/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix index f2c92d689f35..9bc4c178665d 100644 --- a/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix +++ b/nixpkgs/pkgs/tools/networking/par2cmdline/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "par2cmdline-${version}"; + pname = "par2cmdline"; version = "0.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/pcapc/default.nix b/nixpkgs/pkgs/tools/networking/pcapc/default.nix index 71d1e6fa6d6e..663e04db4601 100644 --- a/nixpkgs/pkgs/tools/networking/pcapc/default.nix +++ b/nixpkgs/pkgs/tools/networking/pcapc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libpcap, cmake }: stdenv.mkDerivation rec { - name = "pcapc-${version}"; + pname = "pcapc"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/philter/default.nix b/nixpkgs/pkgs/tools/networking/philter/default.nix index 5dff64e27c5c..c8b441168468 100644 --- a/nixpkgs/pkgs/tools/networking/philter/default.nix +++ b/nixpkgs/pkgs/tools/networking/philter/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "philter-${version}"; + pname = "philter"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/philter/${name}.tar.gz"; + url = "mirror://sourceforge/philter/${pname}-${version}.tar.gz"; sha256 = "177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l"; }; diff --git a/nixpkgs/pkgs/tools/networking/phodav/default.nix b/nixpkgs/pkgs/tools/networking/phodav/default.nix index e585af81991e..320e7614c7c3 100644 --- a/nixpkgs/pkgs/tools/networking/phodav/default.nix +++ b/nixpkgs/pkgs/tools/networking/phodav/default.nix @@ -4,10 +4,11 @@ let version = "2.2"; in stdenv.mkDerivation rec { - name = "phodav-${version}"; + pname = "phodav"; + inherit version; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${name}.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; sha256 = "1hap0lncbcmivnflh0fbx7y58ry78p9wgj7z03r64ic0kvf0a0q8"; }; diff --git a/nixpkgs/pkgs/tools/networking/pingtcp/default.nix b/nixpkgs/pkgs/tools/networking/pingtcp/default.nix index 2d13515d83d7..d791f6b91d99 100644 --- a/nixpkgs/pkgs/tools/networking/pingtcp/default.nix +++ b/nixpkgs/pkgs/tools/networking/pingtcp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "pingtcp-${version}"; + pname = "pingtcp"; version = "0.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/pixiewps/default.nix b/nixpkgs/pkgs/tools/networking/pixiewps/default.nix index b082a981ae74..8bbf589f3b3d 100644 --- a/nixpkgs/pkgs/tools/networking/pixiewps/default.nix +++ b/nixpkgs/pkgs/tools/networking/pixiewps/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pixiewps-${version}"; + pname = "pixiewps"; version = "1.2.2"; src = fetchFromGitHub { owner = "wiire"; diff --git a/nixpkgs/pkgs/tools/networking/polysh/default.nix b/nixpkgs/pkgs/tools/networking/polysh/default.nix index 2a70218f2879..cf963068d1c5 100644 --- a/nixpkgs/pkgs/tools/networking/polysh/default.nix +++ b/nixpkgs/pkgs/tools/networking/polysh/default.nix @@ -4,10 +4,10 @@ let inherit (python2Packages) buildPythonApplication; in buildPythonApplication rec { - name = "polysh-${version}"; + pname = "polysh"; version = "0.4"; src = fetchurl { - url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/polysh/files/${pname}-${version}.tar.bz2"; sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; }; diff --git a/nixpkgs/pkgs/tools/networking/ppp/default.nix b/nixpkgs/pkgs/tools/networking/ppp/default.nix index 26dc71b7d619..b072ed21318c 100644 --- a/nixpkgs/pkgs/tools/networking/ppp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ppp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.4.7"; - name = "ppp-${version}"; + pname = "ppp"; src = fetchurl { - url = "mirror://samba/ppp/${name}.tar.gz"; + url = "mirror://samba/ppp/${pname}-${version}.tar.gz"; sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02"; }; diff --git a/nixpkgs/pkgs/tools/networking/pptpd/default.nix b/nixpkgs/pkgs/tools/networking/pptpd/default.nix index 4c29cd949ee6..f373f594df80 100644 --- a/nixpkgs/pkgs/tools/networking/pptpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/pptpd/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, ppp }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "pptpd"; version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/poptop/${pname}/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/poptop/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1h06gyxj51ba6kbbnf6hyivwjia0i6gsmjz8kyggaany8a58pkcg"; }; diff --git a/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 56bd46427d86..848a99f77718 100644 --- a/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ - name = "privoxy-${version}"; + pname = "privoxy"; version = "3.0.28"; src = fetchurl { - url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz"; + url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; sha256 = "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm"; }; diff --git a/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/nixpkgs/pkgs/tools/networking/proxychains/default.nix index 36d0150a49b5..52ef43838c26 100644 --- a/nixpkgs/pkgs/tools/networking/proxychains/default.nix +++ b/nixpkgs/pkgs/tools/networking/proxychains/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { - name = "proxychains-${version}"; + pname = "proxychains"; version = "4.2.0"; src = fetchFromGitHub { owner = "haad"; repo = "proxychains"; - rev = name; + rev = "${pname}-${version}"; sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc"; }; diff --git a/nixpkgs/pkgs/tools/networking/pssh/default.nix b/nixpkgs/pkgs/tools/networking/pssh/default.nix index 22c359620507..43e465e05b6a 100644 --- a/nixpkgs/pkgs/tools/networking/pssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/pssh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { - name = "pssh-${version}"; + pname = "pssh"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/pykms/default.nix b/nixpkgs/pkgs/tools/networking/pykms/default.nix index 15ac5bceea33..57cd093e1cd6 100644 --- a/nixpkgs/pkgs/tools/networking/pykms/default.nix +++ b/nixpkgs/pkgs/tools/networking/pykms/default.nix @@ -30,7 +30,7 @@ let ''); in buildPythonApplication rec { - name = "pykms-${version}"; + pname = "pykms"; version = "20180208"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix index 581405f63c05..b1d972a733b6 100644 --- a/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix +++ b/nixpkgs/pkgs/tools/networking/qr-filetransfer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "qr-filetransfer-unstable-${version}"; + pname = "qr-filetransfer-unstable"; version = "2018-10-22"; goPackagePath = "github.com/claudiodangelis/qr-filetransfer"; diff --git a/nixpkgs/pkgs/tools/networking/quicktun/default.nix b/nixpkgs/pkgs/tools/networking/quicktun/default.nix index 3d7dc68e3578..12e073865166 100644 --- a/nixpkgs/pkgs/tools/networking/quicktun/default.nix +++ b/nixpkgs/pkgs/tools/networking/quicktun/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libsodium }: stdenv.mkDerivation rec { - name = "quicktun-${version}"; + pname = "quicktun"; version = "2.2.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/radvd/default.nix b/nixpkgs/pkgs/tools/networking/radvd/default.nix index 98466a800a34..30e706d66737 100644 --- a/nixpkgs/pkgs/tools/networking/radvd/default.nix +++ b/nixpkgs/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-${version}"; + pname = "radvd"; version = "2.18"; src = fetchurl { - url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; + url = "http://www.litech.org/radvd/dist/${pname}-${version}.tar.xz"; sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1"; }; diff --git a/nixpkgs/pkgs/tools/networking/ratools/default.nix b/nixpkgs/pkgs/tools/networking/ratools/default.nix index 5e18ee80f99d..cf8c370c522a 100644 --- a/nixpkgs/pkgs/tools/networking/ratools/default.nix +++ b/nixpkgs/pkgs/tools/networking/ratools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ratools-${version}"; + pname = "ratools"; version = "0.6.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix b/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix index ed48feabb85a..864a7fb5e613 100644 --- a/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix +++ b/nixpkgs/pkgs/tools/networking/reaver-wps/default.nix @@ -2,8 +2,8 @@ stdenv.mkDerivation rec { version = "1.4"; - name = "reaver-wps-${version}"; - confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db" + pname = "reaver-wps"; + confdir = "/var/db/${pname}-${version}"; # the sqlite database is at "${confdir}/reaver/reaver.db" src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/reaver-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/redir/default.nix b/nixpkgs/pkgs/tools/networking/redir/default.nix index a11bebe0dca1..1a6efb065e2e 100644 --- a/nixpkgs/pkgs/tools/networking/redir/default.nix +++ b/nixpkgs/pkgs/tools/networking/redir/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "redir-${version}"; + pname = "redir"; version = "3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/ripmime/default.nix b/nixpkgs/pkgs/tools/networking/ripmime/default.nix index 37f542319dad..ae84d9662aa0 100644 --- a/nixpkgs/pkgs/tools/networking/ripmime/default.nix +++ b/nixpkgs/pkgs/tools/networking/ripmime/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "ripmime"; version = "1.4.0.10"; src = fetchurl { - url = "http://www.pldaniels.com/${pname}/${name}.tar.gz"; + url = "http://www.pldaniels.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9"; }; diff --git a/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix b/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix index 3814af60112e..d53d60333baf 100644 --- a/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix +++ b/nixpkgs/pkgs/tools/networking/s3gof3r/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "s3gof3r-${version}"; + pname = "s3gof3r"; version = "20151109-${stdenv.lib.strings.substring 0 7 rev}"; rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445"; diff --git a/nixpkgs/pkgs/tools/networking/samplicator/default.nix b/nixpkgs/pkgs/tools/networking/samplicator/default.nix index 5cb65b78ee8b..d8167b8a48fc 100644 --- a/nixpkgs/pkgs/tools/networking/samplicator/default.nix +++ b/nixpkgs/pkgs/tools/networking/samplicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "samplicator-${version}"; + pname = "samplicator"; version = "1.3.8rc1"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/shncpd/default.nix b/nixpkgs/pkgs/tools/networking/shncpd/default.nix index be2bc6a75a17..211758f692b7 100644 --- a/nixpkgs/pkgs/tools/networking/shncpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/shncpd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "shncpd-${version}"; + pname = "shncpd"; version = "2016-06-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix b/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix index 476e7dc229df..f94e177a8585 100644 --- a/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/simpleproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "simpleproxy-${version}"; + pname = "simpleproxy"; version = "3.5"; rev = "v.${version}"; diff --git a/nixpkgs/pkgs/tools/networking/sipcalc/default.nix b/nixpkgs/pkgs/tools/networking/sipcalc/default.nix index 9400ccbb0724..dff929e9fa1c 100644 --- a/nixpkgs/pkgs/tools/networking/sipcalc/default.nix +++ b/nixpkgs/pkgs/tools/networking/sipcalc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sipcalc-${version}"; + pname = "sipcalc"; version = "1.1.6"; src = fetchurl { - url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz"; + url = "http://www.routemeister.net/projects/sipcalc/files/${pname}-${version}.tar.gz"; sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357"; }; diff --git a/nixpkgs/pkgs/tools/networking/sipsak/default.nix b/nixpkgs/pkgs/tools/networking/sipsak/default.nix index 908e4b05009f..c1a2451328df 100644 --- a/nixpkgs/pkgs/tools/networking/sipsak/default.nix +++ b/nixpkgs/pkgs/tools/networking/sipsak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }: stdenv.mkDerivation rec { - name = "sipsak-${version}"; + pname = "sipsak"; version = "4.1.2.1"; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/skydive/default.nix b/nixpkgs/pkgs/tools/networking/skydive/default.nix index e72147937445..722deaff655c 100644 --- a/nixpkgs/pkgs/tools/networking/skydive/default.nix +++ b/nixpkgs/pkgs/tools/networking/skydive/default.nix @@ -2,7 +2,7 @@ , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: buildGoPackage rec { - name = "skydive-${version}"; + pname = "skydive"; version = "0.17.0"; goPackagePath = "github.com/skydive-project/skydive"; diff --git a/nixpkgs/pkgs/tools/networking/slack-cli/default.nix b/nixpkgs/pkgs/tools/networking/slack-cli/default.nix index 91b868a017f5..bdd650494b15 100644 --- a/nixpkgs/pkgs/tools/networking/slack-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/slack-cli/default.nix @@ -8,7 +8,7 @@ { stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }: stdenv.mkDerivation rec { - name = "slack-cli-${version}"; + pname = "slack-cli"; version = "0.18.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 0f7c035b4c05..b64cf5cdd9b2 100644 --- a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "slirp4netns-${version}"; + pname = "slirp4netns"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/smokeping/default.nix b/nixpkgs/pkgs/tools/networking/smokeping/default.nix index 08b5e6a211b8..0c9079240d0c 100644 --- a/nixpkgs/pkgs/tools/networking/smokeping/default.nix +++ b/nixpkgs/pkgs/tools/networking/smokeping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fping, rrdtool, perlPackages }: stdenv.mkDerivation rec { - name = "smokeping-${version}"; + pname = "smokeping"; version = "2.6.11"; src = fetchurl { url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/snabb/default.nix b/nixpkgs/pkgs/tools/networking/snabb/default.nix index cdf14f5af33f..ba05ee8e8b51 100644 --- a/nixpkgs/pkgs/tools/networking/snabb/default.nix +++ b/nixpkgs/pkgs/tools/networking/snabb/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "snabb-${version}"; + pname = "snabb"; version = "2018.01.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/spiped/default.nix b/nixpkgs/pkgs/tools/networking/spiped/default.nix index ad2d88e4a982..9cc3370c0a1f 100644 --- a/nixpkgs/pkgs/tools/networking/spiped/default.nix +++ b/nixpkgs/pkgs/tools/networking/spiped/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, coreutils }: stdenv.mkDerivation rec { - name = "spiped-${version}"; + pname = "spiped"; version = "1.5.0"; src = fetchurl { - url = "https://www.tarsnap.com/spiped/${name}.tgz"; + url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; }; diff --git a/nixpkgs/pkgs/tools/networking/spoofer/default.nix b/nixpkgs/pkgs/tools/networking/spoofer/default.nix index faeec8523aa4..2b5aa2b7cbf7 100644 --- a/nixpkgs/pkgs/tools/networking/spoofer/default.nix +++ b/nixpkgs/pkgs/tools/networking/spoofer/default.nix @@ -7,10 +7,9 @@ in stdenv.mkDerivation rec { pname = "spoofer"; version = "1.4.5"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz"; + url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; }; diff --git a/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix index 01903171e9c2..0264da5c8175 100644 --- a/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssh-ident/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, python }: stdenv.mkDerivation rec { - name = "ssh-ident-${version}"; + pname = "ssh-ident"; version = "2016-04-21"; src = fetchFromGitHub { owner = "ccontavalli"; diff --git a/nixpkgs/pkgs/tools/networking/sshpass/default.nix b/nixpkgs/pkgs/tools/networking/sshpass/default.nix index 94221a359c1d..3765e6aa08f7 100644 --- a/nixpkgs/pkgs/tools/networking/sshpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/sshpass/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "sshpass-${version}"; + pname = "sshpass"; version = "1.06"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/nixpkgs/pkgs/tools/networking/ssldump/default.nix index adda38c184d9..ad8f98302642 100644 --- a/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation rec { - name = "ssldump-${version}"; + pname = "ssldump"; version = "0.9b3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/sstp/default.nix b/nixpkgs/pkgs/tools/networking/sstp/default.nix index 7bbc872c98e1..de65298d6481 100644 --- a/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: stdenv.mkDerivation rec { - name = "sstp-client-${version}"; + pname = "sstp-client"; version = "1.0.12"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/strongswan/default.nix index 1bd864d859c5..869e568d3696 100644 --- a/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "strongswan-${version}"; + pname = "strongswan"; version = "5.8.0"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! src = fetchurl { - url = "https://download.strongswan.org/${name}.tar.bz2"; + url = "https://download.strongswan.org/${pname}-${version}.tar.bz2"; sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m"; }; diff --git a/nixpkgs/pkgs/tools/networking/stubby/default.nix b/nixpkgs/pkgs/tools/networking/stubby/default.nix index 89af381d0d6d..9b1ee7a9f799 100644 --- a/nixpkgs/pkgs/tools/networking/stubby/default.nix +++ b/nixpkgs/pkgs/tools/networking/stubby/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "stubby"; - name = "${pname}-${version}"; version = "0.2.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/stun/default.nix b/nixpkgs/pkgs/tools/networking/stun/default.nix index 7ba4a0d89362..9960e6f00304 100644 --- a/nixpkgs/pkgs/tools/networking/stun/default.nix +++ b/nixpkgs/pkgs/tools/networking/stun/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "stun"; version = "0.97"; diff --git a/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/nixpkgs/pkgs/tools/networking/stunnel/default.nix index 66a6c28d92a8..792e6f68294d 100644 --- a/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "stunnel-${version}"; + pname = "stunnel"; version = "5.55"; src = fetchurl { - url = "https://www.stunnel.org/downloads/${name}.tar.gz"; + url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` diff --git a/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 2a4cf3506df8..b05ab3eeb88b 100644 --- a/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "subfinder-git-${version}"; + pname = "subfinder-git"; version = "2018-07-15"; goPackagePath = "github.com/subfinder/subfinder"; diff --git a/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix index 4fc456523f7d..91f155739140 100644 --- a/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix +++ b/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { version = "2.3.1"; pname = "swagger-codegen"; - name = "${pname}-${version}"; jarfilename = "${pname}-cli-${version}.jar"; diff --git a/nixpkgs/pkgs/tools/networking/swaks/default.nix b/nixpkgs/pkgs/tools/networking/swaks/default.nix index a9b0d04360ef..9d776752c827 100644 --- a/nixpkgs/pkgs/tools/networking/swaks/default.nix +++ b/nixpkgs/pkgs/tools/networking/swaks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "swaks-${version}"; + pname = "swaks"; version = "20181104.0"; src = fetchurl { - url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; + url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz"; sha256 = "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2"; }; diff --git a/nixpkgs/pkgs/tools/networking/tcpdump/default.nix b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix index e0a9a7e76ae3..a04d47b64144 100644 --- a/nixpkgs/pkgs/tools/networking/tcpdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpdump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, perl }: stdenv.mkDerivation rec { - name = "tcpdump-${version}"; + pname = "tcpdump"; version = "4.9.2"; # leaked embargoed security update diff --git a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index 53af27b4deba..032adbff74fb 100644 --- a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libpcap, tcpdump }: stdenv.mkDerivation rec { - name = "tcpreplay-${version}"; + pname = "tcpreplay"; version = "4.3.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix b/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix index bc97d5d8d6e4..edd2abdd13e3 100644 --- a/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix +++ b/nixpkgs/pkgs/tools/networking/tftp-hpa/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tftp-hpa-${version}"; + pname = "tftp-hpa"; version="5.2"; src = fetchurl { - url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz"; + url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz"; sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; }; diff --git a/nixpkgs/pkgs/tools/networking/tinc/default.nix b/nixpkgs/pkgs/tools/networking/tinc/default.nix index a17f382557ac..cf4a2bad78b9 100644 --- a/nixpkgs/pkgs/tools/networking/tinc/default.nix +++ b/nixpkgs/pkgs/tools/networking/tinc/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0.35"; - name = "tinc-${version}"; + pname = "tinc"; src = fetchurl { url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/tinc/pre.nix b/nixpkgs/pkgs/tools/networking/tinc/pre.nix index df9eb9bdad25..85cdd19702fa 100644 --- a/nixpkgs/pkgs/tools/networking/tinc/pre.nix +++ b/nixpkgs/pkgs/tools/networking/tinc/pre.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-${version}"; + pname = "tinc"; version = "1.1pre17"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix index c9a6599708c6..84ecc44c1833 100644 --- a/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix @@ -2,7 +2,7 @@ libxslt, docbook_xsl }: stdenv.mkDerivation rec{ - name = "tinyproxy-${version}"; + pname = "tinyproxy"; version = "1.10.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/tracebox/default.nix b/nixpkgs/pkgs/tools/networking/tracebox/default.nix index c3abdd49e138..4062fc0fd585 100644 --- a/nixpkgs/pkgs/tools/networking/tracebox/default.nix +++ b/nixpkgs/pkgs/tools/networking/tracebox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }: stdenv.mkDerivation rec { - name = "tracebox-${version}"; + pname = "tracebox"; version = "0.2"; src = fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/traceroute/default.nix b/nixpkgs/pkgs/tools/networking/traceroute/default.nix index 3d3be5d4532c..af8f5cafb894 100644 --- a/nixpkgs/pkgs/tools/networking/traceroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/traceroute/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "traceroute-${version}"; + pname = "traceroute"; version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/traceroute/${name}.tar.gz"; + url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz"; sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; }; diff --git a/nixpkgs/pkgs/tools/networking/twa/default.nix b/nixpkgs/pkgs/tools/networking/twa/default.nix index 6170718b6184..fe75b35eea2b 100644 --- a/nixpkgs/pkgs/tools/networking/twa/default.nix +++ b/nixpkgs/pkgs/tools/networking/twa/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - name = "twa-${version}"; + pname = "twa"; version = "1.8.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/ua/default.nix b/nixpkgs/pkgs/tools/networking/ua/default.nix index 0cb8ad5a4376..ddd0bab5d615 100644 --- a/nixpkgs/pkgs/tools/networking/ua/default.nix +++ b/nixpkgs/pkgs/tools/networking/ua/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "ua-unstable-${version}"; + pname = "ua-unstable"; version = "2017-02-24"; rev = "325dab92c60e0f028e55060f0c288aa70905fb17"; diff --git a/nixpkgs/pkgs/tools/networking/ubridge/default.nix b/nixpkgs/pkgs/tools/networking/ubridge/default.nix index f6afddaba381..42839a8ba2f2 100644 --- a/nixpkgs/pkgs/tools/networking/ubridge/default.nix +++ b/nixpkgs/pkgs/tools/networking/ubridge/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ubridge-${version}"; + pname = "ubridge"; version = "0.9.16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix b/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix index cc93da7f2533..68f457c2a638 100644 --- a/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix +++ b/nixpkgs/pkgs/tools/networking/uget-integrator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, uget, python3Packages }: stdenv.mkDerivation rec { - name = "uget-integrator-${version}"; + pname = "uget-integrator"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/uget/default.nix b/nixpkgs/pkgs/tools/networking/uget/default.nix index b35c3e8c883e..6b9d0bfa5dd5 100644 --- a/nixpkgs/pkgs/tools/networking/uget/default.nix +++ b/nixpkgs/pkgs/tools/networking/uget/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "uget-${version}"; + pname = "uget"; version = "2.2.2"; src = fetchurl { - url = "mirror://sourceforge/urlget/${name}.tar.gz"; + url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz"; sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw"; }; diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index 5702483b88bb..660ffcb823b3 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }: stdenv.mkDerivation rec { - name = "unbound-${version}"; + pname = "unbound"; version = "1.9.2"; src = fetchurl { - url = "https://unbound.net/downloads/${name}.tar.gz"; + url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg"; }; diff --git a/nixpkgs/pkgs/tools/networking/unbound/python.nix b/nixpkgs/pkgs/tools/networking/unbound/python.nix index f41aa35df90e..f6b5852a6752 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/python.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/python.nix @@ -4,7 +4,6 @@ let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "pyunbound"; - name = "${pname}-${version}"; version = "1.9.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/networking/wbox/default.nix b/nixpkgs/pkgs/tools/networking/wbox/default.nix index 0c97f20ee65f..b1fb6ae8d909 100644 --- a/nixpkgs/pkgs/tools/networking/wbox/default.nix +++ b/nixpkgs/pkgs/tools/networking/wbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wbox-${version}"; + pname = "wbox"; version = "5"; installPhase = '' @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.hping.org/wbox/${name}.tar.gz"; + url = "http://www.hping.org/wbox/${pname}-${version}.tar.gz"; sha256 = "06daxwbysppvbh1mwprw8fgsp6mbd3kqj7a978w7ivn8hdgdi28m"; }; diff --git a/nixpkgs/pkgs/tools/networking/weighttp/default.nix b/nixpkgs/pkgs/tools/networking/weighttp/default.nix index 1e93948be68b..5615c249de90 100644 --- a/nixpkgs/pkgs/tools/networking/weighttp/default.nix +++ b/nixpkgs/pkgs/tools/networking/weighttp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python, libev, wafHook }: stdenv.mkDerivation rec { - name = "weighttp-${version}"; + pname = "weighttp"; version = "0.4"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/networking/wget/default.nix b/nixpkgs/pkgs/tools/networking/wget/default.nix index 38a24eddc288..b7486ded4c8a 100644 --- a/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-${version}"; + pname = "wget"; version = "1.20.3"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.lz"; + url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"; }; diff --git a/nixpkgs/pkgs/tools/networking/whois/default.nix b/nixpkgs/pkgs/tools/networking/whois/default.nix index ee72cf4d2d89..b6c03c08cffe 100644 --- a/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.5.1"; - name = "whois-${version}"; + pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; diff --git a/nixpkgs/pkgs/tools/networking/wicd/default.nix b/nixpkgs/pkgs/tools/networking/wicd/default.nix index 9f67dd4e2c30..2f95876c2f30 100644 --- a/nixpkgs/pkgs/tools/networking/wicd/default.nix +++ b/nixpkgs/pkgs/tools/networking/wicd/default.nix @@ -5,11 +5,11 @@ let inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; in stdenv.mkDerivation rec { - name = "wicd-${version}"; + pname = "wicd"; version = "1.7.2.4"; src = fetchurl { - url = "https://launchpad.net/wicd/1.7/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; diff --git a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix index a537e4dfb266..dfda88cb8678 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchzip }: buildGoPackage rec { - name = "wireguard-go-${version}"; + pname = "wireguard-go"; version = "0.0.20190517"; goPackagePath = "git.zx2c4.com/wireguard-go"; diff --git a/nixpkgs/pkgs/tools/networking/wolfebin/default.nix b/nixpkgs/pkgs/tools/networking/wolfebin/default.nix index 05bf8d5dd11c..555c04a00899 100644 --- a/nixpkgs/pkgs/tools/networking/wolfebin/default.nix +++ b/nixpkgs/pkgs/tools/networking/wolfebin/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.4"; - name = "wolfebin-${version}"; + pname = "wolfebin"; src = fetchFromGitHub { owner = "thejoshwolfe"; diff --git a/nixpkgs/pkgs/tools/networking/wrk/default.nix b/nixpkgs/pkgs/tools/networking/wrk/default.nix index 5dd2f3b74fdc..9c8f46bef07b 100644 --- a/nixpkgs/pkgs/tools/networking/wrk/default.nix +++ b/nixpkgs/pkgs/tools/networking/wrk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, luajit, openssl, perl }: stdenv.mkDerivation rec { - name = "wrk-${version}"; + pname = "wrk"; version = "4.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/wrk2/default.nix b/nixpkgs/pkgs/tools/networking/wrk2/default.nix index e2e638ad485b..7908143bdab3 100644 --- a/nixpkgs/pkgs/tools/networking/wrk2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wrk2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, luajit, openssl, zlib }: stdenv.mkDerivation rec { - name = "wrk2-${version}"; + pname = "wrk2"; version = "4.0.0-${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/networking/wuzz/default.nix b/nixpkgs/pkgs/tools/networking/wuzz/default.nix index b13e5dee18c7..e84a97525f12 100644 --- a/nixpkgs/pkgs/tools/networking/wuzz/default.nix +++ b/nixpkgs/pkgs/tools/networking/wuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "wuzz-${version}"; + pname = "wuzz"; version = "0.2.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/networking/zap/default.nix b/nixpkgs/pkgs/tools/networking/zap/default.nix index 7cac5a455700..7afd5e07717a 100644 --- a/nixpkgs/pkgs/tools/networking/zap/default.nix +++ b/nixpkgs/pkgs/tools/networking/zap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: stdenv.mkDerivation rec { - name = "zap-${version}"; + pname = "zap"; version = "2.7.0"; src = fetchFromGitHub { owner = "zaproxy"; diff --git a/nixpkgs/pkgs/tools/networking/zssh/default.nix b/nixpkgs/pkgs/tools/networking/zssh/default.nix index ac64e135c2fe..b2016fe9452c 100644 --- a/nixpkgs/pkgs/tools/networking/zssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/zssh/default.nix @@ -3,10 +3,11 @@ let version = "1.5c"; in stdenv.mkDerivation rec { - name = "zssh-${version}"; + pname = "zssh"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/zssh/${name}.tgz"; + url = "mirror://sourceforge/zssh/${pname}-${version}.tgz"; sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52"; }; diff --git a/nixpkgs/pkgs/tools/nix/nix-script/default.nix b/nixpkgs/pkgs/tools/nix/nix-script/default.nix index 3742d22c0212..664e55125b54 100644 --- a/nixpkgs/pkgs/tools/nix/nix-script/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-script/default.nix @@ -1,7 +1,7 @@ { stdenv, haskellPackages, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nix-script-${version}"; + pname = "nix-script"; version = "2015-09-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix b/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix new file mode 100644 index 000000000000..4e51b9b46dd3 --- /dev/null +++ b/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix }: + +stdenv.mkDerivation rec { + pname = "nixos-generators"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixos-generators"; + rev = version; + sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq"; + }; + nativeBuildInputs = [ makeWrapper ]; + installFlags = [ "PREFIX=$(out)" ]; + postFixup = '' + wrapProgram $out/bin/nixos-generate \ + --prefix PATH : ${lib.makeBinPath [ jq coreutils findutils nix ] } + ''; + + meta = with stdenv.lib; { + description = "Collection of image builders"; + homepage = "https://github.com/nix-community/nixos-generators"; + license = licenses.mit; + maintainers = with maintainers; [ lassulus ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix b/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix index bcf96a50d36a..f161591c8f1d 100644 --- a/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apt-dater/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "apt-dater-${version}"; + pname = "apt-dater"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/apt/default.nix b/nixpkgs/pkgs/tools/package-management/apt/default.nix index 46da85d97488..cbb4ad4591e9 100644 --- a/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "apt-${version}"; + pname = "apt"; version = "1.4.6"; diff --git a/nixpkgs/pkgs/tools/package-management/bunny/default.nix b/nixpkgs/pkgs/tools/package-management/bunny/default.nix index 0f45084f3c05..938a762ba303 100644 --- a/nixpkgs/pkgs/tools/package-management/bunny/default.nix +++ b/nixpkgs/pkgs/tools/package-management/bunny/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab }: stdenv.mkDerivation rec { - name = "bunny-${version}"; + pname = "bunny"; version = "1.3"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/package-management/cde/default.nix b/nixpkgs/pkgs/tools/package-management/cde/default.nix index e45906688ada..5354fbb5e5ed 100644 --- a/nixpkgs/pkgs/tools/package-management/cde/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cde/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cde-${version}"; + pname = "cde"; version = "0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/clib/default.nix b/nixpkgs/pkgs/tools/package-management/clib/default.nix index 158db426c615..60c77db44d82 100644 --- a/nixpkgs/pkgs/tools/package-management/clib/default.nix +++ b/nixpkgs/pkgs/tools/package-management/clib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.8.1"; - name = "clib-${version}"; + pname = "clib"; src = fetchFromGitHub { rev = version; diff --git a/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix b/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix index 0a0cae32dcf5..15a64ffd25e6 100644 --- a/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix +++ b/nixpkgs/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { - name = "createrepo_c-${version}"; + pname = "createrepo_c"; version = "0.11.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index f13256d33bfb..11672e6d456d 100644 --- a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "dpkg-${version}"; + pname = "dpkg"; version = "1.19.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/package-management/gx/default.nix b/nixpkgs/pkgs/tools/package-management/gx/default.nix index 4c03fc35dea4..8e8d30e4fccf 100644 --- a/nixpkgs/pkgs/tools/package-management/gx/default.nix +++ b/nixpkgs/pkgs/tools/package-management/gx/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gx-${version}"; + pname = "gx"; version = "0.14.1"; rev = "refs/tags/v${version}"; diff --git a/nixpkgs/pkgs/tools/package-management/gx/go/default.nix b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix index 0ae0b8a19835..0a0793130d14 100644 --- a/nixpkgs/pkgs/tools/package-management/gx/go/default.nix +++ b/nixpkgs/pkgs/tools/package-management/gx/go/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gx-go-${version}"; + pname = "gx-go"; version = "1.9.0"; rev = "refs/tags/v${version}"; diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index ffa9f427dc2f..5049a90c7a7c 100644 --- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "home-manager-${version}"; + pname = "home-manager"; version = "2019-06-25"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/nixpkgs/pkgs/tools/package-management/librepo/default.nix index c35550597a34..0c53c1bbbc91 100644 --- a/nixpkgs/pkgs/tools/package-management/librepo/default.nix +++ b/nixpkgs/pkgs/tools/package-management/librepo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.9.2"; - name = "librepo-${version}"; + pname = "librepo"; src = fetchFromGitHub { owner = "rpm-software-management"; diff --git a/nixpkgs/pkgs/tools/package-management/morph/default.nix b/nixpkgs/pkgs/tools/package-management/morph/default.nix index 51a963497fa2..9804c0fa1851 100644 --- a/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, go-bindata, lib }: buildGoPackage rec { - name = "morph-${version}"; + pname = "morph"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix index 41471b2c8a7a..3f307d38f029 100644 --- a/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mynewt-newt-${version}"; + pname = "mynewt-newt"; version = "1.3.0"; goPackagePath = "mynewt.apache.org/newt"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix index 7c02d2d9a638..cd90e50d70eb 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "nix-bundle"; - name = "${pname}-${version}"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix b/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix index efedb8b67da9..f5dfacf319bc 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper , runtimeShell }: let self = stdenv.mkDerivation rec { - name = "nix-pin-${version}"; + pname = "nix-pin"; version = "0.4.0"; src = fetchFromGitHub { owner = "timbertson"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix index 96a283a8ea8a..f88820ffad9e 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix @@ -5,7 +5,6 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "nix-prefetch"; version = "0.1.0"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-top/default.nix b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix index cd3a8507be14..1d2cad2e39e4 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-top/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-top/default.nix @@ -15,7 +15,7 @@ let additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ]; in stdenv.mkDerivation rec { - name = "nix-top-${version}"; + pname = "nix-top"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index aa212d655f89..6e7aac706538 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -64,7 +64,12 @@ common = # https://github.com/NixOS/nixpkgs/issues/45462 if is20 then '' mkdir -p $out/lib - cp ${boost}/lib/libboost_context* $out/lib + cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib + rm -f $out/lib/*.a + ${lib.optionalString stdenv.isLinux '' + chmod u+w $out/lib/*.so.* + patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + ''} '' else '' configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") ''; @@ -124,7 +129,8 @@ common = inherit fromGit; perl-bindings = if includesPerl then nix else stdenv.mkDerivation { - name = "nix-perl-${version}"; + pname = "nix-perl"; + inherit version; inherit src; @@ -181,12 +187,12 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre6779_324a5dc9"; + suffix = "pre6895_84de821"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "324a5dc92f8e50e6b637c5e67dea48c80be10837"; - sha256 = "1g8gbam585q4kx8ilbx23ip64jw0r829i374qy0l8kvr8mhvj55r"; + rev = "84de8210040580ce7189332b43038d52c56a9689"; + sha256 = "062pdly0m2hk8ly8li5psvpbj1mi7m1a15k8wyzf79q7294l5li3"; }; fromGit = true; @@ -195,12 +201,12 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre20190712_aa82f8b"; + suffix = "pre20190830_04np4n6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108"; - hash = "sha256-MRY2CCjnTPSWIv0/aguZcg5U+DA+ODLKl9vjB/qXFpU="; + hash = "sha256-09ZHwpxf9pRDacCSGTHYx+fnKYgxKx8G37Jqb4wl1xI="; }; fromGit = true; diff --git a/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix b/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix index ce31de9f65d3..f63fe868e011 100644 --- a/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: buildGoPackage rec { - name = "nixops-dns-${version}"; + pname = "nixops-dns"; version = "1.0"; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/package-management/nixui/default.nix b/nixpkgs/pkgs/tools/package-management/nixui/default.nix index 804bbbdf8d71..b495577ef664 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/default.nix @@ -25,7 +25,7 @@ let }; in stdenv.mkDerivation rec { - name = "nixui-${version}"; + pname = "nixui"; inherit version src; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/nixpkgs/pkgs/tools/package-management/opkg/default.nix index e02c0a2c66ff..05f43cf29b1b 100644 --- a/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.4.1"; - name = "opkg-${version}"; + pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25"; diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix index 2e9f93177e45..a82f44008910 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix @@ -8,7 +8,7 @@ , enableSystemd ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { - name = "packagekit-${version}"; + pname = "packagekit"; version = "1.1.12"; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix index f0f05a4c858e..987c834f505d 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix @@ -2,7 +2,7 @@ , qttools, packagekit }: stdenv.mkDerivation rec { - name = "packagekit-qt-${version}"; + pname = "packagekit-qt"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/nixpkgs/pkgs/tools/package-management/pacman/default.nix index d756b679bf3d..81e8152769b7 100644 --- a/nixpkgs/pkgs/tools/package-management/pacman/default.nix +++ b/nixpkgs/pkgs/tools/package-management/pacman/default.nix @@ -2,7 +2,7 @@ zlib, bzip2, lzma }: stdenv.mkDerivation rec { - name = "pacman-${version}"; + pname = "pacman"; version = "5.1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/nixpkgs/pkgs/tools/package-management/rpm/default.nix index 55171e6d38f7..ae0259e65fcd 100644 --- a/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "rpm-${version}"; + pname = "rpm"; version = "4.14.2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/2fa/default.nix b/nixpkgs/pkgs/tools/security/2fa/default.nix index 68b9194015b1..c4ba7b67dc71 100644 --- a/nixpkgs/pkgs/tools/security/2fa/default.nix +++ b/nixpkgs/pkgs/tools/security/2fa/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "1.1.0"; - name = "2fa-${version}"; + pname = "2fa"; goPackagePath = "rsc.io/2fa"; diff --git a/nixpkgs/pkgs/tools/security/acsccid/default.nix b/nixpkgs/pkgs/tools/security/acsccid/default.nix index 246a2c5d9917..5a771917311f 100644 --- a/nixpkgs/pkgs/tools/security/acsccid/default.nix +++ b/nixpkgs/pkgs/tools/security/acsccid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.6"; - name = "acsccid-${version}"; + pname = "acsccid"; src = fetchFromGitHub { owner = "acshk"; diff --git a/nixpkgs/pkgs/tools/security/aespipe/default.nix b/nixpkgs/pkgs/tools/security/aespipe/default.nix index c67c758b933d..22fb8848eb91 100644 --- a/nixpkgs/pkgs/tools/security/aespipe/default.nix +++ b/nixpkgs/pkgs/tools/security/aespipe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "aespipe-${version}"; + pname = "aespipe"; version = "2.4e"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/afl/default.nix b/nixpkgs/pkgs/tools/security/afl/default.nix index 2ee0c478212c..05866792af68 100644 --- a/nixpkgs/pkgs/tools/security/afl/default.nix +++ b/nixpkgs/pkgs/tools/security/afl/default.nix @@ -8,11 +8,11 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "qemu-i386" else throw "afl: no support for ${stdenv.hostPlatform.system}!"; afl = stdenv.mkDerivation rec { - name = "afl-${version}"; + pname = "afl"; version = "2.52b"; src = fetchurl { - url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; + url = "http://lcamtuf.coredump.cx/afl/releases/${pname}-${version}.tgz"; sha256 = "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/security/afl/libdislocator.nix b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix index c5844702ef38..58b25e6d3ee5 100644 --- a/nixpkgs/pkgs/tools/security/afl/libdislocator.nix +++ b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = (builtins.parseDrvName afl.name).version; - name = "libdislocator-${version}"; + pname = "libdislocator"; src = afl.src; sourceRoot = "${afl.name}/libdislocator"; diff --git a/nixpkgs/pkgs/tools/security/aide/default.nix b/nixpkgs/pkgs/tools/security/aide/default.nix index 1513ae58a0b6..ea14d89c45c6 100644 --- a/nixpkgs/pkgs/tools/security/aide/default.nix +++ b/nixpkgs/pkgs/tools/security/aide/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }: stdenv.mkDerivation rec { - name = "aide-${version}"; + pname = "aide"; version = "0.16.2"; src = fetchurl { - url = "https://github.com/aide/aide/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"; }; diff --git a/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index ca2ea67e7881..19c9acc0a457 100644 --- a/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -5,7 +5,7 @@ assert testQR -> zbar != false; stdenv.mkDerivation rec { - name = "asc-key-to-qr-code-gif-${version}"; + pname = "asc-key-to-qr-code-gif"; version = "20180613"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/aws-okta/default.nix b/nixpkgs/pkgs/tools/security/aws-okta/default.nix index 36b6a5767a1e..9067e6a4dbf8 100644 --- a/nixpkgs/pkgs/tools/security/aws-okta/default.nix +++ b/nixpkgs/pkgs/tools/security/aws-okta/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv }: buildGoPackage rec { - name = "aws-okta-${version}"; + pname = "aws-okta"; version = "0.20.1"; goPackagePath = "github.com/segmentio/aws-okta"; diff --git a/nixpkgs/pkgs/tools/security/b2sum/default.nix b/nixpkgs/pkgs/tools/security/b2sum/default.nix index 16811d8f8897..2fa50f91111a 100644 --- a/nixpkgs/pkgs/tools/security/b2sum/default.nix +++ b/nixpkgs/pkgs/tools/security/b2sum/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "b2sum-${version}"; + pname = "b2sum"; version = "unstable-2018-06-11"; src = fetchzip { diff --git a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix index 59be6ed0ec26..c6d2cbd53c9d 100644 --- a/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix +++ b/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }: stdenv.mkDerivation rec { - name = "bash-supergenpass-unstable-${version}"; + pname = "bash-supergenpass-unstable"; version = "2018-04-18"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/bmrsa/11.nix b/nixpkgs/pkgs/tools/security/bmrsa/11.nix index 9faedf0c7ef9..47851fbfa053 100644 --- a/nixpkgs/pkgs/tools/security/bmrsa/11.nix +++ b/nixpkgs/pkgs/tools/security/bmrsa/11.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "bmrsa-${version}"; + pname = "bmrsa"; version = "11"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix b/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix index 69444d1612e8..0c650781bdaa 100644 --- a/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix +++ b/nixpkgs/pkgs/tools/security/bruteforce-luks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }: stdenv.mkDerivation rec { - name = "bruteforce-luks-${version}"; + pname = "bruteforce-luks"; version = "1.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/ccid/default.nix b/nixpkgs/pkgs/tools/security/ccid/default.nix index 654d2dd6a7ac..8d0b3a89a348 100644 --- a/nixpkgs/pkgs/tools/security/ccid/default.nix +++ b/nixpkgs/pkgs/tools/security/ccid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { + pname = "ccid"; version = "1.4.31"; - name = "ccid-${version}"; src = fetchurl { - url = "https://ccid.apdu.fr/files/${name}.tar.bz2"; + url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; }; diff --git a/nixpkgs/pkgs/tools/security/certmgr/default.nix b/nixpkgs/pkgs/tools/security/certmgr/default.nix index a025c69b7381..4f48522e613f 100644 --- a/nixpkgs/pkgs/tools/security/certmgr/default.nix +++ b/nixpkgs/pkgs/tools/security/certmgr/default.nix @@ -4,7 +4,7 @@ let generic = { patches ? [] }: buildGoPackage rec { version = "1.6.4"; - name = "certmgr-${version}"; + pname = "certmgr"; goPackagePath = "github.com/cloudflare/certmgr/"; diff --git a/nixpkgs/pkgs/tools/security/certstrap/default.nix b/nixpkgs/pkgs/tools/security/certstrap/default.nix index e0935f0f7606..fb3c00e48f91 100644 --- a/nixpkgs/pkgs/tools/security/certstrap/default.nix +++ b/nixpkgs/pkgs/tools/security/certstrap/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "certstrap-${version}"; + pname = "certstrap"; version = "1.1.1"; goPackagePath = "github.com/square/certstrap"; diff --git a/nixpkgs/pkgs/tools/security/cfssl/default.nix b/nixpkgs/pkgs/tools/security/cfssl/default.nix index 750539b3ace8..8d8497f6cb94 100644 --- a/nixpkgs/pkgs/tools/security/cfssl/default.nix +++ b/nixpkgs/pkgs/tools/security/cfssl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "cfssl-${version}"; + pname = "cfssl"; version = "1.3.2"; goPackagePath = "github.com/cloudflare/cfssl"; diff --git a/nixpkgs/pkgs/tools/security/chntpw/default.nix b/nixpkgs/pkgs/tools/security/chntpw/default.nix index 602c0d60a5f1..5a037090801a 100644 --- a/nixpkgs/pkgs/tools/security/chntpw/default.nix +++ b/nixpkgs/pkgs/tools/security/chntpw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "chntpw-${version}"; + pname = "chntpw"; version = "140201"; diff --git a/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix index 2dc9336bb329..5e304f86b4ef 100644 --- a/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix +++ b/nixpkgs/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: stdenv.mkDerivation rec { - name = "chrome-token-signing-${version}"; + pname = "chrome-token-signing"; version = "1.0.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/cipherscan/default.nix b/nixpkgs/pkgs/tools/security/cipherscan/default.nix index a4afa772d10e..eae5a5256dff 100644 --- a/nixpkgs/pkgs/tools/security/cipherscan/default.nix +++ b/nixpkgs/pkgs/tools/security/cipherscan/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }: stdenv.mkDerivation rec { - name = "cipherscan-${version}"; + pname = "cipherscan"; version = "2016-08-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/clamav/default.nix b/nixpkgs/pkgs/tools/security/clamav/default.nix index b96fc49886a4..54932e1200bf 100644 --- a/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "clamav-${version}"; + pname = "clamav"; version = "0.101.4"; src = fetchurl { - url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; + url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; sha256 = "1kdw0b49hbvja6xn589v4f0q334wav16pmi1hibql5cxj7q99w0b"; }; diff --git a/nixpkgs/pkgs/tools/security/cowpatty/default.nix b/nixpkgs/pkgs/tools/security/cowpatty/default.nix index c5ace5d2e8c4..0fb9ed58997f 100644 --- a/nixpkgs/pkgs/tools/security/cowpatty/default.nix +++ b/nixpkgs/pkgs/tools/security/cowpatty/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cowpatty-${version}"; + pname = "cowpatty"; version = "4.6"; buildInputs = [ openssl libpcap ]; src = fetchurl { - url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${name}.tgz"; + url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz"; sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd"; }; diff --git a/nixpkgs/pkgs/tools/security/crackxls/default.nix b/nixpkgs/pkgs/tools/security/crackxls/default.nix index 2a88e4462b6d..04b7b5695b55 100644 --- a/nixpkgs/pkgs/tools/security/crackxls/default.nix +++ b/nixpkgs/pkgs/tools/security/crackxls/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "crackxls-${version}"; + pname = "crackxls"; version = "0.4"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/security/crunch/default.nix b/nixpkgs/pkgs/tools/security/crunch/default.nix index 3e94d52fc5fc..57943a314064 100644 --- a/nixpkgs/pkgs/tools/security/crunch/default.nix +++ b/nixpkgs/pkgs/tools/security/crunch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which }: stdenv.mkDerivation rec { - name = "crunch-${version}"; + pname = "crunch"; version = "3.6"; src = fetchurl { - url = "mirror://sourceforge/crunch-wordlist/${name}.tgz"; + url = "mirror://sourceforge/crunch-wordlist/${pname}-${version}.tgz"; sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va"; }; diff --git a/nixpkgs/pkgs/tools/security/ctmg/default.nix b/nixpkgs/pkgs/tools/security/ctmg/default.nix index 1e0618412210..104a615542bd 100644 --- a/nixpkgs/pkgs/tools/security/ctmg/default.nix +++ b/nixpkgs/pkgs/tools/security/ctmg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "ctmg-${version}"; + pname = "ctmg"; version = "1.2"; src = fetchzip { diff --git a/nixpkgs/pkgs/tools/security/default.nix b/nixpkgs/pkgs/tools/security/default.nix index c5987d37889c..cee198c1b3be 100644 --- a/nixpkgs/pkgs/tools/security/default.nix +++ b/nixpkgs/pkgs/tools/security/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.0.1"; - name = "ecdsatool-${version}"; + pname = "ecdsatool"; src = pkgs.fetchFromGitHub { owner = "kaniini"; diff --git a/nixpkgs/pkgs/tools/security/doas/default.nix b/nixpkgs/pkgs/tools/security/doas/default.nix index 55335927b36a..ce8b5825647c 100644 --- a/nixpkgs/pkgs/tools/security/doas/default.nix +++ b/nixpkgs/pkgs/tools/security/doas/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, bison, pam }: stdenv.mkDerivation rec { - name = "doas-${version}"; + pname = "doas"; version = "6.0"; diff --git a/nixpkgs/pkgs/tools/security/duo-unix/default.nix b/nixpkgs/pkgs/tools/security/duo-unix/default.nix index 10e2138494e5..49ceacadcb7d 100644 --- a/nixpkgs/pkgs/tools/security/duo-unix/default.nix +++ b/nixpkgs/pkgs/tools/security/duo-unix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, openssl, zlib }: stdenv.mkDerivation rec { - name = "duo-unix-${version}"; + pname = "duo-unix"; version = "1.11.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/ecdsautils/default.nix b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix index 48a713287b8b..00dac6e94294 100644 --- a/nixpkgs/pkgs/tools/security/ecdsautils/default.nix +++ b/nixpkgs/pkgs/tools/security/ecdsautils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4.0"; - name = "ecdsautils-${version}"; + pname = "ecdsautils"; src = pkgs.fetchFromGitHub { owner = "freifunk-gluon"; diff --git a/nixpkgs/pkgs/tools/security/ecryptfs/default.nix b/nixpkgs/pkgs/tools/security/ecryptfs/default.nix index d0d01761c246..9fd8c3ac7a22 100644 --- a/nixpkgs/pkgs/tools/security/ecryptfs/default.nix +++ b/nixpkgs/pkgs/tools/security/ecryptfs/default.nix @@ -2,7 +2,7 @@ , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { - name = "ecryptfs-${version}"; + pname = "ecryptfs"; version = "111"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix index 40a728f6cb1a..4acef56a2c58 100644 --- a/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix +++ b/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix @@ -5,7 +5,6 @@ }: stdenv.mkDerivation rec { - name = pname + "-" + version; pname = "ecryptfs-helper"; version = "20160722"; diff --git a/nixpkgs/pkgs/tools/security/efitools/default.nix b/nixpkgs/pkgs/tools/security/efitools/default.nix index 1d983cb8599a..8a64a019fef0 100644 --- a/nixpkgs/pkgs/tools/security/efitools/default.nix +++ b/nixpkgs/pkgs/tools/security/efitools/default.nix @@ -1,7 +1,7 @@ { stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages, help2man, fetchgit }: stdenv.mkDerivation rec { - name = "efitools-${version}"; + pname = "efitools"; version = "1.9.2"; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/nixpkgs/pkgs/tools/security/eid-mw/default.nix index 155c63c87e13..13ab56aaa9a2 100644 --- a/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -7,7 +7,7 @@ , substituteAll }: stdenv.mkDerivation rec { - name = "eid-mw-${version}"; + pname = "eid-mw"; version = "4.4.16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/enchive/default.nix b/nixpkgs/pkgs/tools/security/enchive/default.nix index 8d4cc6ec3ca6..baada40a6cb1 100644 --- a/nixpkgs/pkgs/tools/security/enchive/default.nix +++ b/nixpkgs/pkgs/tools/security/enchive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "enchive-${version}"; + pname = "enchive"; version = "3.4"; src = fetchFromGitHub { owner = "skeeto"; diff --git a/nixpkgs/pkgs/tools/security/encryptr/default.nix b/nixpkgs/pkgs/tools/security/encryptr/default.nix index 6f79be83be55..01855ee3e5b4 100644 --- a/nixpkgs/pkgs/tools/security/encryptr/default.nix +++ b/nixpkgs/pkgs/tools/security/encryptr/default.nix @@ -14,7 +14,7 @@ let else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!"; in stdenv.mkDerivation rec { - name = "encryptr-${version}"; + pname = "encryptr"; version = "2.0.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/enpass/default.nix b/nixpkgs/pkgs/tools/security/enpass/default.nix index c33e433448f5..8ba80c464579 100644 --- a/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -42,7 +42,7 @@ let package = stdenv.mkDerivation rec { inherit (data) version; - name = "enpass-${version}"; + pname = "enpass"; src = fetchurl { inherit (data) sha256; diff --git a/nixpkgs/pkgs/tools/security/eschalot/default.nix b/nixpkgs/pkgs/tools/security/eschalot/default.nix index d628a28023a4..28df3a284427 100644 --- a/nixpkgs/pkgs/tools/security/eschalot/default.nix +++ b/nixpkgs/pkgs/tools/security/eschalot/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "eschalot"; version = "2018-01-19"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ReclaimYourPrivacy"; diff --git a/nixpkgs/pkgs/tools/security/fail2ban/default.nix b/nixpkgs/pkgs/tools/security/fail2ban/default.nix index 296080cbd8e7..324ac46b0841 100644 --- a/nixpkgs/pkgs/tools/security/fail2ban/default.nix +++ b/nixpkgs/pkgs/tools/security/fail2ban/default.nix @@ -3,7 +3,8 @@ let version = "0.10.4"; in pythonPackages.buildPythonApplication { - name = "fail2ban-${version}"; + pname = "fail2ban"; + inherit version; src = fetchFromGitHub { owner = "fail2ban"; diff --git a/nixpkgs/pkgs/tools/security/fcrackzip/default.nix b/nixpkgs/pkgs/tools/security/fcrackzip/default.nix index 5d2e515c3277..d923e81ae826 100644 --- a/nixpkgs/pkgs/tools/security/fcrackzip/default.nix +++ b/nixpkgs/pkgs/tools/security/fcrackzip/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "fcrackzip-${version}"; + pname = "fcrackzip"; version = "1.0"; src = fetchurl { - url = "http://oldhome.schmorp.de/marc/data/${name}.tar.gz"; + url = "http://oldhome.schmorp.de/marc/data/${pname}-${version}.tar.gz"; sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a"; }; diff --git a/nixpkgs/pkgs/tools/security/fpm2/default.nix b/nixpkgs/pkgs/tools/security/fpm2/default.nix index 66a50e268a53..b6669358f7f9 100644 --- a/nixpkgs/pkgs/tools/security/fpm2/default.nix +++ b/nixpkgs/pkgs/tools/security/fpm2/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fpm2-${version}"; + pname = "fpm2"; version = "0.79"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/fprot/default.nix b/nixpkgs/pkgs/tools/security/fprot/default.nix index 14a4c985d502..59d126c5e2c9 100644 --- a/nixpkgs/pkgs/tools/security/fprot/default.nix +++ b/nixpkgs/pkgs/tools/security/fprot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "f-prot-${version}"; + pname = "f-prot"; version = "6.2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/fwknop/default.nix b/nixpkgs/pkgs/tools/security/fwknop/default.nix index 812c032230c1..4579136add26 100644 --- a/nixpkgs/pkgs/tools/security/fwknop/default.nix +++ b/nixpkgs/pkgs/tools/security/fwknop/default.nix @@ -7,7 +7,6 @@ , buildClient ? true }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fwknop"; version = "2.6.10"; diff --git a/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix b/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix index ca7793281ef9..89900d27bd27 100644 --- a/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix +++ b/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix @@ -1,7 +1,7 @@ { coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: stdenv.mkDerivation rec { - name = "gen-oath-safe-${version}"; + pname = "gen-oath-safe"; version = "0.11.0"; src = fetchFromGitHub { owner = "mcepl"; diff --git a/nixpkgs/pkgs/tools/security/gencfsm/default.nix b/nixpkgs/pkgs/tools/security/gencfsm/default.nix index 27bdc51c7688..63d1bab89d7f 100644 --- a/nixpkgs/pkgs/tools/security/gencfsm/default.nix +++ b/nixpkgs/pkgs/tools/security/gencfsm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.8.19"; - name = "gnome-encfs-manager-${version}"; + pname = "gnome-encfs-manager"; src = fetchurl { url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz"; diff --git a/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix b/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix index 2139b7c84afc..940a5b9a0535 100644 --- a/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/nixpkgs/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, gnulib }: stdenv.mkDerivation rec { - name = "gnu-pw-mgr-${version}"; + pname = "gnu-pw-mgr"; version = "2.4.2"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz"; + url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz"; sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17"; }; diff --git a/nixpkgs/pkgs/tools/security/gnupg/20.nix b/nixpkgs/pkgs/tools/security/gnupg/20.nix index 6ae2bbc436ed..6336d319997f 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/20.nix +++ b/nixpkgs/pkgs/tools/security/gnupg/20.nix @@ -12,11 +12,11 @@ with stdenv.lib; assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-${version}"; + pname = "gnupg"; version = "2.0.30"; src = fetchurl { - url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3"; }; diff --git a/nixpkgs/pkgs/tools/security/gnupg/22.nix b/nixpkgs/pkgs/tools/security/gnupg/22.nix index 7a8fb5a32443..90bd55f55a23 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/nixpkgs/pkgs/tools/security/gnupg/22.nix @@ -14,12 +14,12 @@ with stdenv.lib; assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-${version}"; + pname = "gnupg"; version = "2.2.17"; src = fetchurl { - url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; sha256 = "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg"; }; diff --git a/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix index 152ff40e7a22..1ba650f5af75 100644 --- a/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix +++ b/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix @@ -1,7 +1,7 @@ { fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: stdenv.mkDerivation rec { - name = "gorilla-bin-${version}"; + pname = "gorilla-bin"; version = "1.5.3.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/gpgstats/default.nix b/nixpkgs/pkgs/tools/security/gpgstats/default.nix index c095b77129cc..34e8c7bd6796 100644 --- a/nixpkgs/pkgs/tools/security/gpgstats/default.nix +++ b/nixpkgs/pkgs/tools/security/gpgstats/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, gpgme }: stdenv.mkDerivation rec { - name = "gpgstats-${version}"; + pname = "gpgstats"; version = "0.5"; src = fetchurl { - url = "https://www.vanheusden.com/gpgstats/${name}.tgz"; + url = "https://www.vanheusden.com/gpgstats/${pname}-${version}.tgz"; sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy"; }; diff --git a/nixpkgs/pkgs/tools/security/haka/default.nix b/nixpkgs/pkgs/tools/security/haka/default.nix index 2b1708c9243c..c4b96f04dc27 100644 --- a/nixpkgs/pkgs/tools/security/haka/default.nix +++ b/nixpkgs/pkgs/tools/security/haka/default.nix @@ -3,7 +3,8 @@ let version = "0.3.0"; in stdenv.mkDerivation rec { - name = "haka-${version}"; + pname = "haka"; + inherit version; src = fetchurl { name = "haka_${version}_source.tar.gz"; diff --git a/nixpkgs/pkgs/tools/security/hash-slinger/default.nix b/nixpkgs/pkgs/tools/security/hash-slinger/default.nix index 385a201d88b0..577fe02cb2ec 100644 --- a/nixpkgs/pkgs/tools/security/hash-slinger/default.nix +++ b/nixpkgs/pkgs/tools/security/hash-slinger/default.nix @@ -4,7 +4,6 @@ let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "hash-slinger"; - name = "${pname}-${version}"; version = "2.7"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/hash_extender/default.nix b/nixpkgs/pkgs/tools/security/hash_extender/default.nix index 0c5691a1e106..9efa7e2afa29 100644 --- a/nixpkgs/pkgs/tools/security/hash_extender/default.nix +++ b/nixpkgs/pkgs/tools/security/hash_extender/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "hash_extender-${version}"; + pname = "hash_extender"; version = "2017-04-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/haveged/default.nix b/nixpkgs/pkgs/tools/security/haveged/default.nix index 81f627179a25..c47331f1bcb9 100644 --- a/nixpkgs/pkgs/tools/security/haveged/default.nix +++ b/nixpkgs/pkgs/tools/security/haveged/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "haveged-${version}"; + pname = "haveged"; version = "1.9.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/ifdnfc/default.nix b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix index 5731f3ef8bb6..8f30b5885e40 100644 --- a/nixpkgs/pkgs/tools/security/ifdnfc/default.nix +++ b/nixpkgs/pkgs/tools/security/ifdnfc/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "ifdnfc-${version}"; + pname = "ifdnfc"; version = "2016-03-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/john/default.nix b/nixpkgs/pkgs/tools/security/john/default.nix index d4db02cc9ed1..dd3a93be9950 100644 --- a/nixpkgs/pkgs/tools/security/john/default.nix +++ b/nixpkgs/pkgs/tools/security/john/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "john-${version}"; + pname = "john"; version = "1.9.0-jumbo-1"; src = fetchurl { - url = "http://www.openwall.com/john/k/${name}.tar.xz"; + url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz"; sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm"; }; diff --git a/nixpkgs/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix index 6fac3b66cbc6..1a2b06ea41f9 100644 --- a/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "keybase-${version}"; + pname = "keybase"; version = "4.3.1"; goPackagePath = "github.com/keybase/client"; diff --git a/nixpkgs/pkgs/tools/security/keybase/gui.nix b/nixpkgs/pkgs/tools/security/keybase/gui.nix index 02d8625aa762..3954ec818b14 100644 --- a/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "keybase-gui-${version}"; + pname = "keybase-gui"; version = "4.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/kpcli/default.nix b/nixpkgs/pkgs/tools/security/kpcli/default.nix index e7c09e0b2d5e..9d4c590efa1e 100644 --- a/nixpkgs/pkgs/tools/security/kpcli/default.nix +++ b/nixpkgs/pkgs/tools/security/kpcli/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.3"; - name = "kpcli-${version}"; + pname = "kpcli"; src = fetchurl { - url = "mirror://sourceforge/kpcli/${name}.pl"; + url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4"; }; diff --git a/nixpkgs/pkgs/tools/security/libacr38u/default.nix b/nixpkgs/pkgs/tools/security/libacr38u/default.nix index d858ed3fd6d3..4af6e3de3cf9 100644 --- a/nixpkgs/pkgs/tools/security/libacr38u/default.nix +++ b/nixpkgs/pkgs/tools/security/libacr38u/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.7.11"; - name = "libacr38u-${version}"; + pname = "libacr38u"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix index b3dc1270fb9c..17861ac2da60 100644 --- a/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix +++ b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix @@ -3,7 +3,7 @@ , curl, geoip, libxml2, lmdb, lua, pcre, yajl }: stdenv.mkDerivation rec { - name = "libmodsecurity-${version}"; + pname = "libmodsecurity"; version = "3.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/logkeys/default.nix b/nixpkgs/pkgs/tools/security/logkeys/default.nix index 8a73d056b1ed..a325c47ca0d9 100644 --- a/nixpkgs/pkgs/tools/security/logkeys/default.nix +++ b/nixpkgs/pkgs/tools/security/logkeys/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: stdenv.mkDerivation rec { - name = "logkeys-${version}"; + pname = "logkeys"; version = "2018-01-22"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/lynis/default.nix b/nixpkgs/pkgs/tools/security/lynis/default.nix index 7579636cfbf5..923c96719fe3 100644 --- a/nixpkgs/pkgs/tools/security/lynis/default.nix +++ b/nixpkgs/pkgs/tools/security/lynis/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "lynis"; version = "2.7.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; diff --git a/nixpkgs/pkgs/tools/security/masscan/default.nix b/nixpkgs/pkgs/tools/security/masscan/default.nix index e33681c45e0e..94f0a3adfb82 100644 --- a/nixpkgs/pkgs/tools/security/masscan/default.nix +++ b/nixpkgs/pkgs/tools/security/masscan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, libpcap }: stdenv.mkDerivation rec { - name = "masscan-${version}"; + pname = "masscan"; version = "1.0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix index 37796fef1747..50341e873fad 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -16,7 +16,7 @@ let gemdir = ./.; }; in stdenv.mkDerivation rec { - name = "metasploit-framework-${version}"; + pname = "metasploit-framework"; version = "4.16.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/mfcuk/default.nix b/nixpkgs/pkgs/tools/security/mfcuk/default.nix index 3d4bdd2edf17..9098457cec17 100644 --- a/nixpkgs/pkgs/tools/security/mfcuk/default.nix +++ b/nixpkgs/pkgs/tools/security/mfcuk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnfc }: stdenv.mkDerivation rec { - name = "mfcuk-${version}"; + pname = "mfcuk"; version = "0.3.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/minisign/default.nix b/nixpkgs/pkgs/tools/security/minisign/default.nix index f5bc7a60839e..15ee2446922b 100644 --- a/nixpkgs/pkgs/tools/security/minisign/default.nix +++ b/nixpkgs/pkgs/tools/security/minisign/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libsodium }: stdenv.mkDerivation rec { - name = "minisign-${version}"; + pname = "minisign"; version = "0.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/mkp224o/default.nix b/nixpkgs/pkgs/tools/security/mkp224o/default.nix index 0c927b7501b6..a4aae480ae16 100644 --- a/nixpkgs/pkgs/tools/security/mkp224o/default.nix +++ b/nixpkgs/pkgs/tools/security/mkp224o/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, libsodium }: stdenv.mkDerivation rec { - name = "mkp224o-${version}"; + pname = "mkp224o"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/modsecurity/default.nix b/nixpkgs/pkgs/tools/security/modsecurity/default.nix index 6ec90cd15a85..2a9e41ac0fa9 100644 --- a/nixpkgs/pkgs/tools/security/modsecurity/default.nix +++ b/nixpkgs/pkgs/tools/security/modsecurity/default.nix @@ -10,11 +10,11 @@ let luaValue = if luaSupport then lua5 else "no"; in stdenv.mkDerivation rec { - name = "modsecurity-${version}"; + pname = "modsecurity"; version = "2.9.3"; src = fetchurl { - url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz"; + url = "https://www.modsecurity.org/tarball/${version}/${pname}-${version}.tar.gz"; sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1"; }; diff --git a/nixpkgs/pkgs/tools/security/monkeysphere/default.nix b/nixpkgs/pkgs/tools/security/monkeysphere/default.nix index e1a134ec5d18..b4d5ddb267dc 100644 --- a/nixpkgs/pkgs/tools/security/monkeysphere/default.nix +++ b/nixpkgs/pkgs/tools/security/monkeysphere/default.nix @@ -13,7 +13,7 @@ let patches = oldAttrs.patches ++ [ ./openssh-nixos-sandbox.patch ]; }); in stdenv.mkDerivation rec { - name = "monkeysphere-${version}"; + pname = "monkeysphere"; version = "0.44"; # The patched OpenSSH binary MUST NOT be used (except in the check phase): diff --git a/nixpkgs/pkgs/tools/security/nasty/default.nix b/nixpkgs/pkgs/tools/security/nasty/default.nix index 84b738a21092..d45861cf50e1 100644 --- a/nixpkgs/pkgs/tools/security/nasty/default.nix +++ b/nixpkgs/pkgs/tools/security/nasty/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gpgme }: stdenv.mkDerivation rec { - name = "nasty-${version}"; + pname = "nasty"; version = "0.6"; src = fetchurl { - url = "https://www.vanheusden.com/nasty/${name}.tgz"; + url = "https://www.vanheusden.com/nasty/${pname}-${version}.tgz"; sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn"; }; diff --git a/nixpkgs/pkgs/tools/security/neopg/default.nix b/nixpkgs/pkgs/tools/security/neopg/default.nix index 88494e8dbdf7..5e26bcf6759d 100644 --- a/nixpkgs/pkgs/tools/security/neopg/default.nix +++ b/nixpkgs/pkgs/tools/security/neopg/default.nix @@ -11,7 +11,7 @@ , gnutls }: stdenv.mkDerivation rec { - name = "neopg-${version}"; + pname = "neopg"; version = "0.0.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix index 1b18f0e1e11a..33a873f73dae 100644 --- a/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix +++ b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix @@ -2,7 +2,7 @@ , qtbase, qttranslations, qtsvg, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "nitrokey-app-${version}"; + pname = "nitrokey-app"; version = "1.3.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/nmap/qt.nix b/nixpkgs/pkgs/tools/security/nmap/qt.nix index c0b7a72d18e0..f873c475bbfe 100644 --- a/nixpkgs/pkgs/tools/security/nmap/qt.nix +++ b/nixpkgs/pkgs/tools/security/nmap/qt.nix @@ -3,7 +3,7 @@ , qtbase, qtscript, qtwebengine }: stdenv.mkDerivation rec { - name = "nmapsi4-${version}"; + pname = "nmapsi4"; version = "0.4.80-20180430"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/notary/default.nix b/nixpkgs/pkgs/tools/security/notary/default.nix index 221817b004df..17473b639881 100644 --- a/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/nixpkgs/pkgs/tools/security/notary/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, libtool }: buildGoPackage rec { - name = "notary-${version}"; + pname = "notary"; version = "0.6.1"; gitcommit = "d6e1431f"; diff --git a/nixpkgs/pkgs/tools/security/nsjail/default.nix b/nixpkgs/pkgs/tools/security/nsjail/default.nix index f88156285ca7..3f04d2764891 100644 --- a/nixpkgs/pkgs/tools/security/nsjail/default.nix +++ b/nixpkgs/pkgs/tools/security/nsjail/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "nsjail-${version}"; + pname = "nsjail"; version = "2.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/nwipe/default.nix b/nixpkgs/pkgs/tools/security/nwipe/default.nix index a27ed7bad1a5..caaa5eba86a9 100644 --- a/nixpkgs/pkgs/tools/security/nwipe/default.nix +++ b/nixpkgs/pkgs/tools/security/nwipe/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.25"; - name = "nwipe-${version}"; + pname = "nwipe"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; diff --git a/nixpkgs/pkgs/tools/security/omapd/default.nix b/nixpkgs/pkgs/tools/security/omapd/default.nix index 91df7f3fbb0a..baea02402d9f 100644 --- a/nixpkgs/pkgs/tools/security/omapd/default.nix +++ b/nixpkgs/pkgs/tools/security/omapd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, gdb, zlib }: stdenv.mkDerivation rec { - name = "omapd-${version}"; + pname = "omapd"; version = "0.9.2"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz"; sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; }; diff --git a/nixpkgs/pkgs/tools/security/onioncircuits/default.nix b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix index 898bfb599a31..5a9f10127481 100644 --- a/nixpkgs/pkgs/tools/security/onioncircuits/default.nix +++ b/nixpkgs/pkgs/tools/security/onioncircuits/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }: pythonPackages.buildPythonApplication rec { - name = "onioncircuits-${version}"; + pname = "onioncircuits"; version = "0.5"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/security/opencryptoki/default.nix b/nixpkgs/pkgs/tools/security/opencryptoki/default.nix index eff2211a71c5..1d506928a52a 100644 --- a/nixpkgs/pkgs/tools/security/opencryptoki/default.nix +++ b/nixpkgs/pkgs/tools/security/opencryptoki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: stdenv.mkDerivation rec { - name = "opencryptoki-${version}"; + pname = "opencryptoki"; version = "3.8.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/opensc/default.nix b/nixpkgs/pkgs/tools/security/opensc/default.nix index 769b87fa8d31..e5611f8b2671 100644 --- a/nixpkgs/pkgs/tools/security/opensc/default.nix +++ b/nixpkgs/pkgs/tools/security/opensc/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "opensc-${version}"; + pname = "opensc"; version = "0.19.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/p0f/default.nix b/nixpkgs/pkgs/tools/security/p0f/default.nix index 11e1f14baf9a..1e618cdce1ad 100644 --- a/nixpkgs/pkgs/tools/security/p0f/default.nix +++ b/nixpkgs/pkgs/tools/security/p0f/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, bash }: stdenv.mkDerivation rec { - name = "p0f-${version}"; + pname = "p0f"; version = "3.09b"; src = fetchurl { - url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz"; + url = "http://lcamtuf.coredump.cx/p0f3/releases/${pname}-${version}.tgz"; sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl"; }; diff --git a/nixpkgs/pkgs/tools/security/paperkey/default.nix b/nixpkgs/pkgs/tools/security/paperkey/default.nix index d7d1f1c40d47..dc3582b7369f 100644 --- a/nixpkgs/pkgs/tools/security/paperkey/default.nix +++ b/nixpkgs/pkgs/tools/security/paperkey/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "paperkey-${version}"; + pname = "paperkey"; version = "1.6"; src = fetchurl { - url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; + url = "https://www.jabberwocky.com/software/paperkey/${pname}-${version}.tar.gz"; sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2"; }; diff --git a/nixpkgs/pkgs/tools/security/pass/default.nix b/nixpkgs/pkgs/tools/security/pass/default.nix index 94f517d2e92d..aeb838c05765 100644 --- a/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/nixpkgs/pkgs/tools/security/pass/default.nix @@ -30,10 +30,10 @@ let generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { version = "1.7.3"; - name = "password-store-${version}"; + pname = "password-store"; src = fetchurl { - url = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz"; sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; }; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix b/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix index 79dd1fadb01c..ca5ca855337f 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/audit.nix @@ -4,7 +4,7 @@ let pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]); in stdenv.mkDerivation rec { - name = "pass-audit-${version}"; + pname = "pass-audit"; version = "0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix b/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix index ba3f821e88c6..c34fae083cdc 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/genphrase.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pass-genphrase-${version}"; + pname = "pass-genphrase"; version = "0.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/import.nix b/nixpkgs/pkgs/tools/security/pass/extensions/import.nix index 0ee775bfbe8b..9d9d36fd0d90 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/import.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/import.nix @@ -4,7 +4,7 @@ let pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]); in stdenv.mkDerivation rec { - name = "pass-import-${version}"; + pname = "pass-import"; version = "2.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix b/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix index c951a5e37ef6..4b15c3d68035 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/otp.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, oathToolkit }: stdenv.mkDerivation rec { - name = "pass-otp-${version}"; + pname = "pass-otp"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix index b9f458cd4e12..ccb558c9b853 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, tomb }: stdenv.mkDerivation rec { - name = "pass-tomb-${version}"; + pname = "pass-tomb"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/update.nix b/nixpkgs/pkgs/tools/security/pass/extensions/update.nix index dd145b069720..b712557ab3eb 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/update.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/update.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "pass-update-${version}"; + pname = "pass-update"; version = "2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix index 6140159dcb50..b188b411517b 100644 --- a/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix +++ b/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "rofi-pass-${version}"; + pname = "rofi-pass"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix b/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix index 23a744f8e23d..8aadb685aa8b 100644 --- a/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb, pcsclite }: stdenv.mkDerivation rec { - name = "pcsc-cyberjack-${version}"; + pname = "pcsc-cyberjack"; version = "3.99.5_SP12"; src = with stdenv.lib; let diff --git a/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix index 88ca8a3d1b1a..0302fc6fc674 100644 --- a/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -6,7 +6,7 @@ let else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { - name = "pcsc-scm-scl-${version}"; + pname = "pcsc-scm-scl"; version = "2.09"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/pcsclite/default.nix b/nixpkgs/pkgs/tools/security/pcsclite/default.nix index 5c40ccdef584..eed462ef0d04 100644 --- a/nixpkgs/pkgs/tools/security/pcsclite/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsclite/default.nix @@ -2,7 +2,7 @@ , IOKit ? null }: stdenv.mkDerivation rec { - name = "pcsclite-${version}"; + pname = "pcsclite"; version = "1.8.25"; outputs = [ "bin" "out" "dev" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/security/pdfcrack/default.nix b/nixpkgs/pkgs/tools/security/pdfcrack/default.nix index 55d2505ed1cb..c235c98b9719 100644 --- a/nixpkgs/pkgs/tools/security/pdfcrack/default.nix +++ b/nixpkgs/pkgs/tools/security/pdfcrack/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "pdfcrack-${version}"; + pname = "pdfcrack"; version = "0.17"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/pgpdump/default.nix b/nixpkgs/pkgs/tools/security/pgpdump/default.nix index 9c8f47cd2756..8bf440d2b07f 100644 --- a/nixpkgs/pkgs/tools/security/pgpdump/default.nix +++ b/nixpkgs/pkgs/tools/security/pgpdump/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pgpdump-${version}"; + pname = "pgpdump"; version = "0.33"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/prey/default.nix b/nixpkgs/pkgs/tools/security/prey/default.nix index b24af50ee7c2..2c03183fa96e 100644 --- a/nixpkgs/pkgs/tools/security/prey/default.nix +++ b/nixpkgs/pkgs/tools/security/prey/default.nix @@ -13,7 +13,7 @@ let sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; }; in stdenv.mkDerivation rec { - name = "prey-bash-client-${version}"; + pname = "prey-bash-client"; version = "0.6.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/qdigidoc/default.nix b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix index 17bbf982255b..7fc6ed209663 100644 --- a/nixpkgs/pkgs/tools/security/qdigidoc/default.nix +++ b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix @@ -2,7 +2,7 @@ , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: stdenv.mkDerivation rec { - name = "qdigidoc-${version}"; + pname = "qdigidoc"; version = "4.1.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/security/qesteidutil/default.nix b/nixpkgs/pkgs/tools/security/qesteidutil/default.nix index f8b110ce2213..5ce5672eb254 100644 --- a/nixpkgs/pkgs/tools/security/qesteidutil/default.nix +++ b/nixpkgs/pkgs/tools/security/qesteidutil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2018-08-21"; - name = "qesteidutil-${version}"; + pname = "qesteidutil"; src = fetchFromGitHub { owner = "open-eid"; diff --git a/nixpkgs/pkgs/tools/security/rarcrack/default.nix b/nixpkgs/pkgs/tools/security/rarcrack/default.nix index 3491feccc45c..0227268cf436 100644 --- a/nixpkgs/pkgs/tools/security/rarcrack/default.nix +++ b/nixpkgs/pkgs/tools/security/rarcrack/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}: stdenv.mkDerivation rec { - name = "rarcrack-${version}"; + pname = "rarcrack"; version = "0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/rhash/default.nix b/nixpkgs/pkgs/tools/security/rhash/default.nix index 5e622cf68f35..ad606af95621 100644 --- a/nixpkgs/pkgs/tools/security/rhash/default.nix +++ b/nixpkgs/pkgs/tools/security/rhash/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.8"; - name = "rhash-${version}"; + pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; diff --git a/nixpkgs/pkgs/tools/security/sbsigntool/default.nix b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix index 1091b366781d..aaac975bb813 100644 --- a/nixpkgs/pkgs/tools/security/sbsigntool/default.nix +++ b/nixpkgs/pkgs/tools/security/sbsigntool/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "sbsigntool-${version}"; + pname = "sbsigntool"; version = "0.9.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/security/scallion/default.nix b/nixpkgs/pkgs/tools/security/scallion/default.nix index 75ea92a786c5..e419232641b6 100644 --- a/nixpkgs/pkgs/tools/security/scallion/default.nix +++ b/nixpkgs/pkgs/tools/security/scallion/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.1"; - name = "scallion-${version}"; + pname = "scallion"; src = fetchFromGitHub { owner = "lachesis"; diff --git a/nixpkgs/pkgs/tools/security/scrypt/default.nix b/nixpkgs/pkgs/tools/security/scrypt/default.nix index 352a81b2727a..2ca4c1df18c4 100644 --- a/nixpkgs/pkgs/tools/security/scrypt/default.nix +++ b/nixpkgs/pkgs/tools/security/scrypt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "scrypt-${version}"; + pname = "scrypt"; version = "1.2.1"; src = fetchurl { - url = "https://www.tarsnap.com/scrypt/${name}.tgz"; + url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz"; sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6"; }; diff --git a/nixpkgs/pkgs/tools/security/seccure/default.nix b/nixpkgs/pkgs/tools/security/seccure/default.nix index a2ec48d4d270..686ef36f863c 100644 --- a/nixpkgs/pkgs/tools/security/seccure/default.nix +++ b/nixpkgs/pkgs/tools/security/seccure/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { - name = "seccure-${version}"; + pname = "seccure"; version = "0.5"; src = fetchurl { - url = "http://point-at-infinity.org/seccure/${name}.tar.gz"; + url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz"; sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5"; }; diff --git a/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/nixpkgs/pkgs/tools/security/secp256k1/default.nix index fd03e6bebabc..c9ba2a8ac6dd 100644 --- a/nixpkgs/pkgs/tools/security/secp256k1/default.nix +++ b/nixpkgs/pkgs/tools/security/secp256k1/default.nix @@ -16,7 +16,7 @@ let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { - name = "secp256k1-${version}"; + pname = "secp256k1"; # I can't find any version numbers, so we're just using the date of the # last commit. diff --git a/nixpkgs/pkgs/tools/security/sedutil/default.nix b/nixpkgs/pkgs/tools/security/sedutil/default.nix index 343992a6322f..9edd9745326e 100644 --- a/nixpkgs/pkgs/tools/security/sedutil/default.nix +++ b/nixpkgs/pkgs/tools/security/sedutil/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "sedutil-${version}"; + pname = "sedutil"; version = "1.15.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix b/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix index 38da14484147..8c6a026a6124 100644 --- a/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix +++ b/nixpkgs/pkgs/tools/security/sha1collisiondetection/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtool, which }: stdenv.mkDerivation rec { - name = "sha1collisiondetection-${version}"; + pname = "sha1collisiondetection"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/shc/default.nix b/nixpkgs/pkgs/tools/security/shc/default.nix index 3d3bd4eef849..cd93c55001eb 100644 --- a/nixpkgs/pkgs/tools/security/shc/default.nix +++ b/nixpkgs/pkgs/tools/security/shc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "shc-${version}"; + pname = "shc"; version = "4.0.3"; rev = "${version}"; diff --git a/nixpkgs/pkgs/tools/security/signify/default.nix b/nixpkgs/pkgs/tools/security/signify/default.nix index a642a12b0bd0..22604a3f70ba 100644 --- a/nixpkgs/pkgs/tools/security/signify/default.nix +++ b/nixpkgs/pkgs/tools/security/signify/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libbsd, pkgconfig }: stdenv.mkDerivation rec { - name = "signify-${version}"; + pname = "signify"; version = "25"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/signing-party/default.nix b/nixpkgs/pkgs/tools/security/signing-party/default.nix index 8148692327ef..ea487fed2a1d 100644 --- a/nixpkgs/pkgs/tools/security/signing-party/default.nix +++ b/nixpkgs/pkgs/tools/security/signing-party/default.nix @@ -14,7 +14,6 @@ let in stdenv.mkDerivation rec { pname = "signing-party"; version = "2.10"; - name = "${pname}-${version}"; src = fetchFromGitLab { domain = "salsa.debian.org"; diff --git a/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix b/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix index 96565ec84b52..16056f9a59e0 100644 --- a/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }: stdenv.mkDerivation rec { - name = "simple-tpm-pk11-${version}"; + pname = "simple-tpm-pk11"; version = "0.06"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/softhsm/default.nix b/nixpkgs/pkgs/tools/security/softhsm/default.nix index ec5eea52a6f8..94642700c336 100644 --- a/nixpkgs/pkgs/tools/security/softhsm/default.nix +++ b/nixpkgs/pkgs/tools/security/softhsm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "softhsm-${version}"; + pname = "softhsm"; version = "2.5.0"; src = fetchurl { - url = "https://dist.opendnssec.org/source/${name}.tar.gz"; + url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz"; sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj"; }; diff --git a/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix b/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix index a1844668af65..3ece05926ccc 100644 --- a/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }: stdenv.mkDerivation rec { - name = "spectre-meltdown-checker-${version}"; + pname = "spectre-meltdown-checker"; version = "0.42"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/ssdeep/default.nix b/nixpkgs/pkgs/tools/security/ssdeep/default.nix index 1ff9c73d8b58..33ab4c373bca 100644 --- a/nixpkgs/pkgs/tools/security/ssdeep/default.nix +++ b/nixpkgs/pkgs/tools/security/ssdeep/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "ssdeep-${version}"; + pname = "ssdeep"; version = "2.14.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/sshguard/default.nix b/nixpkgs/pkgs/tools/security/sshguard/default.nix index 18f010ee1ecb..a196fe9ca47a 100644 --- a/nixpkgs/pkgs/tools/security/sshguard/default.nix +++ b/nixpkgs/pkgs/tools/security/sshguard/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.4.0"; - name = "sshguard-${version}"; + pname = "sshguard"; src = fetchurl { - url = "mirror://sourceforge/sshguard/${name}.tar.gz"; + url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06"; }; diff --git a/nixpkgs/pkgs/tools/security/sslscan/default.nix b/nixpkgs/pkgs/tools/security/sslscan/default.nix index d3a8f35d9148..15ac376d72a7 100644 --- a/nixpkgs/pkgs/tools/security/sslscan/default.nix +++ b/nixpkgs/pkgs/tools/security/sslscan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "sslscan-${version}"; + pname = "sslscan"; version = "1.11.13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/steghide/default.nix b/nixpkgs/pkgs/tools/security/steghide/default.nix index c8be366066be..7a759c3c3336 100644 --- a/nixpkgs/pkgs/tools/security/steghide/default.nix +++ b/nixpkgs/pkgs/tools/security/steghide/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; version = "0.5.1"; - name = "steghide-${version}"; + pname = "steghide"; src = fetchurl { url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; diff --git a/nixpkgs/pkgs/tools/security/stoken/default.nix b/nixpkgs/pkgs/tools/security/stoken/default.nix index d28260ffb8b9..38fc884de487 100644 --- a/nixpkgs/pkgs/tools/security/stoken/default.nix +++ b/nixpkgs/pkgs/tools/security/stoken/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { pname = "stoken"; version = "0.92"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "cernekee"; repo = pname; diff --git a/nixpkgs/pkgs/tools/security/stricat/default.nix b/nixpkgs/pkgs/tools/security/stricat/default.nix index ecc34ede556b..28c462cbb0a2 100644 --- a/nixpkgs/pkgs/tools/security/stricat/default.nix +++ b/nixpkgs/pkgs/tools/security/stricat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "stricat-${version}"; + pname = "stricat"; version = "20140609100300"; src = fetchurl { - url = "http://www.stribob.com/dist/${name}.tgz"; + url = "http://www.stribob.com/dist/${pname}-${version}.tgz"; sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; }; diff --git a/nixpkgs/pkgs/tools/security/su-exec/default.nix b/nixpkgs/pkgs/tools/security/su-exec/default.nix index 56e40d514bb1..8ff33ee1ec91 100644 --- a/nixpkgs/pkgs/tools/security/su-exec/default.nix +++ b/nixpkgs/pkgs/tools/security/su-exec/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "su-exec-${version}"; + pname = "su-exec"; version = "0.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix index 15f767415890..97db4a28c458 100644 --- a/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix +++ b/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }: buildGoPackage rec { - name = "sudolikeaboss-unstable-${version}"; + pname = "sudolikeaboss-unstable"; version = "20161127-${stdenv.lib.strings.substring 0 7 rev}"; rev = "2d9afe19f872c9f433d476e57ee86169781b164c"; diff --git a/nixpkgs/pkgs/tools/security/tboot/default.nix b/nixpkgs/pkgs/tools/security/tboot/default.nix index f159dd27c42a..f5184b985622 100644 --- a/nixpkgs/pkgs/tools/security/tboot/default.nix +++ b/nixpkgs/pkgs/tools/security/tboot/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, trousers, openssl, zlib }: stdenv.mkDerivation rec { - name = "tboot-${version}"; + pname = "tboot"; version = "1.9.8"; src = fetchurl { - url = "mirror://sourceforge/tboot/${name}.tar.gz"; + url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00"; }; diff --git a/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix b/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix index 4d0feef72c9f..86a65a060280 100644 --- a/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix +++ b/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "tcpcrypt-${version}"; + pname = "tcpcrypt"; version = "0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/thc-hydra/default.nix b/nixpkgs/pkgs/tools/security/thc-hydra/default.nix index 9a7a245b8134..252d73b479b6 100644 --- a/nixpkgs/pkgs/tools/security/thc-hydra/default.nix +++ b/nixpkgs/pkgs/tools/security/thc-hydra/default.nix @@ -5,7 +5,7 @@ let makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs); in stdenv.mkDerivation rec { - name = "thc-hydra-${version}"; + pname = "thc-hydra"; version = "8.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/tor/tor-arm.nix b/nixpkgs/pkgs/tools/security/tor/tor-arm.nix index 170d5c4ff7a4..896ab50562d8 100644 --- a/nixpkgs/pkgs/tools/security/tor/tor-arm.nix +++ b/nixpkgs/pkgs/tools/security/tor/tor-arm.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "tor-arm-${version}"; + pname = "tor-arm"; version = "1.4.5.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/security/tor/torsocks.nix b/nixpkgs/pkgs/tools/security/tor/torsocks.nix index 686d03b7c3fa..8681d80c2ed3 100644 --- a/nixpkgs/pkgs/tools/security/tor/torsocks.nix +++ b/nixpkgs/pkgs/tools/security/tor/torsocks.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, libcap }: stdenv.mkDerivation rec { - name = "torsocks-${version}"; + pname = "torsocks"; version = "2.3.0"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix index e7a82f6089e7..ca78c5d73ffb 100644 --- a/nixpkgs/pkgs/tools/security/tpm-luks/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-luks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: stdenv.mkDerivation rec { - name = "tpm-luks-${version}"; + pname = "tpm-luks"; version = "git-2015-07-11"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix index 1541575aed74..5d54758cc7c2 100644 --- a/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-quote-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, trousers, openssl }: stdenv.mkDerivation rec { - name = "tpm-quote-tools-${version}"; + pname = "tpm-quote-tools"; version = "1.0.4"; src = fetchurl { - url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz"; sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h"; }; diff --git a/nixpkgs/pkgs/tools/security/tpm-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm-tools/default.nix index 5a2dc6652ddc..e546cc5a10fb 100644 --- a/nixpkgs/pkgs/tools/security/tpm-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm-tools/default.nix @@ -4,10 +4,11 @@ let version = "1.3.9.1"; in stdenv.mkDerivation rec { - name = "tpm-tools-${version}"; + pname = "tpm-tools"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/trousers/tpm-tools/${version}/${pname}-${version}.tar.gz"; sha256 = "0s7srgghykxnlb1g4izabzf2gfb1knxc0nzn6bly49h8cpi19dww"; }; diff --git a/nixpkgs/pkgs/tools/security/trousers/default.nix b/nixpkgs/pkgs/tools/security/trousers/default.nix index 8309390d013b..6f7fed20c89d 100644 --- a/nixpkgs/pkgs/tools/security/trousers/default.nix +++ b/nixpkgs/pkgs/tools/security/trousers/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "trousers-${version}"; + pname = "trousers"; version = "0.3.13"; src = fetchurl { - url = "mirror://sourceforge/trousers/trousers/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz"; sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v"; }; diff --git a/nixpkgs/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix index dcded0652763..c0fa221c9691 100644 --- a/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/nixpkgs/pkgs/tools/security/vault/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { - name = "vault-${version}"; + pname = "vault"; version = "1.2.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index b58e41d850d8..d33cdeb1c56f 100644 --- a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -29,7 +29,8 @@ let }; in stdenv.mkDerivation { - name = "vault-bin-${version}"; + pname = "vault-bin"; + inherit version; src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/tools/security/verifpal/default.nix b/nixpkgs/pkgs/tools/security/verifpal/default.nix new file mode 100644 index 000000000000..3b72cf3bd53e --- /dev/null +++ b/nixpkgs/pkgs/tools/security/verifpal/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, buildGoPackage, pigeon }: +buildGoPackage rec { + pname = "verifpal"; + version = "0.2"; + + goPackagePath = "github.com/SymbolicSoft/verifpal"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "SymbolicSoft"; + repo = pname; + rev = version; + sha256 = "08a0xvgg94k6vq91ylvgi97kpkjbw0rw172v2dzwl2rfpzkigk1r"; + }; + + postPatch = '' + sed -e 's|/bin/echo |echo |g' -i Makefile + ''; + + buildInputs = [ pigeon ]; + + buildPhase = '' + make -C go/src/$goPackagePath parser linux + ''; + + installPhase = '' + mkdir -p $bin/bin + cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/ + ''; + + meta = { + homepage = "https://verifpal.com/"; + description = "Cryptographic protocol analysis for students and engineers"; + maintainers = with lib.maintainers; [ zimbatm ]; + license = with lib.licenses; [ gpl3 ]; + platforms = ["x86_64-linux"]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/verifpal/deps.nix b/nixpkgs/pkgs/tools/security/verifpal/deps.nix new file mode 100644 index 000000000000..aaa4269416a6 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/verifpal/deps.nix @@ -0,0 +1,12 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/logrusorgru/aurora"; + fetch = { + type = "git"; + url = "https://github.com/logrusorgru/aurora"; + rev = "94edacc10f9b"; + sha256 = "0bhwy3rrd8mwb8xjwf44nj6vmxaj5hdvayvszr1rskkmz08l5v01"; + }; + } +] diff --git a/nixpkgs/pkgs/tools/security/volatility/default.nix b/nixpkgs/pkgs/tools/security/volatility/default.nix index e3b7fb643a26..bc8f1ce52c1d 100644 --- a/nixpkgs/pkgs/tools/security/volatility/default.nix +++ b/nixpkgs/pkgs/tools/security/volatility/default.nix @@ -2,10 +2,10 @@ pythonPackages.buildPythonApplication rec { version = "2.6"; - name = "volatility-${version}"; + pname = "volatility"; src = fetchurl { - url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip"; + url = "https://downloads.volatilityfoundation.org/releases/${version}/${pname}-${version}.zip"; sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv"; }; diff --git a/nixpkgs/pkgs/tools/security/wipe/default.nix b/nixpkgs/pkgs/tools/security/wipe/default.nix index a7c337dc1222..25c7921d34c8 100644 --- a/nixpkgs/pkgs/tools/security/wipe/default.nix +++ b/nixpkgs/pkgs/tools/security/wipe/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wipe-${version}"; + pname = "wipe"; version = "2.3.1"; src = fetchurl { - url = "mirror://sourceforge/wipe/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/wipe/${version}/${pname}-${version}.tar.bz2"; sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6"; }; diff --git a/nixpkgs/pkgs/tools/security/yara/default.nix b/nixpkgs/pkgs/tools/security/yara/default.nix index 7fcb9fc10bd1..ccebb2dbab42 100644 --- a/nixpkgs/pkgs/tools/security/yara/default.nix +++ b/nixpkgs/pkgs/tools/security/yara/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.10.0"; - name = "yara-${version}"; + pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; diff --git a/nixpkgs/pkgs/tools/system/amtterm/default.nix b/nixpkgs/pkgs/tools/system/amtterm/default.nix index a31fdd08c60d..7e92fc06b2d7 100644 --- a/nixpkgs/pkgs/tools/system/amtterm/default.nix +++ b/nixpkgs/pkgs/tools/system/amtterm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "amtterm-${version}"; + pname = "amtterm"; version = "1.6-1"; buildInputs = with perlPackages; [ perl SOAPLite ]; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { - url = "https://www.kraxel.org/cgit/amtterm/snapshot/${name}.tar.gz"; + url = "https://www.kraxel.org/cgit/amtterm/snapshot/${pname}-${version}.tar.gz"; sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc"; }; diff --git a/nixpkgs/pkgs/tools/system/at/default.nix b/nixpkgs/pkgs/tools/system/at/default.nix index 142d33d359dc..fded1da861d4 100644 --- a/nixpkgs/pkgs/tools/system/at/default.nix +++ b/nixpkgs/pkgs/tools/system/at/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "at-${version}"; + pname = "at"; version = "3.1.23"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/augeas/default.nix b/nixpkgs/pkgs/tools/system/augeas/default.nix index a8fca06c3618..a99df36beb6d 100644 --- a/nixpkgs/pkgs/tools/system/augeas/default.nix +++ b/nixpkgs/pkgs/tools/system/augeas/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, readline, libxml2 }: stdenv.mkDerivation rec { - name = "augeas-${version}"; + pname = "augeas"; version = "1.12.0"; src = fetchurl { - url = "http://download.augeas.net/${name}.tar.gz"; + url = "http://download.augeas.net/${pname}-${version}.tar.gz"; sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/system/bfs/default.nix b/nixpkgs/pkgs/tools/system/bfs/default.nix index 9c6f21009ee3..8443314cf71b 100644 --- a/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libcap, acl }: stdenv.mkDerivation rec { - name = "bfs-${version}"; + pname = "bfs"; version = "1.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/bootchart/default.nix b/nixpkgs/pkgs/tools/system/bootchart/default.nix index 9842bd85783a..d3f692b70e7e 100644 --- a/nixpkgs/pkgs/tools/system/bootchart/default.nix +++ b/nixpkgs/pkgs/tools/system/bootchart/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.14.8"; - name = "bootchart-${version}"; + pname = "bootchart"; src = fetchFromGitHub { owner = "mmeeks"; diff --git a/nixpkgs/pkgs/tools/system/chase/default.nix b/nixpkgs/pkgs/tools/system/chase/default.nix index 6dcaeed325ae..6c48d3341ecc 100644 --- a/nixpkgs/pkgs/tools/system/chase/default.nix +++ b/nixpkgs/pkgs/tools/system/chase/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }: stdenv.mkDerivation rec { - name = "chase-${version}"; + pname = "chase"; version = "0.5.2"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/system/collectd/data.nix b/nixpkgs/pkgs/tools/system/collectd/data.nix index cb8c4cc7d029..0874aa7410c0 100644 --- a/nixpkgs/pkgs/tools/system/collectd/data.nix +++ b/nixpkgs/pkgs/tools/system/collectd/data.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (collectd) meta version; - name = "collectd-data-${version}"; + pname = "collectd-data"; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/tools/system/collectd/default.nix b/nixpkgs/pkgs/tools/system/collectd/default.nix index d71fa0c4e584..1df73e08d1e3 100644 --- a/nixpkgs/pkgs/tools/system/collectd/default.nix +++ b/nixpkgs/pkgs/tools/system/collectd/default.nix @@ -42,10 +42,10 @@ }: stdenv.mkDerivation rec { version = "5.8.1"; - name = "collectd-${version}"; + pname = "collectd"; src = fetchurl { - url = "https://collectd.org/files/${name}.tar.bz2"; + url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7"; }; diff --git a/nixpkgs/pkgs/tools/system/confd/default.nix b/nixpkgs/pkgs/tools/system/confd/default.nix index 3dc2a5caeb91..e7a5dc86578a 100644 --- a/nixpkgs/pkgs/tools/system/confd/default.nix +++ b/nixpkgs/pkgs/tools/system/confd/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "confd-${version}"; + pname = "confd"; version = "0.9.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/system/consul-template/default.nix b/nixpkgs/pkgs/tools/system/consul-template/default.nix index 35c57dd8ea91..ad120dd6481e 100644 --- a/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-template-${version}"; + pname = "consul-template"; version = "0.19.4"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/system/daemonize/default.nix b/nixpkgs/pkgs/tools/system/daemonize/default.nix index 1067e524788b..205b693dd924 100644 --- a/nixpkgs/pkgs/tools/system/daemonize/default.nix +++ b/nixpkgs/pkgs/tools/system/daemonize/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "daemonize-${version}"; + pname = "daemonize"; version = "1.7.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/das_watchdog/default.nix b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix index bcea40b1193f..c8f7e77b1562 100644 --- a/nixpkgs/pkgs/tools/system/das_watchdog/default.nix +++ b/nixpkgs/pkgs/tools/system/das_watchdog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }: stdenv.mkDerivation rec { - name = "das_watchdog-${version}"; + pname = "das_watchdog"; version = "git-2015-09-12"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/system/datefudge/default.nix b/nixpkgs/pkgs/tools/system/datefudge/default.nix index ca389a8e1b48..4018801f2490 100644 --- a/nixpkgs/pkgs/tools/system/datefudge/default.nix +++ b/nixpkgs/pkgs/tools/system/datefudge/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "datefudge"; version = "1.22"; - name = "${pname}-${version}"; src = fetchgit { url = "https://salsa.debian.org/debian/datefudge.git"; diff --git a/nixpkgs/pkgs/tools/system/dd_rescue/default.nix b/nixpkgs/pkgs/tools/system/dd_rescue/default.nix index e0d11769fd9f..9962337de078 100644 --- a/nixpkgs/pkgs/tools/system/dd_rescue/default.nix +++ b/nixpkgs/pkgs/tools/system/dd_rescue/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { version = "1.99.8"; - name = "dd_rescue-${version}"; + pname = "dd_rescue"; src = fetchurl { sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh"; - url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; + url="http://www.garloff.de/kurt/linux/ddrescue/${pname}-${version}.tar.bz2"; }; dd_rhelp_src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/ddrutility/default.nix b/nixpkgs/pkgs/tools/system/ddrutility/default.nix index f8a6dac81976..54bf6fbaf42b 100644 --- a/nixpkgs/pkgs/tools/system/ddrutility/default.nix +++ b/nixpkgs/pkgs/tools/system/ddrutility/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ddrutility-${version}"; + pname = "ddrutility"; version = "2.8"; src = fetchurl { - url = "mirror://sourceforge/ddrutility/${name}.tar.gz"; + url = "mirror://sourceforge/ddrutility/${pname}-${version}.tar.gz"; sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac"; }; diff --git a/nixpkgs/pkgs/tools/system/dfc/default.nix b/nixpkgs/pkgs/tools/system/dfc/default.nix index 9a255c1b0ea6..8575d971898a 100644 --- a/nixpkgs/pkgs/tools/system/dfc/default.nix +++ b/nixpkgs/pkgs/tools/system/dfc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, gettext}: stdenv.mkDerivation rec { - name = "dfc-${version}"; + pname = "dfc"; version = "3.1.1"; src = fetchurl { - url = "https://projects.gw-computing.net/attachments/download/615/${name}.tar.gz"; + url = "https://projects.gw-computing.net/attachments/download/615/${pname}-${version}.tar.gz"; sha256 = "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n"; }; diff --git a/nixpkgs/pkgs/tools/system/di/default.nix b/nixpkgs/pkgs/tools/system/di/default.nix index 7d366dc9bd7f..9d56b8488e5e 100644 --- a/nixpkgs/pkgs/tools/system/di/default.nix +++ b/nixpkgs/pkgs/tools/system/di/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "di-${version}"; + pname = "di"; version = "4.47.1"; src = fetchurl { - url = "http://gentoo.com/di/${name}.tar.gz"; + url = "http://gentoo.com/di/${pname}-${version}.tar.gz"; sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f"; }; diff --git a/nixpkgs/pkgs/tools/system/efibootmgr/default.nix b/nixpkgs/pkgs/tools/system/efibootmgr/default.nix index 638b018fd415..272809e486c1 100644 --- a/nixpkgs/pkgs/tools/system/efibootmgr/default.nix +++ b/nixpkgs/pkgs/tools/system/efibootmgr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }: stdenv.mkDerivation rec { - name = "efibootmgr-${version}"; + pname = "efibootmgr"; version = "17"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/system/efivar/default.nix b/nixpkgs/pkgs/tools/system/efivar/default.nix index 5c9b0292e5c0..365cfeab0581 100644 --- a/nixpkgs/pkgs/tools/system/efivar/default.nix +++ b/nixpkgs/pkgs/tools/system/efivar/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: stdenv.mkDerivation rec { - name = "efivar-${version}"; + pname = "efivar"; version = "37"; outputs = [ "bin" "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/tools/system/envconsul/default.nix b/nixpkgs/pkgs/tools/system/envconsul/default.nix index 5f013157e32b..c2f5556cec67 100644 --- a/nixpkgs/pkgs/tools/system/envconsul/default.nix +++ b/nixpkgs/pkgs/tools/system/envconsul/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "envconsul-${version}"; + pname = "envconsul"; version = "0.7.3"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/system/evemu/default.nix b/nixpkgs/pkgs/tools/system/evemu/default.nix index 5a902914b37b..1ba2b78e8609 100644 --- a/nixpkgs/pkgs/tools/system/evemu/default.nix +++ b/nixpkgs/pkgs/tools/system/evemu/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "evemu-${version}"; + pname = "evemu"; version = "2.6.0"; # We could have downloaded a release tarball from cgit, but it changes hash diff --git a/nixpkgs/pkgs/tools/system/facter/default.nix b/nixpkgs/pkgs/tools/system/facter/default.nix index 38ca06a6f322..6b84f7d69a55 100644 --- a/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/nixpkgs/pkgs/tools/system/facter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }: stdenv.mkDerivation rec { - name = "facter-${version}"; + pname = "facter"; version = "3.13.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/nixpkgs/pkgs/tools/system/fakeroot/default.nix index 1a16a8a34c7f..c31e7337dd59 100644 --- a/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.23"; - name = "fakeroot-${version}"; + pname = "fakeroot"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ; postUnpack = '' - sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in + sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in ''; meta = { diff --git a/nixpkgs/pkgs/tools/system/fcron/default.nix b/nixpkgs/pkgs/tools/system/fcron/default.nix index 2bcab1c36b27..6ef39a647f72 100644 --- a/nixpkgs/pkgs/tools/system/fcron/default.nix +++ b/nixpkgs/pkgs/tools/system/fcron/default.nix @@ -4,11 +4,11 @@ { stdenv, fetchurl, perl, busybox, vim }: stdenv.mkDerivation rec { - name = "fcron-${version}"; + pname = "fcron"; version = "3.3.0"; src = fetchurl { - url = "http://fcron.free.fr/archives/${name}.src.tar.gz"; + url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz"; sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls"; }; diff --git a/nixpkgs/pkgs/tools/system/fio/default.nix b/nixpkgs/pkgs/tools/system/fio/default.nix index 694a71d8ec11..5a690b288450 100644 --- a/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/nixpkgs/pkgs/tools/system/fio/default.nix @@ -3,7 +3,7 @@ , withGnuplot ? false, gnuplot ? null }: stdenv.mkDerivation rec { - name = "fio-${version}"; + pname = "fio"; version = "3.15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/foremost/default.nix b/nixpkgs/pkgs/tools/system/foremost/default.nix index b3048f2fcb7f..be33f45ca9dc 100644 --- a/nixpkgs/pkgs/tools/system/foremost/default.nix +++ b/nixpkgs/pkgs/tools/system/foremost/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "foremost-${version}"; + pname = "foremost"; version = "1.5.7"; src = fetchurl { sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h"; - url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz"; + url = "http://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz"; }; patches = [ ./makefile.patch ]; diff --git a/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/nixpkgs/pkgs/tools/system/freeipmi/default.nix index b8cd85c0abca..b057c80c74ec 100644 --- a/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.6.4"; - name = "freeipmi-${version}"; + pname = "freeipmi"; src = fetchurl { - url = "mirror://gnu/freeipmi/${name}.tar.gz"; + url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; sha256 = "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5"; }; diff --git a/nixpkgs/pkgs/tools/system/gohai/default.nix b/nixpkgs/pkgs/tools/system/gohai/default.nix index 9eef3b064a0c..c0dd2c89d2f1 100644 --- a/nixpkgs/pkgs/tools/system/gohai/default.nix +++ b/nixpkgs/pkgs/tools/system/gohai/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gohai-${version}"; + pname = "gohai"; version = "2018-05-23"; rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1"; diff --git a/nixpkgs/pkgs/tools/system/goreman/default.nix b/nixpkgs/pkgs/tools/system/goreman/default.nix index d58d19fd6ed1..22918f14145c 100644 --- a/nixpkgs/pkgs/tools/system/goreman/default.nix +++ b/nixpkgs/pkgs/tools/system/goreman/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "goreman-${version}"; + pname = "goreman"; version = "0.2.1"; goPackagePath = "github.com/mattn/goreman"; diff --git a/nixpkgs/pkgs/tools/system/gptfdisk/default.nix b/nixpkgs/pkgs/tools/system/gptfdisk/default.nix index 25d60ffca5dc..71f82bfc3864 100644 --- a/nixpkgs/pkgs/tools/system/gptfdisk/default.nix +++ b/nixpkgs/pkgs/tools/system/gptfdisk/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-${version}"; + pname = "gptfdisk"; version = "1.0.4"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: - url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; + url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn"; }; diff --git a/nixpkgs/pkgs/tools/system/hardinfo/default.nix b/nixpkgs/pkgs/tools/system/hardinfo/default.nix index 63a72aac79f2..a2e342f85b74 100644 --- a/nixpkgs/pkgs/tools/system/hardinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hardinfo/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "hardinfo-${version}"; + pname = "hardinfo"; version = "0.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/hardlink/default.nix b/nixpkgs/pkgs/tools/system/hardlink/default.nix index c9a21db71010..187c046875f7 100644 --- a/nixpkgs/pkgs/tools/system/hardlink/default.nix +++ b/nixpkgs/pkgs/tools/system/hardlink/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "hardlink-${version}"; + pname = "hardlink"; version = "1.3-4"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix index 68c6ef3c3ef5..12e54b1b22ed 100644 --- a/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/nixpkgs/pkgs/tools/system/htop/default.nix @@ -2,11 +2,11 @@ IOKit, python }: stdenv.mkDerivation rec { - name = "htop-${version}"; + pname = "htop"; version = "2.2.0"; src = fetchurl { - url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; }; diff --git a/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix index eba8c8f41b49..4306f7e90935 100644 --- a/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }: stdenv.mkDerivation rec { - name = "hwinfo-${version}"; + pname = "hwinfo"; version = "21.67"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/illum/default.nix b/nixpkgs/pkgs/tools/system/illum/default.nix index 03373300a948..9d89e0714c48 100644 --- a/nixpkgs/pkgs/tools/system/illum/default.nix +++ b/nixpkgs/pkgs/tools/system/illum/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "illum-${version}"; + pname = "illum"; src = fetchgit { url = "https://github.com/jmesmon/illum.git"; diff --git a/nixpkgs/pkgs/tools/system/inxi/default.nix b/nixpkgs/pkgs/tools/system/inxi/default.nix index ee9554cc09f9..3c1e3e798623 100644 --- a/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "inxi-${version}"; + pname = "inxi"; version = "3.0.36-1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/ioping/default.nix b/nixpkgs/pkgs/tools/system/ioping/default.nix index 22dd9289bfd4..274e65bb41dc 100644 --- a/nixpkgs/pkgs/tools/system/ioping/default.nix +++ b/nixpkgs/pkgs/tools/system/ioping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "ioping-${version}"; + pname = "ioping"; version = "1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/iops/default.nix b/nixpkgs/pkgs/tools/system/iops/default.nix index d7c1f89a7862..7e6854afe627 100644 --- a/nixpkgs/pkgs/tools/system/iops/default.nix +++ b/nixpkgs/pkgs/tools/system/iops/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iops-${version}"; + pname = "iops"; version = "0.1"; src = fetchurl { - url = "https://www.vanheusden.com/iops/${name}.tgz"; + url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz"; sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; }; diff --git a/nixpkgs/pkgs/tools/system/ior/default.nix b/nixpkgs/pkgs/tools/system/ior/default.nix index ad7715f0fe69..83c0a287533a 100644 --- a/nixpkgs/pkgs/tools/system/ior/default.nix +++ b/nixpkgs/pkgs/tools/system/ior/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation rec { - name = "ior-${version}"; + pname = "ior"; + inherit version; src = fetchurl { url = "https://github.com/LLNL/ior/archive/${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/system/journalbeat/default.nix b/nixpkgs/pkgs/tools/system/journalbeat/default.nix index 35a006505434..0a04581264e0 100644 --- a/nixpkgs/pkgs/tools/system/journalbeat/default.nix +++ b/nixpkgs/pkgs/tools/system/journalbeat/default.nix @@ -1,7 +1,7 @@ { lib, systemd, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "journalbeat-${version}"; + pname = "journalbeat"; version = "5.6.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/logcheck/default.nix b/nixpkgs/pkgs/tools/system/logcheck/default.nix index 4ec34a68122c..064071a5ca45 100644 --- a/nixpkgs/pkgs/tools/system/logcheck/default.nix +++ b/nixpkgs/pkgs/tools/system/logcheck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lockfileProgs, perlPackages }: stdenv.mkDerivation rec { - name = "logcheck-${version}"; + pname = "logcheck"; version = "1.3.20"; _name = "logcheck_${version}"; diff --git a/nixpkgs/pkgs/tools/system/logrotate/default.nix b/nixpkgs/pkgs/tools/system/logrotate/default.nix index e01636f2944f..cee092f755f8 100644 --- a/nixpkgs/pkgs/tools/system/logrotate/default.nix +++ b/nixpkgs/pkgs/tools/system/logrotate/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "logrotate-${version}"; + pname = "logrotate"; version = "3.15.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/lr/default.nix b/nixpkgs/pkgs/tools/system/lr/default.nix index 39cd429e1f93..74bc177023fb 100644 --- a/nixpkgs/pkgs/tools/system/lr/default.nix +++ b/nixpkgs/pkgs/tools/system/lr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "lr-${version}"; + pname = "lr"; version = "1.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/memtester/default.nix b/nixpkgs/pkgs/tools/system/memtester/default.nix index d34fb939822d..ff6ccb534fb9 100644 --- a/nixpkgs/pkgs/tools/system/memtester/default.nix +++ b/nixpkgs/pkgs/tools/system/memtester/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "memtester-${version}"; + pname = "memtester"; version = "4.3.0"; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index 5455728a10c2..dc169ee23b47 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.16.0"; - name = "netdata-${version}"; + pname = "netdata"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/system/nq/default.nix b/nixpkgs/pkgs/tools/system/nq/default.nix index 5044e5c9a96a..1d8eeff209ed 100644 --- a/nixpkgs/pkgs/tools/system/nq/default.nix +++ b/nixpkgs/pkgs/tools/system/nq/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nq-${version}"; + pname = "nq"; version = "0.3.1"; src = fetchFromGitHub { owner = "chneukirchen"; diff --git a/nixpkgs/pkgs/tools/system/nvtop/default.nix b/nixpkgs/pkgs/tools/system/nvtop/default.nix index 19581c82c78f..0e7a5d4a3111 100644 --- a/nixpkgs/pkgs/tools/system/nvtop/default.nix +++ b/nixpkgs/pkgs/tools/system/nvtop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: stdenv.mkDerivation rec { - name = "nvtop-${version}"; + pname = "nvtop"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/pcstat/default.nix b/nixpkgs/pkgs/tools/system/pcstat/default.nix index b673c0f929a6..b5842ad37c31 100644 --- a/nixpkgs/pkgs/tools/system/pcstat/default.nix +++ b/nixpkgs/pkgs/tools/system/pcstat/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "pcstat-unstable-${version}"; + pname = "pcstat-unstable"; version = "2017-05-28"; goPackagePath = "github.com/tobert/pcstat"; diff --git a/nixpkgs/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix index b3909a79d942..4c011a0b212d 100644 --- a/nixpkgs/pkgs/tools/system/plan9port/default.nix +++ b/nixpkgs/pkgs/tools/system/plan9port/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { pname = "plan9port"; version = "2019-02-25"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "9fans"; diff --git a/nixpkgs/pkgs/tools/system/psensor/default.nix b/nixpkgs/pkgs/tools/system/psensor/default.nix index 234aacbbfdee..83d281642bd3 100644 --- a/nixpkgs/pkgs/tools/system/psensor/default.nix +++ b/nixpkgs/pkgs/tools/system/psensor/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "psensor-${version}"; + pname = "psensor"; version = "1.2.0"; diff --git a/nixpkgs/pkgs/tools/system/psstop/default.nix b/nixpkgs/pkgs/tools/system/psstop/default.nix index 178e08938fea..4d413e60c77f 100644 --- a/nixpkgs/pkgs/tools/system/psstop/default.nix +++ b/nixpkgs/pkgs/tools/system/psstop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "psstop-${version}"; + pname = "psstop"; version = "1.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix b/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix index ee7626d27126..73c1b4881559 100644 --- a/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix +++ b/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "rofi-systemd-${version}"; + pname = "rofi-systemd"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/runit/default.nix b/nixpkgs/pkgs/tools/system/runit/default.nix index 131ba53f5847..78306907079e 100644 --- a/nixpkgs/pkgs/tools/system/runit/default.nix +++ b/nixpkgs/pkgs/tools/system/runit/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "runit-${version}"; + pname = "runit"; version = "2.1.2"; src = fetchurl { - url = "http://smarden.org/runit/${name}.tar.gz"; + url = "http://smarden.org/runit/${pname}-${version}.tar.gz"; sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - sourceRoot = "admin/${name}"; + sourceRoot = "admin/${pname}-${version}"; doCheck = true; diff --git a/nixpkgs/pkgs/tools/system/s-tui/default.nix b/nixpkgs/pkgs/tools/system/s-tui/default.nix index 5d4ed355ba9d..063a338f6e8d 100644 --- a/nixpkgs/pkgs/tools/system/s-tui/default.nix +++ b/nixpkgs/pkgs/tools/system/s-tui/default.nix @@ -1,7 +1,6 @@ { stdenv, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "s-tui"; version = "0.8.3"; diff --git a/nixpkgs/pkgs/tools/system/safe-rm/default.nix b/nixpkgs/pkgs/tools/system/safe-rm/default.nix index ed4fe7a68482..571f70e0756c 100644 --- a/nixpkgs/pkgs/tools/system/safe-rm/default.nix +++ b/nixpkgs/pkgs/tools/system/safe-rm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, perl, coreutils }: stdenv.mkDerivation rec { - name = "safe-rm-${version}"; + pname = "safe-rm"; version = "0.12"; src = fetchgit { url = "https://gitorious.org/safe-rm/mainline.git"; - rev = "refs/tags/${name}"; + rev = "refs/tags/${pname}-${version}"; sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq"; }; diff --git a/nixpkgs/pkgs/tools/system/setserial/default.nix b/nixpkgs/pkgs/tools/system/setserial/default.nix index d6e8f4f1bb9f..036e3a83cf28 100644 --- a/nixpkgs/pkgs/tools/system/setserial/default.nix +++ b/nixpkgs/pkgs/tools/system/setserial/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "setserial-${version}"; + pname = "setserial"; version = "2.17"; src = fetchurl { - url = "mirror://sourceforge/setserial/${name}.tar.gz"; + url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz"; sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y"; }; diff --git a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index d35f56e25197..7c90d41da18e 100644 --- a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { version = "4.6.5"; - name = "sleuthkit-${version}"; + pname = "sleuthkit"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c"; }; diff --git a/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 05d96afded14..2da76cce0cdd 100644 --- a/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -13,10 +13,11 @@ let }; in stdenv.mkDerivation rec { - name = "smartmontools-${version}"; + pname = "smartmontools"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; + url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5"; }; diff --git a/nixpkgs/pkgs/tools/system/socklog/default.nix b/nixpkgs/pkgs/tools/system/socklog/default.nix index 15a18a453f00..9f2cc2257472 100644 --- a/nixpkgs/pkgs/tools/system/socklog/default.nix +++ b/nixpkgs/pkgs/tools/system/socklog/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "socklog-${version}"; + pname = "socklog"; version = "2.1.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/suid-chroot/default.nix b/nixpkgs/pkgs/tools/system/suid-chroot/default.nix index f407be7c5854..9697748e056d 100644 --- a/nixpkgs/pkgs/tools/system/suid-chroot/default.nix +++ b/nixpkgs/pkgs/tools/system/suid-chroot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "suid-chroot-${version}"; + pname = "suid-chroot"; version = "1.0.2"; src = fetchurl { sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx"; - url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${name}.tar.bz2"; + url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${pname}-${version}.tar.bz2"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/supervise/default.nix b/nixpkgs/pkgs/tools/system/supervise/default.nix index 81e3a2b8792b..3834b3762f03 100644 --- a/nixpkgs/pkgs/tools/system/supervise/default.nix +++ b/nixpkgs/pkgs/tools/system/supervise/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "supervise-${version}"; + pname = "supervise"; version = "1.4.0"; src = fetchzip { diff --git a/nixpkgs/pkgs/tools/system/symlinks/default.nix b/nixpkgs/pkgs/tools/system/symlinks/default.nix index 240ad9de19d1..93a6bbf0c75b 100644 --- a/nixpkgs/pkgs/tools/system/symlinks/default.nix +++ b/nixpkgs/pkgs/tools/system/symlinks/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "symlinks-${version}"; + pname = "symlinks"; version = "1.4.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix b/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix index 1f444ca5cd81..881fda241ed7 100644 --- a/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "syslog-ng-incubator-${version}"; + pname = "syslog-ng-incubator"; version = "0.6.2"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; - rev = name; + rev = "${pname}-${version}"; sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s"; }; diff --git a/nixpkgs/pkgs/tools/system/testdisk-photorec/default.nix b/nixpkgs/pkgs/tools/system/testdisk-photorec/default.nix index 5342cf857acc..06f6751213b2 100644 --- a/nixpkgs/pkgs/tools/system/testdisk-photorec/default.nix +++ b/nixpkgs/pkgs/tools/system/testdisk-photorec/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "testdisk-photorec-${version}"; + pname = "testdisk-photorec"; version = "7.0"; src = fetchurl { url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/tools/system/thermald/default.nix b/nixpkgs/pkgs/tools/system/thermald/default.nix index 2a98a2f889e8..3429419052fe 100644 --- a/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -2,7 +2,7 @@ , pkgconfig, dbus, dbus-glib, libxml2 }: stdenv.mkDerivation rec { - name = "thermald-${version}"; + pname = "thermald"; version = "1.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/nixpkgs/pkgs/tools/system/thinkfan/default.nix index dc63b97056a7..8c8034005844 100644 --- a/nixpkgs/pkgs/tools/system/thinkfan/default.nix +++ b/nixpkgs/pkgs/tools/system/thinkfan/default.nix @@ -2,7 +2,7 @@ , smartSupport ? false, libatasmart }: stdenv.mkDerivation rec { - name = "thinkfan-${version}"; + pname = "thinkfan"; version = "0.9.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/system/tree/default.nix b/nixpkgs/pkgs/tools/system/tree/default.nix index a69a527f68fd..0163d5502173 100644 --- a/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/nixpkgs/pkgs/tools/system/tree/default.nix @@ -24,7 +24,8 @@ let ""; # use linux flags by default in stdenv.mkDerivation { - name = "tree-${version}"; + pname = "tree"; + inherit version; src = fetchurl { url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz"; diff --git a/nixpkgs/pkgs/tools/system/uptimed/default.nix b/nixpkgs/pkgs/tools/system/uptimed/default.nix index 849baa7159ae..71a5726759c7 100644 --- a/nixpkgs/pkgs/tools/system/uptimed/default.nix +++ b/nixpkgs/pkgs/tools/system/uptimed/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "uptimed-${version}"; + pname = "uptimed"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/vbetool/default.nix b/nixpkgs/pkgs/tools/system/vbetool/default.nix index 32cf56a1d74e..06ae28626624 100644 --- a/nixpkgs/pkgs/tools/system/vbetool/default.nix +++ b/nixpkgs/pkgs/tools/system/vbetool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pciutils, libx86, zlib }: stdenv.mkDerivation rec { - name = "vbetool-${version}"; + pname = "vbetool"; version = "1.1"; src = fetchurl { - url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/vbetool/download/${pname}-${version}.tar.gz"; sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd"; }; diff --git a/nixpkgs/pkgs/tools/system/vboot_reference/default.nix b/nixpkgs/pkgs/tools/system/vboot_reference/default.nix index b252b74a0bdd..85baa3d3f30c 100644 --- a/nixpkgs/pkgs/tools/system/vboot_reference/default.nix +++ b/nixpkgs/pkgs/tools/system/vboot_reference/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20180311"; checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7"; - name = "vboot_reference-${version}"; + pname = "vboot_reference"; src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; diff --git a/nixpkgs/pkgs/tools/system/wsmancli/default.nix b/nixpkgs/pkgs/tools/system/wsmancli/default.nix index ca35dae5827c..da502946781b 100644 --- a/nixpkgs/pkgs/tools/system/wsmancli/default.nix +++ b/nixpkgs/pkgs/tools/system/wsmancli/default.nix @@ -2,7 +2,7 @@ , openssl, openwsman }: stdenv.mkDerivation rec { - name = "wsmancli-${version}"; + pname = "wsmancli"; version = "2.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/system/xe/default.nix b/nixpkgs/pkgs/tools/system/xe/default.nix index 519cae03c5a5..02d904724404 100644 --- a/nixpkgs/pkgs/tools/system/xe/default.nix +++ b/nixpkgs/pkgs/tools/system/xe/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "xe-${version}"; + pname = "xe"; version = "0.11"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/agrep/default.nix b/nixpkgs/pkgs/tools/text/agrep/default.nix index 10d3a47cc85e..a37531572d7b 100644 --- a/nixpkgs/pkgs/tools/text/agrep/default.nix +++ b/nixpkgs/pkgs/tools/text/agrep/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "agrep-${version}"; + pname = "agrep"; version = "3.41.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/aha/default.nix b/nixpkgs/pkgs/tools/text/aha/default.nix index f53a649cd771..7dc07664fcef 100644 --- a/nixpkgs/pkgs/tools/text/aha/default.nix +++ b/nixpkgs/pkgs/tools/text/aha/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "aha-${version}"; + pname = "aha"; version = "0.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/ansifilter/default.nix b/nixpkgs/pkgs/tools/text/ansifilter/default.nix index 2ad91a3071ed..b9a4f6782076 100644 --- a/nixpkgs/pkgs/tools/text/ansifilter/default.nix +++ b/nixpkgs/pkgs/tools/text/ansifilter/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, boost, lua }: stdenv.mkDerivation rec { - name = "ansifilter-${version}"; + pname = "ansifilter"; version = "2.14"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/ascii/default.nix b/nixpkgs/pkgs/tools/text/ascii/default.nix index 20777f990e26..b01ce7773e30 100644 --- a/nixpkgs/pkgs/tools/text/ascii/default.nix +++ b/nixpkgs/pkgs/tools/text/ascii/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ascii-${version}"; + pname = "ascii"; version = "3.18"; src = fetchurl { - url = "http://www.catb.org/~esr/ascii/${name}.tar.gz"; + url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz"; sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j"; }; diff --git a/nixpkgs/pkgs/tools/text/catdoc/default.nix b/nixpkgs/pkgs/tools/text/catdoc/default.nix index 8a8eb3117f03..16d5b9995c24 100644 --- a/nixpkgs/pkgs/tools/text/catdoc/default.nix +++ b/nixpkgs/pkgs/tools/text/catdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "catdoc-${version}"; + pname = "catdoc"; version = "0.95"; src = fetchurl { - url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz"; + url = "http://ftp.wagner.pp.ru/pub/catdoc/${pname}-${version}.tar.gz"; sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796"; }; diff --git a/nixpkgs/pkgs/tools/text/cconv/default.nix b/nixpkgs/pkgs/tools/text/cconv/default.nix index 9f6b7a7f1227..3b80af365f65 100644 --- a/nixpkgs/pkgs/tools/text/cconv/default.nix +++ b/nixpkgs/pkgs/tools/text/cconv/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, autoreconfHook }: let version = "0.6.3"; in stdenv.mkDerivation { - name = "cconv-${version}"; + pname = "cconv"; + inherit version; src = fetchurl { url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/text/codesearch/default.nix b/nixpkgs/pkgs/tools/text/codesearch/default.nix index 56a8133bd3a8..521b4c5b284f 100644 --- a/nixpkgs/pkgs/tools/text/codesearch/default.nix +++ b/nixpkgs/pkgs/tools/text/codesearch/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "codesearch-${version}"; + pname = "codesearch"; version = "20150717-${stdenv.lib.strings.substring 0 7 rev}"; rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; diff --git a/nixpkgs/pkgs/tools/text/copyright-update/default.nix b/nixpkgs/pkgs/tools/text/copyright-update/default.nix index 604097fbe778..9a405674dc7a 100644 --- a/nixpkgs/pkgs/tools/text/copyright-update/default.nix +++ b/nixpkgs/pkgs/tools/text/copyright-update/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "copyright-update-${version}"; + pname = "copyright-update"; version = "2016.1018"; src = fetchFromGitHub { - name = "${name}-src"; + name = "${pname}-${version}-src"; owner = "jaalto"; repo = "project--copyright-update"; rev = "release/${version}"; diff --git a/nixpkgs/pkgs/tools/text/dadadodo/default.nix b/nixpkgs/pkgs/tools/text/dadadodo/default.nix index 7404c887a46b..5f6b0a8a6058 100644 --- a/nixpkgs/pkgs/tools/text/dadadodo/default.nix +++ b/nixpkgs/pkgs/tools/text/dadadodo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dadadodo-${version}"; + pname = "dadadodo"; version = "1.04"; src = fetchurl { - url = "https://www.jwz.org/dadadodo/${name}.tar.gz"; + url = "https://www.jwz.org/dadadodo/${pname}-${version}.tar.gz"; sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if"; }; diff --git a/nixpkgs/pkgs/tools/text/diction/default.nix b/nixpkgs/pkgs/tools/text/diction/default.nix index cfb627d70428..f43cd94a83e7 100644 --- a/nixpkgs/pkgs/tools/text/diction/default.nix +++ b/nixpkgs/pkgs/tools/text/diction/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "diction-${version}"; + pname = "diction"; version = "1.13"; src = fetchurl { - url = "http://www.moria.de/~michael/diction/${name}.tar.gz"; + url = "http://www.moria.de/~michael/diction/${pname}-${version}.tar.gz"; sha256 = "08fi971b8qa4xycxbgb42i6b5ms3qx9zpp5hwpbxy2vypfs0wph9"; }; diff --git a/nixpkgs/pkgs/tools/text/dos2unix/default.nix b/nixpkgs/pkgs/tools/text/dos2unix/default.nix index dd0d1bbc9410..bd72ec947143 100644 --- a/nixpkgs/pkgs/tools/text/dos2unix/default.nix +++ b/nixpkgs/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "dos2unix-${version}"; + pname = "dos2unix"; version = "7.4.0"; src = fetchurl { - url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; + url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs"; }; diff --git a/nixpkgs/pkgs/tools/text/enca/default.nix b/nixpkgs/pkgs/tools/text/enca/default.nix index 098eee7cf720..6cfb4721066c 100644 --- a/nixpkgs/pkgs/tools/text/enca/default.nix +++ b/nixpkgs/pkgs/tools/text/enca/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, recode }: stdenv.mkDerivation rec { - name = "enca-${version}"; + pname = "enca"; version = "1.19"; src = fetchurl { - url = "https://dl.cihar.com/enca/${name}.tar.xz"; + url = "https://dl.cihar.com/enca/${pname}-${version}.tar.xz"; sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s"; }; diff --git a/nixpkgs/pkgs/tools/text/esh/default.nix b/nixpkgs/pkgs/tools/text/esh/default.nix index b4418e04f03b..231a16bdc1b3 100644 --- a/nixpkgs/pkgs/tools/text/esh/default.nix +++ b/nixpkgs/pkgs/tools/text/esh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }: stdenv.mkDerivation rec { - name = "esh-${version}"; + pname = "esh"; version = "0.1.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/glogg/default.nix b/nixpkgs/pkgs/tools/text/glogg/default.nix index d61a7d184ea4..6e9ff5170f2b 100644 --- a/nixpkgs/pkgs/tools/text/glogg/default.nix +++ b/nixpkgs/pkgs/tools/text/glogg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "glogg-${version}"; + pname = "glogg"; version = "1.1.4"; src = fetchurl { - url = "https://glogg.bonnefon.org/files/${name}.tar.gz"; + url = "https://glogg.bonnefon.org/files/${pname}-${version}.tar.gz"; sha256 = "0nwnfk9bcz2k7rf08w2cb6qipzdhwmxznik44jxmn9gwxdrdq78c"; }; diff --git a/nixpkgs/pkgs/tools/text/gnugrep/default.nix b/nixpkgs/pkgs/tools/text/gnugrep/default.nix index 702d1b4d89fa..87c8fdfd8903 100644 --- a/nixpkgs/pkgs/tools/text/gnugrep/default.nix +++ b/nixpkgs/pkgs/tools/text/gnugrep/default.nix @@ -3,7 +3,8 @@ let version = "3.3"; in stdenv.mkDerivation { - name = "gnugrep-${version}"; + pname = "gnugrep"; + inherit version; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; diff --git a/nixpkgs/pkgs/tools/text/gnused/default.nix b/nixpkgs/pkgs/tools/text/gnused/default.nix index 8a44e434d4c1..3d73bfba6576 100644 --- a/nixpkgs/pkgs/tools/text/gnused/default.nix +++ b/nixpkgs/pkgs/tools/text/gnused/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "gnused-${version}"; + pname = "gnused"; version = "4.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/groff/default.nix b/nixpkgs/pkgs/tools/text/groff/default.nix index 082c61635ba9..a3df96175675 100644 --- a/nixpkgs/pkgs/tools/text/groff/default.nix +++ b/nixpkgs/pkgs/tools/text/groff/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "groff-${version}"; + pname = "groff"; version = "1.22.3"; src = fetchurl { - url = "mirror://gnu/groff/${name}.tar.gz"; + url = "mirror://gnu/groff/${pname}-${version}.tar.gz"; sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s"; }; diff --git a/nixpkgs/pkgs/tools/text/gucci/default.nix b/nixpkgs/pkgs/tools/text/gucci/default.nix index a04a2c65e7c3..58f1768bfa1f 100644 --- a/nixpkgs/pkgs/tools/text/gucci/default.nix +++ b/nixpkgs/pkgs/tools/text/gucci/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gucci-${version}"; + pname = "gucci"; version = "0.1.0"; goPackagePath = "github.com/noqcks/gucci"; diff --git a/nixpkgs/pkgs/tools/text/highlight/default.nix b/nixpkgs/pkgs/tools/text/highlight/default.nix index 46fe9ab1cd72..eb86bc79d5c1 100644 --- a/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "highlight-${version}"; + pname = "highlight"; version = "3.53"; src = fetchFromGitLab { diff --git a/nixpkgs/pkgs/tools/text/html-tidy/default.nix b/nixpkgs/pkgs/tools/text/html-tidy/default.nix index 1974c0aa4f36..e31db4378507 100644 --- a/nixpkgs/pkgs/tools/text/html-tidy/default.nix +++ b/nixpkgs/pkgs/tools/text/html-tidy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, libxslt }: stdenv.mkDerivation rec { - name = "html-tidy-${version}"; + pname = "html-tidy"; version = "5.6.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/icdiff/default.nix b/nixpkgs/pkgs/tools/text/icdiff/default.nix index aec238cb4ccc..dfbe6e7b6dc1 100644 --- a/nixpkgs/pkgs/tools/text/icdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/icdiff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "icdiff-${version}"; + pname = "icdiff"; version = "1.9.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/ispell/default.nix b/nixpkgs/pkgs/tools/text/ispell/default.nix index dbec8d353d94..2f61536ed2c0 100644 --- a/nixpkgs/pkgs/tools/text/ispell/default.nix +++ b/nixpkgs/pkgs/tools/text/ispell/default.nix @@ -1,14 +1,17 @@ { stdenv, fetchurl, bison, ncurses }: stdenv.mkDerivation rec { - name = "ispell-3.3.02"; + pname = "ispell"; + version = "3.4.00"; + src = fetchurl { - url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz"; + url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz"; sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz"; }; + buildInputs = [ bison ncurses ]; + patches = [ - ./patches/0005-Do-not-reorder-words.patch ./patches/0007-Use-termios.patch ./patches/0008-Tex-backslash.patch ./patches/0009-Fix-FTBFS-on-glibc.patch @@ -21,6 +24,7 @@ stdenv.mkDerivation rec { ./patches/0025-Languages.patch ./patches/0030-Display-whole-multibyte-character.patch ]; + postPatch = '' cat >> local.h <<EOF ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"} @@ -37,11 +41,18 @@ stdenv.mkDerivation rec { #define MINIMENU #define HAS_RENAME EOF - ''; + preBuild = '' for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do mkdir -p $dir done ''; + + meta = with stdenv.lib; { + description = "An interactive spell-checking program for Unix"; + homepage = "https://www.cs.hmc.edu/~geoff/ispell.html"; + license = licenses.free; + platforms = platforms.unix; + }; } diff --git a/nixpkgs/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch b/nixpkgs/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch deleted file mode 100644 index 2d74c078601a..000000000000 --- a/nixpkgs/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Geoff Kuenning <geoff@cs.hmc.edu> -Date: Thu, 3 Nov 2005 14:14:15 -0800 -Subject: 0005 Do not reorder words - -ispell reorders words in personal dictionary without good reason. - -The correct approach is to build the internal data structure with variant -spellings stored in the same order as they appear in the personal dictionary. -Fortunately, this is easy, though the patch is to a different file. This one -has been tested (That's what I get for trying to rush out a fix before a -meeting!). ---- - makedent.c | 18 +++++++++++------- - 1 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/makedent.c b/makedent.c -index 0453d11..d121345 100644 ---- a/makedent.c -+++ b/makedent.c -@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp) - if (retval == 0) - { - /* -- ** Couldn't combine the two entries. Add a new variant. For -- ** ease, we'll stick it right behind the header, rather than -- ** at the end of the list. -+ ** Couldn't combine the two entries. Add a new variant. We -+ ** stick it at the end of the variant list because it's -+ ** important to maintain order; this causes the personal -+ ** dictionary to have a stable ordering. - */ - forcevheader (hdrp, oldp, newp); - tdent = (struct dent *) mymalloc (sizeof (struct dent)); -@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp) - return -1; - } - *tdent = *newp; -- tdent->next = hdrp->next; -- hdrp->next = tdent; -- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS); -- hdrp->flagfield |= MOREVARIANTS; -+ for (oldp = hdrp; -+ oldp->next != NULL && oldp->flagfield & MOREVARIANTS; -+ oldp = oldp->next) -+ ; -+ tdent->next = oldp->next; -+ oldp->next = tdent; -+ oldp->flagfield |= MOREVARIANTS; - combineaffixes (hdrp, newp); - hdrp->flagfield |= (newp->flagfield & KEEP); - if (captype (newp->flagfield) == FOLLOWCASE) --- diff --git a/nixpkgs/pkgs/tools/text/jsawk/default.nix b/nixpkgs/pkgs/tools/text/jsawk/default.nix index 46d290b79ffb..18336fcf059f 100644 --- a/nixpkgs/pkgs/tools/text/jsawk/default.nix +++ b/nixpkgs/pkgs/tools/text/jsawk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, spidermonkey }: stdenv.mkDerivation rec { - name = "jsawk-${version}"; + pname = "jsawk"; version = "1.5-pre"; src = fetchFromGitHub { owner = "micha"; diff --git a/nixpkgs/pkgs/tools/text/jumanpp/default.nix b/nixpkgs/pkgs/tools/text/jumanpp/default.nix index 5eea33d13a47..6be7106f2b95 100644 --- a/nixpkgs/pkgs/tools/text/jumanpp/default.nix +++ b/nixpkgs/pkgs/tools/text/jumanpp/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, cmake, protobuf }: stdenv.mkDerivation rec { pname = "jumanpp"; - name = "${pname}-${version}"; version = "2.0.0-rc2"; src = fetchurl { - url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz"; + url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; buildInputs = [ cmake protobuf ]; diff --git a/nixpkgs/pkgs/tools/text/kytea/default.nix b/nixpkgs/pkgs/tools/text/kytea/default.nix index 7254660cb1ae..600907311ef2 100644 --- a/nixpkgs/pkgs/tools/text/kytea/default.nix +++ b/nixpkgs/pkgs/tools/text/kytea/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "kytea-${version}"; + pname = "kytea"; version = "0.4.7"; src = fetchurl { - url = "http://www.phontron.com/kytea/download/${name}.tar.gz"; + url = "http://www.phontron.com/kytea/download/${pname}-${version}.tar.gz"; sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk"; }; diff --git a/nixpkgs/pkgs/tools/text/languagetool/default.nix b/nixpkgs/pkgs/tools/text/languagetool/default.nix index 1ccba80cb3e6..f75099e630db 100644 --- a/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/nixpkgs/pkgs/tools/text/languagetool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "LanguageTool-${version}"; + pname = "LanguageTool"; version = "4.6"; src = fetchzip { - url = "https://www.languagetool.org/download/${name}.zip"; + url = "https://www.languagetool.org/download/${pname}-${version}.zip"; sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/text/link-grammar/default.nix b/nixpkgs/pkgs/tools/text/link-grammar/default.nix index 32aeed7499f3..bca0a5e38579 100644 --- a/nixpkgs/pkgs/tools/text/link-grammar/default.nix +++ b/nixpkgs/pkgs/tools/text/link-grammar/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "5.6.2"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { - url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; + url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k"; }; diff --git a/nixpkgs/pkgs/tools/text/mb2md/default.nix b/nixpkgs/pkgs/tools/text/mb2md/default.nix index ddc7f96ec26e..91c958cf0675 100644 --- a/nixpkgs/pkgs/tools/text/mb2md/default.nix +++ b/nixpkgs/pkgs/tools/text/mb2md/default.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { version = "3.20"; - name = "mb2md-${version}"; + pname = "mb2md"; src = fetchurl { url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${version}.pl.gz"; diff --git a/nixpkgs/pkgs/tools/text/mecab/ipadic.nix b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix index 9896b365a6a2..991d0735bab2 100644 --- a/nixpkgs/pkgs/tools/text/mecab/ipadic.nix +++ b/nixpkgs/pkgs/tools/text/mecab/ipadic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mecab-nodic }: stdenv.mkDerivation rec { - name = "mecab-ipadic-${version}"; + pname = "mecab-ipadic"; version = "2.7.0-20070801"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/miller/default.nix b/nixpkgs/pkgs/tools/text/miller/default.nix index 3e0bee3b9b98..9de7efa3a816 100644 --- a/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/nixpkgs/pkgs/tools/text/miller/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: stdenv.mkDerivation rec { - name = "miller-${version}"; + pname = "miller"; version = "5.4.0"; diff --git a/nixpkgs/pkgs/tools/text/mir-qualia/default.nix b/nixpkgs/pkgs/tools/text/mir-qualia/default.nix index 4e3be9e17e0c..0a9b3777783b 100644 --- a/nixpkgs/pkgs/tools/text/mir-qualia/default.nix +++ b/nixpkgs/pkgs/tools/text/mir-qualia/default.nix @@ -1,7 +1,7 @@ { lib, pythonPackages, fetchurl }: pythonPackages.buildPythonApplication rec { - name = "mir.qualia-${version}"; + pname = "mir.qualia"; version = "2.0.0"; doCheck = false; # 2.0.0-released pytests are broken diff --git a/nixpkgs/pkgs/tools/text/numdiff/default.nix b/nixpkgs/pkgs/tools/text/numdiff/default.nix index 1320f824fdf3..415ff0b31b75 100644 --- a/nixpkgs/pkgs/tools/text/numdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/numdiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "numdiff-${version}"; + pname = "numdiff"; version = "5.9.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/odt2txt/default.nix b/nixpkgs/pkgs/tools/text/odt2txt/default.nix index 48abee018306..69277d0412df 100644 --- a/nixpkgs/pkgs/tools/text/odt2txt/default.nix +++ b/nixpkgs/pkgs/tools/text/odt2txt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib, libiconv }: stdenv.mkDerivation rec { - name = "odt2txt-${version}"; + pname = "odt2txt"; version = "0.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/patchutils/generic.nix b/nixpkgs/pkgs/tools/text/patchutils/generic.nix index 87d925e333f6..9d7ac4b53f05 100644 --- a/nixpkgs/pkgs/tools/text/patchutils/generic.nix +++ b/nixpkgs/pkgs/tools/text/patchutils/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, perl , version, sha256, patches ? [] , ... }: @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { inherit sha256; }; + buildInputs = [ perl ]; hardeningDisable = [ "format" ]; doCheck = false; # fails diff --git a/nixpkgs/pkgs/tools/text/peco/default.nix b/nixpkgs/pkgs/tools/text/peco/default.nix index b51f811644d1..9407e68ed165 100644 --- a/nixpkgs/pkgs/tools/text/peco/default.nix +++ b/nixpkgs/pkgs/tools/text/peco/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "peco-${version}"; + pname = "peco"; version = "0.5.3"; goPackagePath = "github.com/peco/peco"; diff --git a/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix index 4b30387f7ac5..342377b85aea 100644 --- a/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix +++ b/nixpkgs/pkgs/tools/text/platinum-searcher/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "the_platinum_searcher-${version}"; + pname = "the_platinum_searcher"; version = "2.1.5"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/text/podiff/default.nix b/nixpkgs/pkgs/tools/text/podiff/default.nix index ccfeabaa73bd..efe19a1b5cef 100644 --- a/nixpkgs/pkgs/tools/text/podiff/default.nix +++ b/nixpkgs/pkgs/tools/text/podiff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "podiff-${version}"; + pname = "podiff"; version = "1.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/poedit/default.nix b/nixpkgs/pkgs/tools/text/poedit/default.nix index a5864fbc051c..e1ac2248d224 100644 --- a/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -3,7 +3,7 @@ nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "poedit-${version}"; + pname = "poedit"; version = "2.2.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/proselint/default.nix b/nixpkgs/pkgs/tools/text/proselint/default.nix index c536cbbaaad4..27e9c80bc7d5 100644 --- a/nixpkgs/pkgs/tools/text/proselint/default.nix +++ b/nixpkgs/pkgs/tools/text/proselint/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonApplication, click, future, six }: buildPythonApplication rec { - name = "proselint-${version}"; + pname = "proselint"; version = "0.10.2"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { - url = "mirror://pypi/p/proselint/${name}.tar.gz"; + url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs"; }; diff --git a/nixpkgs/pkgs/tools/text/qshowdiff/default.nix b/nixpkgs/pkgs/tools/text/qshowdiff/default.nix index e3970c059027..9cf9349badb2 100644 --- a/nixpkgs/pkgs/tools/text/qshowdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/qshowdiff/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, qt4, perl, pkgconfig }: stdenv.mkDerivation rec { - name = "qshowdiff-${version}"; + pname = "qshowdiff"; version = "1.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/reckon/default.nix b/nixpkgs/pkgs/tools/text/reckon/default.nix index 9e3e4d5b41d5..25e9c07f351e 100644 --- a/nixpkgs/pkgs/tools/text/reckon/default.nix +++ b/nixpkgs/pkgs/tools/text/reckon/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { - name = "reckon-${version}"; + pname = "reckon"; version = (import ./gemset.nix).reckon.version; env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-${version}-gems"; gemdir = ./.; }; diff --git a/nixpkgs/pkgs/tools/text/rpl/default.nix b/nixpkgs/pkgs/tools/text/rpl/default.nix index bdbc97124433..7ac3790f8a98 100644 --- a/nixpkgs/pkgs/tools/text/rpl/default.nix +++ b/nixpkgs/pkgs/tools/text/rpl/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "rpl"; version = "1.5.7"; diff --git a/nixpkgs/pkgs/tools/text/rst2html5/default.nix b/nixpkgs/pkgs/tools/text/rst2html5/default.nix index 8aadbb0b8062..83ac2d4d766d 100644 --- a/nixpkgs/pkgs/tools/text/rst2html5/default.nix +++ b/nixpkgs/pkgs/tools/text/rst2html5/default.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - - name = "${pname}-${version}"; pname = "rst2html5"; version = "1.9.4"; src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; }; diff --git a/nixpkgs/pkgs/tools/text/schema2ldif/default.nix b/nixpkgs/pkgs/tools/text/schema2ldif/default.nix index 2df6cbb27a2d..5df4e90ff1aa 100644 --- a/nixpkgs/pkgs/tools/text/schema2ldif/default.nix +++ b/nixpkgs/pkgs/tools/text/schema2ldif/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "schema2ldif-${version}"; + pname = "schema2ldif"; version = "1.3"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/shfmt/default.nix b/nixpkgs/pkgs/tools/text/shfmt/default.nix index 12b57cb82dfd..6f29cbc18f23 100644 --- a/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "shfmt-${version}"; + pname = "shfmt"; version = "2.6.4"; goPackagePath = "mvdan.cc/sh"; diff --git a/nixpkgs/pkgs/tools/text/shocco/default.nix b/nixpkgs/pkgs/tools/text/shocco/default.nix index 97c677a7f701..f657df5b780b 100644 --- a/nixpkgs/pkgs/tools/text/shocco/default.nix +++ b/nixpkgs/pkgs/tools/text/shocco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perlPackages, pythonPackages }: stdenv.mkDerivation rec { - name = "shocco-${version}"; + pname = "shocco"; version = "1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/sift/default.nix b/nixpkgs/pkgs/tools/text/sift/default.nix index 421715f7c33c..c2a4cf22ea6d 100644 --- a/nixpkgs/pkgs/tools/text/sift/default.nix +++ b/nixpkgs/pkgs/tools/text/sift/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "sift-${version}"; + pname = "sift"; version = "0.9.0"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/text/silver-searcher/default.nix b/nixpkgs/pkgs/tools/text/silver-searcher/default.nix index 72dfa684160b..b37dbbf68366 100644 --- a/nixpkgs/pkgs/tools/text/silver-searcher/default.nix +++ b/nixpkgs/pkgs/tools/text/silver-searcher/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}: stdenv.mkDerivation rec { - name = "silver-searcher-${version}"; + pname = "silver-searcher"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/txt2tags/default.nix b/nixpkgs/pkgs/tools/text/txt2tags/default.nix index 592f9b8f1885..100124043ed7 100644 --- a/nixpkgs/pkgs/tools/text/txt2tags/default.nix +++ b/nixpkgs/pkgs/tools/text/txt2tags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.6"; - name = "txt2tags-${version}"; + pname = "txt2tags"; dontBuild = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://txt2tags.googlecode.com/files/${name}.tgz"; + url = "http://txt2tags.googlecode.com/files/${pname}-${version}.tgz"; sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530"; }; diff --git a/nixpkgs/pkgs/tools/text/unrtf/default.nix b/nixpkgs/pkgs/tools/text/unrtf/default.nix index 361b6782526b..93611ec5531d 100644 --- a/nixpkgs/pkgs/tools/text/unrtf/default.nix +++ b/nixpkgs/pkgs/tools/text/unrtf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: stdenv.mkDerivation rec { - name = "unrtf-${version}"; + pname = "unrtf"; version = "0.21.9"; src = fetchurl { - url = "https://www.gnu.org/software/unrtf/${name}.tar.gz"; + url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz"; sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; }; diff --git a/nixpkgs/pkgs/tools/text/untex/default.nix b/nixpkgs/pkgs/tools/text/untex/default.nix index b1671ad38b53..923adf8571d1 100644 --- a/nixpkgs/pkgs/tools/text/untex/default.nix +++ b/nixpkgs/pkgs/tools/text/untex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "untex-${version}"; + pname = "untex"; version = "1.3"; src = fetchurl { - url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz"; + url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz"; sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv"; }; diff --git a/nixpkgs/pkgs/tools/text/wgetpaste/default.nix b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix index 20cd5066e808..7b08cffe42db 100644 --- a/nixpkgs/pkgs/tools/text/wgetpaste/default.nix +++ b/nixpkgs/pkgs/tools/text/wgetpaste/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.29"; - name = "wgetpaste-${version}"; + pname = "wgetpaste"; src = fetchurl { - url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; + url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2"; sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22"; }; # currently zsh-autocompletion support is not installed diff --git a/nixpkgs/pkgs/tools/text/xidel/default.nix b/nixpkgs/pkgs/tools/text/xidel/default.nix index 66dfa1c6b348..92ad2e005884 100644 --- a/nixpkgs/pkgs/tools/text/xidel/default.nix +++ b/nixpkgs/pkgs/tools/text/xidel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { - name = "xidel-${version}"; + pname = "xidel"; version = "0.9.6"; ## Source archive lacks file (manageUtils.sh), using pre-built package for now. diff --git a/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 0650270bb6a0..c373f068961e 100644 --- a/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-${version}"; + pname = "basex"; version = "8.6.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix index 8851b8a2725c..ed19e1144691 100644 --- a/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, libiconv }: stdenv.mkDerivation rec { - name = "html-xml-utils-${version}"; + pname = "html-xml-utils"; version = "7.7"; src = fetchurl { - url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; + url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; diff --git a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix index f764a2fac07d..388dcc6b583f 100644 --- a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: stdenv.mkDerivation rec { - name = "jing-trang-${version}"; + pname = "jing-trang"; version = "20151127"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/text/xml/rnv/default.nix b/nixpkgs/pkgs/tools/text/xml/rnv/default.nix index fef8b9db2ffd..21869cef4ee4 100644 --- a/nixpkgs/pkgs/tools/text/xml/rnv/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/rnv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, expat }: stdenv.mkDerivation rec { - name = "rnv-${version}"; + pname = "rnv"; version = "1.7.11"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/xml/rxp/default.nix b/nixpkgs/pkgs/tools/text/xml/rxp/default.nix index fc11e210c3cc..093f1b0aec7f 100644 --- a/nixpkgs/pkgs/tools/text/xml/rxp/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/rxp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl} : stdenv.mkDerivation rec { - name = "rxp-${version}"; + pname = "rxp"; version = "1.5.0"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix b/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix index 5982aa3828ef..8dfec26e8116 100644 --- a/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xmlformat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "xmlformat-${version}"; + pname = "xmlformat"; version = "1.04"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/text/xurls/default.nix b/nixpkgs/pkgs/tools/text/xurls/default.nix index 55619b416320..6e66090d88f0 100644 --- a/nixpkgs/pkgs/tools/text/xurls/default.nix +++ b/nixpkgs/pkgs/tools/text/xurls/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "2.0.0"; - name = "xurls-${version}"; + pname = "xurls"; src = fetchFromGitHub { owner = "mvdan"; diff --git a/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix b/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix index c9a6b7b3d795..27334bf09b4c 100644 --- a/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix +++ b/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { - name = "zimwriterfs-${version}"; + pname = "zimwriterfs"; version = "1.0"; src = fetchFromGitHub { owner = "wikimedia"; repo = "openzim"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix b/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix index fd2cf133c0ac..cb667e6b1218 100644 --- a/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "djvu2pdf-${version}"; + pname = "djvu2pdf"; src = fetchurl { url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/typesetting/fop/default.nix b/nixpkgs/pkgs/tools/typesetting/fop/default.nix index 9240926ab5b4..a72ca6980774 100644 --- a/nixpkgs/pkgs/tools/typesetting/fop/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/fop/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { - name = "fop-${version}"; + pname = "fop"; version = "2.1"; src = fetchurl { - url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz"; + url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz"; sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix index a255779c08a3..c214bd3cac7e 100644 --- a/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "git-latexdiff-${version}"; + pname = "git-latexdiff"; src = fetchFromGitLab { sha256 = "05fnhr1pqvj8l25vi9hdccwfk4mv2f0pfhn05whbdvf66gyl4fs9"; diff --git a/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix b/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix index d6c4fedc1434..7fca57ab9d26 100644 --- a/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix @@ -8,7 +8,7 @@ assert stdenv.isDarwin -> SystemConfiguration != null stdenv.mkDerivation rec { version = "1.8.29"; - name = "htmldoc-${version}"; + pname = "htmldoc"; src = fetchurl { url = "https://github.com/michaelrsweet/htmldoc/releases/download" + "/release-${version}/htmldoc-${version}-source.tar.gz"; diff --git a/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix index fc43ed0abe27..2c0e2f29d24f 100644 --- a/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix @@ -23,7 +23,8 @@ let }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); in stdenv.mkDerivation rec { - name = "kindlegen-${version}"; + pname = "kindlegen"; + inherit version; src = fetchurl { inherit url; diff --git a/nixpkgs/pkgs/tools/typesetting/mmark/default.nix b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix index 2b7a6f3ffb44..064e75ecbdc1 100644 --- a/nixpkgs/pkgs/tools/typesetting/mmark/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/mmark/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mmark-${version}"; + pname = "mmark"; version = "1.3.6"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix index 3a7d7be006a1..cd78f63ef78c 100644 --- a/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - name = "multimarkdown-${version}"; + pname = "multimarkdown"; version = "4.7.1"; src = fetchgit { diff --git a/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix index c53e8573c90f..9f62671a4fac 100644 --- a/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/odpdown/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { - name = "odpdown-${version}"; + pname = "odpdown"; version = "0.4.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix index 42f984b8cc60..a6f38ad0bc2c 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.13"; - name = "pdf2djvu-${version}"; + pname = "pdf2djvu"; src = fetchurl { - url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0qscmfii1pvnb8g7kbl1rdiqyic6ybfiw4kwvy35qqi967c1daz0"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix index 3e40c9caf28e..c8e27fb5a6e7 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix @@ -14,7 +14,7 @@ let ]; in stdenv.mkDerivation rec { - name = "pdf2odt-${version}"; + pname = "pdf2odt"; version = "20170207"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix b/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix index 38382689edce..20da90961dda 100644 --- a/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: stdenv.mkDerivation rec { - name = "pdfgrep-${version}"; + pname = "pdfgrep"; version = "2.1.2"; src = fetchurl { - url = "https://pdfgrep.org/download/${name}.tar.gz"; + url = "https://pdfgrep.org/download/${pname}-${version}.tar.gz"; sha256 = "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index 0a0f593eaa3b..6a2ebb089d21 100644 --- a/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -29,7 +29,7 @@ let }); in stdenv.mkDerivation rec { - name = "satysfi-${version}"; + pname = "satysfi"; version = "0.0.3"; src = fetchFromGitHub { owner = "gfngfn"; diff --git a/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix index 3145d580dc62..9b6951001507 100644 --- a/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "scdoc-${version}"; + pname = "scdoc"; version = "1.9.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/nixpkgs/pkgs/tools/typesetting/sile/default.nix index 966d657ae7d0..3b6ec809869d 100644 --- a/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "sile-${version}"; + pname = "sile"; version = "0.9.5.1"; src = fetchurl { - url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix b/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix index 355d7a055e8f..b06b2e25fcc2 100644 --- a/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "skribilo-${version}"; + pname = "skribilo"; version = "0.9.4"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz"; + url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix b/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix index 1cb7b9ce9759..e1bd3922ff3a 100644 --- a/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "sshlatex-${version}"; + pname = "sshlatex"; version = "0.8"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/nixpkgs/pkgs/tools/typesetting/ted/default.nix index b60cbcf22ad0..a03432b729ad 100644 --- a/nixpkgs/pkgs/tools/typesetting/ted/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/ted/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "ted"; version = "2.23"; src = fetchurl { - url = "http://ftp.nluug.nl/pub/editors/${pname}/${name}.src.tar.gz"; + url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz"; sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix index 5444914f7a4e..2513d48796e1 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,6 @@ let auctex = stdenv.mkDerivation ( rec { version = "12.1"; - name = "${pname}-${version}"; # Make this a valid tex(live-new) package; # the pkgs attribute is provided with a hack below. @@ -13,7 +12,7 @@ let auctex = stdenv.mkDerivation ( rec { outputs = [ "out" "tex" ]; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 57347a120214..c27c68741fc7 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -91,7 +91,8 @@ texliveYear = year; core = stdenv.mkDerivation rec { - name = "texlive-bin-${version}"; + pname = "texlive-bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -183,7 +184,8 @@ core = stdenv.mkDerivation rec { inherit (core-big) metafont metapost luatex xetex; core-big = stdenv.mkDerivation { #TODO: upmendex - name = "texlive-core-big.bin-${version}"; + pname = "texlive-core-big.bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -246,7 +248,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex dvisvgm = stdenv.mkDerivation { - name = "texlive-dvisvgm.bin-${version}"; + pname = "texlive-dvisvgm.bin"; + inherit version; inherit (common) src; @@ -263,7 +266,8 @@ dvisvgm = stdenv.mkDerivation { dvipng = stdenv.mkDerivation { - name = "texlive-dvipng.bin-${version}"; + pname = "texlive-dvipng.bin"; + inherit version; inherit (common) src; @@ -318,7 +322,8 @@ latexindent = perlPackages.buildPerlPackage rec { inherit biber; bibtexu = bibtex8; bibtex8 = stdenv.mkDerivation { - name = "texlive-bibtex-x.bin-${version}"; + pname = "texlive-bibtex-x.bin"; + inherit version; inherit (common) src; @@ -335,7 +340,8 @@ bibtex8 = stdenv.mkDerivation { xdvi = stdenv.mkDerivation { - name = "texlive-xdvi.bin-${version}"; + pname = "texlive-xdvi.bin"; + inherit version; inherit (common) src; @@ -363,7 +369,8 @@ xdvi = stdenv.mkDerivation { { xindy = stdenv.mkDerivation { - name = "texlive-xindy.bin-${version}"; + pname = "texlive-xindy.bin"; + inherit version; inherit (common) src; diff --git a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix index 906d9be0f1ec..a08f32ce9c29 100644 --- a/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }: stdenv.mkDerivation rec { - name = "tikzit-${version}"; + pname = "tikzit"; version = "2.1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix index 523a34c0b569..df9a607d4f27 100644 --- a/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix @@ -2,7 +2,7 @@ , glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: stdenv.mkDerivation rec { - name = "xmlroff-${version}"; + pname = "xmlroff"; version = "0.6.2"; src = fetchurl { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "docs" "" ''; - sourceRoot = "${name}/xmlroff/"; + sourceRoot = "${pname}-${version}/xmlroff/"; patches = [./xmlroff.patch]; diff --git a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix index 711a3c00a122..b136e9c5ab75 100644 --- a/nixpkgs/pkgs/tools/video/atomicparsley/default.nix +++ b/nixpkgs/pkgs/tools/video/atomicparsley/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, autoreconfHook, zlib, Cocoa }: stdenv.mkDerivation rec { - name = "atomicparsley-${version}"; + pname = "atomicparsley"; version = "0.9.6"; src = fetchhg { diff --git a/nixpkgs/pkgs/tools/video/bento4/default.nix b/nixpkgs/pkgs/tools/video/bento4/default.nix index 4f5a348b144e..5594143bfbce 100644 --- a/nixpkgs/pkgs/tools/video/bento4/default.nix +++ b/nixpkgs/pkgs/tools/video/bento4/default.nix @@ -2,7 +2,7 @@ , cmake }: stdenv.mkDerivation rec { - name = "bento4-${version}"; + pname = "bento4"; version = "1.5.1-628"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/video/rtmpdump/default.nix b/nixpkgs/pkgs/tools/video/rtmpdump/default.nix index 8be028730377..06c035552e54 100644 --- a/nixpkgs/pkgs/tools/video/rtmpdump/default.nix +++ b/nixpkgs/pkgs/tools/video/rtmpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, zlib +{ stdenv, fetchgit, fetchpatch, zlib , gnutlsSupport ? false, gnutls ? null, nettle ? null , opensslSupport ? true, openssl ? null }: @@ -9,17 +9,25 @@ assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSuppo assert opensslSupport -> openssl != null && !gnutlsSupport; with stdenv.lib; -stdenv.mkDerivation rec { - name = "rtmpdump-${version}"; - version = "2015-12-30"; +stdenv.mkDerivation { + pname = "rtmpdump"; + version = "2019-03-30"; src = fetchgit { - url = git://git.ffmpeg.org/rtmpdump; + url = "git://git.ffmpeg.org/rtmpdump"; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "fa8646daeb19dfd12c181f7d19de708d623704c0"; - sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig"; + rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3"; + sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb"; }; + patches = [ + # Fix build with OpenSSL 1.1 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch?id=1e7bef484f96e7647f5f0911d3c8caa48131c33b"; + sha256 = "1wds98pk8qr7shkfl8k49iirxiwd972h18w84bamiqln29wv6ql1"; + }) + ]; + makeFlags = [ ''prefix=$(out)'' ] ++ optional gnutlsSupport "CRYPTO=GNUTLS" ++ optional opensslSupport "CRYPTO=OPENSSL" @@ -32,9 +40,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + separateDebugInfo = true; + meta = { description = "Toolkit for RTMP streams"; - homepage = http://rtmpdump.mplayerhq.hu/; + homepage = "http://rtmpdump.mplayerhq.hu/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/nixpkgs/pkgs/tools/video/swftools/default.nix b/nixpkgs/pkgs/tools/video/swftools/default.nix index a50c7539fe05..d75405ab309f 100644 --- a/nixpkgs/pkgs/tools/video/swftools/default.nix +++ b/nixpkgs/pkgs/tools/video/swftools/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "swftools-${version}"; + pname = "swftools"; version = "0.9.2"; src = fetchurl { - url = "http://www.swftools.org/${name}.tar.gz"; + url = "http://www.swftools.org/${pname}-${version}.tar.gz"; sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z"; }; diff --git a/nixpkgs/pkgs/tools/video/untrunc/default.nix b/nixpkgs/pkgs/tools/video/untrunc/default.nix index c51c23d62f02..a87015ecf96b 100644 --- a/nixpkgs/pkgs/tools/video/untrunc/default.nix +++ b/nixpkgs/pkgs/tools/video/untrunc/default.nix @@ -1,7 +1,7 @@ { stdenv, gcc, libav_12, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "untrunc-${version}"; + pname = "untrunc"; version = "2018.01.13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/video/yamdi/default.nix b/nixpkgs/pkgs/tools/video/yamdi/default.nix index e995f9e3a4f6..8fca318529ff 100644 --- a/nixpkgs/pkgs/tools/video/yamdi/default.nix +++ b/nixpkgs/pkgs/tools/video/yamdi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "yamdi-${version}"; + pname = "yamdi"; version = "1.9"; # Source repo is also available here: diff --git a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 6ed545deb677..e7c391806aa9 100644 --- a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "amazon-ecs-cli-${version}"; + pname = "amazon-ecs-cli"; version = "1.15.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/virtualization/awless/default.nix b/nixpkgs/pkgs/tools/virtualization/awless/default.nix index 37c3248b83e5..57a68b868096 100644 --- a/nixpkgs/pkgs/tools/virtualization/awless/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/awless/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "awless-${version}"; + pname = "awless"; version = "0.1.11"; goPackagePath = "github.com/wallix/awless"; diff --git a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 178720436a6f..76813f4f246c 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -3,7 +3,8 @@ let version = "0.7.9"; in pythonPackages.buildPythonApplication rec { - name = "cloud-init-${version}"; + pname = "cloud-init"; + inherit version; namePrefix = ""; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix index 577426712113..1c7613b4893f 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -3,8 +3,6 @@ with python2Packages; buildPythonApplication rec { - - name = "${pname}-${version}"; pname = "cloudmonkey"; version = "5.3.3"; diff --git a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index c79c2e7cb353..a781f3a44249 100644 --- a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -7,7 +7,7 @@ let binPath = stdenv.lib.makeBinPath [ ]; in buildGoPackage rec { - name = "distrobuilder-${version}"; + pname = "distrobuilder"; version = "2019_10_07"; rev = "d686c88c21838f5505c3ec14711b2413604d7f5c"; diff --git a/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 674673f260ce..e8172066800d 100644 --- a/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation rec { - name = "ec2-ami-tools-${version}"; + pname = "ec2-ami-tools"; version = "1.5.7"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip"; + url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; }; diff --git a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 7251b418d4e0..0daa01f85bb3 100644 --- a/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "google-compute-engine-oslogin-${version}"; + pname = "google-compute-engine-oslogin"; version = "1.5.3"; # from packages/google-compute-engine-oslogin/packaging/debian/changelog diff --git a/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix b/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix index 0db43ccfcfdd..48255ca68a73 100644 --- a/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -11,7 +11,7 @@ }: buildPythonApplication rec { - name = "google-compute-engine-${version}"; + pname = "google-compute-engine"; version = "20190124"; namePrefix = ""; @@ -22,13 +22,16 @@ buildPythonApplication rec { sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp"; }; + buildInputs = [ bash ]; + propagatedBuildInputs = [ boto setuptools distro ]; + + postPatch = '' for file in $(find google_compute_engine -type f); do substituteInPlace "$file" \ - --replace /bin/systemctl "${systemd}/bin/systemctl" \ + --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \ --replace /bin/bash "${bashInteractive}/bin/bash" \ --replace /sbin/hwclock "${utillinux}/bin/hwclock" - # SELinux tool ??? /sbin/restorecon done @@ -42,9 +45,13 @@ buildPythonApplication rec { # allows to install the package in `services.udev.packages` in NixOS mkdir -p $out/lib/udev/rules.d cp -r google_config/udev/*.rules $out/lib/udev/rules.d - ''; - propagatedBuildInputs = [ boto setuptools distro ]; + # sysctl snippets will be used by google-compute-config.nix + mkdir -p $out/sysctl.d + cp google_config/sysctl/*.conf $out/sysctl.d + + patchShebangs $out/bin/* + ''; doCheck = false; diff --git a/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/nixpkgs/pkgs/tools/virtualization/govc/default.nix index f2fdbcc670d9..b53c211d379f 100644 --- a/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "govc-${version}"; - version = "0.20.0"; + pname = "govc"; + version = "0.21.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk"; + sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130"; }; meta = { diff --git a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix index 66618e59122a..8dbeecc56054 100644 --- a/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/marathonctl/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "marathonctl-unstable-${version}"; + pname = "marathonctl-unstable"; version = "2017-03-06"; goPackagePath = "github.com/shoenig/marathonctl"; diff --git a/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix index 2699a7a1f36b..79dd4e4551ad 100644 --- a/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "rootlesskit-${version}"; + pname = "rootlesskit"; version = "0.3.0-alpha.2"; goPackagePath = "github.com/rootless-containers/rootlesskit"; diff --git a/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix index dfb1467b54d5..4a81e8fe48b1 100644 --- a/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation (rec { pname = "xe-guest-utilities"; - name = "${pname}-${version}"; version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 1a4169605a64..202590f626f4 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -87,9 +87,11 @@ mapAliases ({ double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 dwarf_fortress = dwarf-fortress; # added 2016-01-23 - emacsMelpa = emacs25PackagesNg; # for backward compatibility + emacsMelpa = emacs25Packages; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 + emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 + emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 + emacsPackagesNg = emacsPackages; # added 2019-08-07 emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 @@ -285,6 +287,7 @@ mapAliases ({ ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 + pyo3-pack = maturin; pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qt_gstreamer = qt-gstreamer; # added 2017-02 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 03c1a9e34092..2a13064e6e31 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -293,6 +293,14 @@ in perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; + coreutils = buildPackages.coreutils.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; + gmp = null; + aclSupport = false; + attrSupport = false; + }; inherit perl; buildPackages = { inherit perl; }; }; @@ -377,7 +385,7 @@ in mkShell = callPackage ../build-support/mkshell { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -818,6 +826,8 @@ in ezstream = callPackage ../tools/audio/ezstream { }; + libfx2 = with python3Packages; toPythonApplication fx2; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genymotion = callPackage ../development/mobile/genymotion { }; @@ -842,6 +852,8 @@ in gitter = callPackage ../applications/networking/instant-messengers/gitter { }; + glasgow = with python3Packages; toPythonApplication glasgow; + gucci = callPackage ../tools/text/gucci { }; grc = callPackage ../tools/misc/grc { }; @@ -1483,6 +1495,10 @@ in dibbler = callPackage ../tools/networking/dibbler { }; + diesel-cli = callPackage ../development/tools/diesel-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ding = callPackage ../applications/misc/ding { aspellDicts_de = aspellDicts.de; aspellDicts_en = aspellDicts.en; @@ -2229,12 +2245,16 @@ in }; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped; }; + citrix_workspace_19_8_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_8_0; + }; citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped_19_6_0; }; @@ -2977,8 +2997,6 @@ in exiftool = perlPackages.ImageExifTool; - exodus = callPackage ../applications/altcoins/exodus { }; - ext4magic = callPackage ../tools/filesystems/ext4magic { }; extract_url = callPackage ../applications/misc/extract_url { }; @@ -4484,8 +4502,6 @@ in leatherman = callPackage ../development/libraries/leatherman { }; - ledger-live-desktop = callPackage ../applications/altcoins/ledger-live-desktop { }; - ledmon = callPackage ../tools/system/ledmon { }; leela = callPackage ../tools/graphics/leela { }; @@ -4777,9 +4793,7 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { - buildGoPackage = buildGo110Package; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -4910,8 +4924,6 @@ in namazu = callPackage ../tools/text/namazu { }; - nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { }; - nasty = callPackage ../tools/security/nasty { }; nat-traverse = callPackage ../tools/networking/nat-traverse { }; @@ -5798,9 +5810,7 @@ in rt = callPackage ../servers/rt { }; - rtmpdump = callPackage ../tools/video/rtmpdump { - openssl = openssl_1_0_2; - }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {}; @@ -6684,6 +6694,8 @@ in upx = callPackage ../tools/compression/upx { }; + uq = callPackage ../misc/uq { }; + uqmi = callPackage ../tools/networking/uqmi { }; uriparser = callPackage ../development/libraries/uriparser {}; @@ -6812,8 +6824,6 @@ in wal_e = callPackage ../tools/backup/wal-e { }; - wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; - watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7385,6 +7395,9 @@ in colm = callPackage ../development/compilers/colm { }; + colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; + colmapWithCuda = colmap.override { cudaSupport = true; }; + chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; chickenPackages = chickenPackages_5; @@ -7465,7 +7478,8 @@ in crystal_0_27 crystal_0_29 crystal_0_30 - crystal; + crystal + crystal2nix; icr = callPackage ../development/tools/icr {}; @@ -7827,6 +7841,8 @@ in psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + "tacacs+" = callPackage ../servers/tacacs+ { }; + tamarin-prover = (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { # NOTE: do not use the haskell packages 'graphviz' and 'maude' @@ -7860,16 +7876,16 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c"; - sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym"; + rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; + sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; }; }); - spirv-headers = spirv-tools.overrideAttrs (_: { + spirv-headers = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + repo = "SPIRV-Headers"; + rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; + sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; }; }); }; @@ -7928,7 +7944,7 @@ in # package. Wishing we could merge it into one irony package, to avoid this issue, # but its emacs-side expression is autogenerated, and we can't hook into it (other # than peek into its version). - inherit (emacsPackagesNg.melpaStablePackages) irony; + inherit (emacsPackages.melpaStablePackages) irony; }; hugs = callPackage ../development/interpreters/hugs { }; @@ -8363,12 +8379,15 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; + cargo-watch = callPackage ../development/tools/rust/cargo-watch { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; cargo-generate = callPackage ../development/tools/rust/cargo-generate { inherit (darwin.apple_sdk.frameworks) Security; }; - pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; + maturin = callPackage ../development/tools/rust/maturin { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; @@ -9627,7 +9646,7 @@ in gradle_2 = gradle_2_14; gradle_3 = gradle_3_5; gradle_4 = gradle_4_10; - gradle_5 = res.gradleGen.gradle_5_3; + gradle_5 = res.gradleGen.gradle_5_6; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9682,7 +9701,7 @@ in }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_8; }; indent = callPackage ../development/tools/misc/indent { }; @@ -10130,6 +10149,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + udis86 = callPackage ../development/tools/udis86 { }; + uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uhd = callPackage ../applications/radio/uhd { }; @@ -10215,6 +10236,8 @@ in inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict; }; + yq-go = callPackage ../development/tools/yq-go { }; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -10967,6 +10990,7 @@ in else if name == "libSystem" then targetPackages.darwin.xcode else if name == "nblibc" then targetPackages.netbsdCross.libc else if name == "wasilibc" then targetPackages.wasilibc or wasilibc + else if stdenv.targetPlatform.isGhcjs then null else throw "Unknown libc ${name}"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; @@ -11478,7 +11502,9 @@ in automake = automake111x; }; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; + kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { + openssl = openssl_1_0_2; + }; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; @@ -12582,6 +12608,8 @@ in lightlocker = callPackage ../misc/screensavers/light-locker { }; + lightspark = callPackage ../misc/lightspark { }; + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; linenoise = callPackage ../development/libraries/linenoise { }; @@ -13185,7 +13213,7 @@ in inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - harfbuzz = harfbuzzFull; + inherit harfbuzz; inherit libGL; inherit perl; inherit gtk3; @@ -13998,24 +14026,24 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; - sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; + rev = "aa9e8f538041db3055ea443080e0ccc315fa114f"; + sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk"; }; }); spirv-headers = spirv-tools.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; - sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; + rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc"; + sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm"; }; }); }).overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "e06c7e9a515b716c731bda13f507546f107775d1"; - sha256 = "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq"; + rev = "333d1c95792692205472c457d7bec915a94c8000"; + sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6"; }; }); }; @@ -14419,8 +14447,8 @@ in perl530Packages = recurseIntoAttrs perl530.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl528; - perlPackages = perl528Packages; + perl = perl530; + perlPackages = perl530Packages; ack = perlPackages.ack; @@ -15757,14 +15785,6 @@ in ]; }; - linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions - ]; - }; - linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15975,7 +15995,6 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); # When adding to this list: @@ -16223,6 +16242,8 @@ in gotests = callPackage ../development/tools/gotests { }; + gotestsum = callPackage ../development/tools/gotestsum { }; + impl = callPackage ../development/tools/impl { }; quicktemplate = callPackage ../development/tools/quicktemplate { }; @@ -16523,6 +16544,8 @@ in withGui = false; }; + usbtop = callPackage ../os-specific/linux/usbtop { }; + usbutils = callPackage ../os-specific/linux/usbutils { }; usermount = callPackage ../os-specific/linux/usermount { }; @@ -17181,6 +17204,8 @@ in inherit (nodePackages) svgo; }; + twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; + tzdata = callPackage ../data/misc/tzdata { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -17378,14 +17403,6 @@ in schismtracker = callPackage ../applications/audio/schismtracker { }; - altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); - - bitcoin = altcoins.bitcoin; - clightning = altcoins.clightning; - lnd = altcoins.lnd; - - cryptop = altcoins.cryptop; - jnetmap = callPackage ../applications/networking/jnetmap {}; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { @@ -17398,19 +17415,6 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = res.altcoins.go-ethereum; - ethabi = res.altcoins.ethabi; - - parity = res.altcoins.parity; - parity-beta = res.altcoins.parity-beta; - parity-ui = res.altcoins.parity-ui; - - polkadot = res.altcoins.polkadot; - - stellar-core = res.altcoins.stellar-core; - - particl-core = res.altcoins.particl-core; - aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -17562,6 +17566,8 @@ in bviplus = callPackage ../applications/editors/bviplus { }; + cage = callPackage ../applications/window-managers/cage { }; + calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; stdenv = gcc5Stdenv; @@ -17943,7 +17949,7 @@ in electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; - electrum = callPackage ../applications/misc/electrum { }; + electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; @@ -17957,7 +17963,6 @@ in emacs = emacs26; emacsPackages = emacs26Packages; - emacsPackagesNg = emacs26PackagesNg; emacs26 = callPackage ../applications/editors/emacs { # use override to enable additional features @@ -18002,153 +18007,7 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; - emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { - inherit emacs; - - autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; - - bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; - - bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {}; - - cedet = callPackage ../applications/editors/emacs-modes/cedet { }; - - calfw = callPackage ../applications/editors/emacs-modes/calfw { }; - - cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; }; - - coffee = callPackage ../applications/editors/emacs-modes/coffee { }; - - colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; - - colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { }; - - cryptol = callPackage ../applications/editors/emacs-modes/cryptol { }; - - cua = callPackage ../applications/editors/emacs-modes/cua { }; - - d = callPackage ../applications/editors/emacs-modes/d { }; - - darcsum = callPackage ../applications/editors/emacs-modes/darcsum { }; - - # ecb = callPackage ../applications/editors/emacs-modes/ecb { }; - - emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { }; - - emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { }; - - emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { }; - - emms = callPackage ../applications/editors/emacs-modes/emms { }; - - ensime = callPackage ../applications/editors/emacs-modes/ensime { }; - - erlangMode = callPackage ../applications/editors/emacs-modes/erlang { }; - - ess = callPackage ../applications/editors/emacs-modes/ess { }; - - flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; - - gh = callPackage ../applications/editors/emacs-modes/gh { }; - - graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { }; - - gist = callPackage ../applications/editors/emacs-modes/gist { }; - - haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; - - hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; - - hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; - - htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; - - ido-ubiquitous = callPackage ../applications/editors/emacs-modes/ido-ubiquitous { }; - - icicles = callPackage ../applications/editors/emacs-modes/icicles { }; - - idris = callPackage ../applications/editors/emacs-modes/idris { }; - - jabber = callPackage ../applications/editors/emacs-modes/jabber { }; - - jade = callPackage ../applications/editors/emacs-modes/jade { }; - - jdee = callPackage ../applications/editors/emacs-modes/jdee { }; - - js2 = callPackage ../applications/editors/emacs-modes/js2 { }; - - let-alist = callPackage ../applications/editors/emacs-modes/let-alist { }; - - logito = callPackage ../applications/editors/emacs-modes/logito { }; - - loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; - - markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { }; - - maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; - - metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; - - monky = callPackage ../applications/editors/emacs-modes/monky { }; - - notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); - - ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; - - offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; - - # This is usually a newer version of Org-Mode than that found in GNU Emacs, so - # we want it to have higher precedence. - org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); - - org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; - - pcache = callPackage ../applications/editors/emacs-modes/pcache { }; - - phpMode = callPackage ../applications/editors/emacs-modes/php { }; - - prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - - proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral/4.4.nix { - texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; - }; - proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix { - texinfo = texinfo4 ; - texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; - }; - - quack = callPackage ../applications/editors/emacs-modes/quack { }; - - rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { }; - - rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { }; - - rudel = callPackage ../applications/editors/emacs-modes/rudel { }; - - s = callPackage ../applications/editors/emacs-modes/s { }; - - sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; - - scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; - scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; - - structuredHaskellMode = haskellPackages.structured-haskell-mode; - - sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; - - tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { }; - - writeGood = callPackage ../applications/editors/emacs-modes/writegood { }; - - xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; - - cask = callPackage ../applications/editors/emacs-modes/cask { }; - }; - - emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages); - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); - - emacsPackagesNgFor = emacs: import ./emacs-packages.nix { + emacsPackagesFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv pkgs; inherit fetchFromGitHub fetchurl; inherit emacs texinfo makeWrapper runCommand writeText; @@ -18173,12 +18032,12 @@ in }; }; - emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25); - emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26); + emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25); + emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; - emacsWithPackages = emacsPackagesNg.emacsWithPackages; + emacs25WithPackages = emacs25Packages.emacsWithPackages; + emacs26WithPackages = emacs26Packages.emacsWithPackages; + emacsWithPackages = emacsPackages.emacsWithPackages; inherit (gnome3) empathy; @@ -19135,8 +18994,6 @@ in josm = callPackage ../applications/misc/josm { }; - jormungandr = callPackage ../applications/altcoins/jormungandr { }; - jbrout = callPackage ../applications/graphics/jbrout { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -19170,7 +19027,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog - keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole + keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -19223,8 +19080,6 @@ in ffmpeg = ffmpeg_2; }; - kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { }; - kitty = callPackage ../applications/misc/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; @@ -19583,14 +19438,6 @@ in mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/altcoins/monero { - inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - }; - - monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { - boost = boost16x; - }; - xmr-stak = callPackage ../applications/misc/xmr-stak { stdenvGcc6 = gcc6Stdenv; }; @@ -21352,6 +21199,8 @@ in way-cooler = callPackage ../applications/window-managers/way-cooler {}; + waypipe = callPackage ../applications/networking/remote/waypipe { }; + wayv = callPackage ../tools/X11/wayv {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -21531,6 +21380,8 @@ in x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; + x2goserver = callPackage ../applications/networking/remote/x2goserver { }; + x2vnc = callPackage ../tools/X11/x2vnc { }; x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; @@ -21770,10 +21621,6 @@ in yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { }; - yakuake = libsForQt5.callPackage ../applications/misc/yakuake { - inherit (kdeApplications) konsole; - }; - yarp = callPackage ../applications/science/robotics/yarp {}; yarssr = callPackage ../applications/misc/yarssr { }; @@ -21841,6 +21688,111 @@ in zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS + + aeon = callPackage ../applications/blockchains/aeon { }; + + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; + + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; + bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = false; }; + + bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = true; + }; + bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = false; + }; + + bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; + + btc1 = callPackage ../applications/blockchains/btc1.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + boost = boost165; + }; + btc1d = btc1.override { withGui = false; }; + + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + + dashpay = callPackage ../applications/blockchains/dashpay.nix { }; + + dcrd = callPackage ../applications/blockchains/dcrd.nix { }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { }; + + dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; + + dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; + dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + + exodus = callPackage ../applications/blockchains/exodus { }; + + freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; + go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic { + buildGoPackage = buildGo110Package; + }; + + jormungandr = callPackage ../applications/blockchains/jormungandr { }; + + ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; + + litecoin = callPackage ../applications/blockchains/litecoin.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + litecoind = litecoin.override { withGui = false; }; + + lnd = callPackage ../applications/blockchains/lnd.nix { }; + + monero = callPackage ../applications/blockchains/monero { + inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + }; + + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { + boost = boost16x; + }; + + masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; + + mist = callPackage ../applications/blockchains/mist.nix { }; + + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; + + namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; + namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; + + pivx = libsForQt59.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + + ethabi = callPackage ../applications/blockchains/ethabi.nix { }; + + stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; + + sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + + wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; + + wownero = callPackage ../applications/blockchains/wownero.nix {}; + + zcash = callPackage ../applications/blockchains/zcash { + withGui = false; + }; + + parity = callPackage ../applications/blockchains/parity { }; + parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; + parity-ui = callPackage ../applications/blockchains/parity-ui { }; + + polkadot = callPackage ../applications/blockchains/polkadot { }; + + particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; @@ -23027,6 +22979,8 @@ in seaview = callPackage ../applications/science/biology/seaview { }; + trimal = callPackage ../applications/science/biology/trimal { }; + varscan = callPackage ../applications/science/biology/varscan { }; hmmer = callPackage ../applications/science/biology/hmmer { }; @@ -23732,9 +23686,6 @@ in cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; - crashplan = callPackage ../applications/backup/crashplan { }; - crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; }; - colort = callPackage ../applications/misc/colort { }; terminal-parrot = callPackage ../applications/misc/terminal-parrot { }; @@ -24023,6 +23974,8 @@ in initialRamdisk. The result can be extended in the modules by defining extra attributes in system.build. + Alternatively, you may use the result's config and + options attributes to query any option. Example: @@ -24060,10 +24013,13 @@ in Note that you will need to have called Nixpkgs with the system parameter set to the right value for your deployment target. */ - nixos = configuration: - (import (pkgs.path + "/nixos/lib/eval-config.nix") { - inherit (pkgs.stdenv.hostPlatform) system; - modules = [( + nixos = + configuration: + let + c = import (pkgs.path + "/nixos/lib/eval-config.nix") { + inherit (pkgs.stdenv.hostPlatform) system; + modules = + [( { lib, ... }: { config.nixpkgs.pkgs = lib.mkDefault pkgs; } @@ -24072,7 +24028,9 @@ in then configuration else [configuration] ); - }).config.system.build; + }; + in + c.config.system.build // c; /* @@ -24196,6 +24154,8 @@ in nixos-container = callPackage ../tools/virtualization/nixos-container { }; + nixos-generators = callPackage ../tools/nix/nixos-generators { }; + norwester-font = callPackage ../data/fonts/norwester {}; nut = callPackage ../applications/misc/nut { }; @@ -24915,4 +24875,9 @@ in uhubctl = callPackage ../tools/misc/uhubctl {}; kodelife = callPackage ../applications/graphics/kodelife {}; + + pigeon = callPackage ../development/tools/pigeon {}; + + verifpal = callPackage ../tools/security/verifpal {}; + } diff --git a/nixpkgs/pkgs/top-level/lua-packages.nix b/nixpkgs/pkgs/top-level/lua-packages.nix index 87c9bd3bacfb..2d34bdaabc00 100644 --- a/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/nixpkgs/pkgs/top-level/lua-packages.nix @@ -132,7 +132,7 @@ with self; { }; vicious = toLuaModule(stdenv.mkDerivation rec { - name = "vicious-${version}"; + pname = "vicious"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 7eabfccf85f0..9dbc36e8601f 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -61,6 +61,8 @@ let batteries = callPackage ../development/ocaml-modules/batteries { }; + bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; + bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -186,6 +188,8 @@ let lwt = ocaml_lwt; }; + cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {}; + cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {}; csv = @@ -215,6 +219,8 @@ let dolog = callPackage ../development/ocaml-modules/dolog { }; + domain-name = callPackage ../development/ocaml-modules/domain-name { }; + dtoa = callPackage ../development/ocaml-modules/dtoa { }; dune = callPackage ../development/tools/ocaml/dune { }; @@ -271,6 +277,8 @@ let gen = callPackage ../development/ocaml-modules/gen { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; higlo = callPackage ../development/ocaml-modules/higlo { }; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 6180f6372e27..fb9132731fc2 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -2879,6 +2879,18 @@ let }; }; + ConfigSimple = buildPerlPackage { + pname = "Config-Simple"; + version = "4.59"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz; + sha256 = "0m0hg29baarw5ds768q9r4rxb27im8kj4fazyf9gjqw4mmssjy6b"; + }; + meta = { + description = "Simple configuration file class"; + }; + }; + ConfigStd = buildPerlModule { pname = "Config-Std"; version = "0.903"; @@ -6194,6 +6206,9 @@ let url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz; sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa"; }; + postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed -i '/use IO::File/d' Makefile.PL + ''; }; FCGIClient = buildPerlModule { diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index e8dca7c924b7..02c87e9e3cd3 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -645,6 +645,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + handout = callPackage ../development/python-modules/handout { }; + helper = callPackage ../development/python-modules/helper { }; histbook = callPackage ../development/python-modules/histbook { }; @@ -715,6 +717,8 @@ in { mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; + manhole = callPackage ../development/python-modules/manhole { }; markerlib = callPackage ../development/python-modules/markerlib { }; @@ -861,6 +865,8 @@ in { pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; + pybids = callPackage ../development/python-modules/pybids { }; + pybind11 = callPackage ../development/python-modules/pybind11 { }; pybullet = callPackage ../development/python-modules/pybullet { }; @@ -1233,7 +1239,9 @@ in { unifi = callPackage ../development/python-modules/unifi { }; - uvloop = callPackage ../development/python-modules/uvloop { }; + uvloop = callPackage ../development/python-modules/uvloop { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; + }; pyunifi = callPackage ../development/python-modules/pyunifi { }; @@ -1406,6 +1414,8 @@ in { gui = false; }; + delegator-py = callPackage ../development/python-modules/delegator-py { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; arrow = callPackage ../development/python-modules/arrow { }; @@ -1502,6 +1512,8 @@ in { bidict = callPackage ../development/python-modules/bidict { }; + bids-validator = callPackage ../development/python-modules/bids-validator { }; + binwalk = callPackage ../development/python-modules/binwalk { }; binwalk-full = appendToName "full" (self.binwalk.override { @@ -1969,12 +1981,15 @@ in { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = self.pytest_4; - - pytest_4 = callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; + pytest = if isPy3k then + callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + } + else callPackage ../development/python-modules/pytest/2.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; @@ -2046,6 +2061,8 @@ in { pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; pytestrunner = callPackage ../development/python-modules/pytestrunner { }; @@ -2325,16 +2342,14 @@ in { future-fstrings = callPackage ../development/python-modules/future-fstrings { }; - gateone = callPackage ../development/python-modules/gateone { }; + fx2 = callPackage ../development/python-modules/fx2 { }; - # TODO: Remove after 19.03 is branched off: - gcutil = throw '' - pythonPackages.gcutil is deprecated and can be replaced with "gcloud - compute" from the package google-cloud-sdk. - ''; + gateone = callPackage ../development/python-modules/gateone { }; GeoIP = callPackage ../development/python-modules/GeoIP { }; + glasgow = callPackage ../development/python-modules/glasgow { }; + gmpy = callPackage ../development/python-modules/gmpy { }; gmpy2 = callPackage ../development/python-modules/gmpy2 { }; @@ -2565,6 +2580,10 @@ in { Nikola = callPackage ../development/python-modules/Nikola { }; + nmigen = callPackage ../development/python-modules/nmigen { }; + + nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; + nxt-python = callPackage ../development/python-modules/nxt-python { }; odfpy = callPackage ../development/python-modules/odfpy { }; @@ -2720,6 +2739,16 @@ in { sunpy = callPackage ../development/python-modules/sunpy { }; + hyperkitty = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/hyperkitty.nix { }); + + robot-detection = callPackage ../development/python-modules/robot-detection {}; + + cssmin = callPackage ../development/python-modules/cssmin {}; + + django-paintstore = callPackage ../development/python-modules/django-paintstore {}; + + django-q = callPackage ../development/python-modules/django-q {}; + hyperlink = callPackage ../development/python-modules/hyperlink {}; zope_copy = callPackage ../development/python-modules/zope_copy {}; @@ -3931,6 +3960,8 @@ in { ntplib = callPackage ../development/python-modules/ntplib { }; + num2words = callPackage ../development/python-modules/num2words { }; + numba = callPackage ../development/python-modules/numba { }; numcodecs = callPackage ../development/python-modules/numcodecs { }; @@ -4109,7 +4140,10 @@ in { pathlib2 = callPackage ../development/python-modules/pathlib2 { }; - pathpy = callPackage ../development/python-modules/path.py { }; + pathpy = if isPy3k then + callPackage ../development/python-modules/path.py { } + else + callPackage ../development/python-modules/path.py/2.nix { }; paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; @@ -4781,10 +4815,10 @@ in { scipy = let scipy_ = callPackage ../development/python-modules/scipy { }; scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec { - version = "1.2.1"; + version = "1.2.2"; src = oldAttrs.src.override { inherit version; - sha256 = "0g5a03jkjiqlh6h9yz508p5c9ni43735m01fivjvn6dlpjxd31g0"; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; }; }); in if pythonOlder "3.5" then scipy_1_2 else scipy_; diff --git a/nixpkgs/pkgs/top-level/release.nix b/nixpkgs/pkgs/top-level/release.nix index 3437f620c74a..9ae5a9e1fbdc 100644 --- a/nixpkgs/pkgs/top-level/release.nix +++ b/nixpkgs/pkgs/top-level/release.nix @@ -192,7 +192,7 @@ let # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 - #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg; + #emacsPackages = packagePlatforms pkgs.emacsPackages; #rPackages = packagePlatforms pkgs.rPackages; ocamlPackages = { }; perlPackages = { }; |