diff options
Diffstat (limited to 'nixpkgs/pkgs/applications')
1502 files changed, 6143 insertions, 7566 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; |